[tor-commits] [orbot/master] big check-in of major gradle refactor; now building and running!

n8fr8 at torproject.org n8fr8 at torproject.org
Thu Oct 13 19:38:50 UTC 2016


commit 18682e4b974b0dff0120c9ae48cadb597387925f
Author: Nathan Freitas <nathan at freitas.net>
Date:   Wed Jun 29 00:20:20 2016 -0400

    big check-in of major gradle refactor; now building and running!
    VPN features are disabled for now
---
 AndroidManifest.xml                                |    8 +-
 app/build.gradle                                   |   29 +
 app/src/main/AndroidManifest.xml                   |  133 ++
 app/src/main/assets/bridges.txt                    |   22 +
 .../integration/android/IntentIntegrator.java      |  506 ++++
 .../zxing/integration/android/IntentResult.java    |   95 +
 .../org/torproject/android/OnBootReceiver.java     |   48 +
 .../main/java/org/torproject/android/OrbotApp.java |   57 +
 .../org/torproject/android/OrbotMainActivity.java  | 1442 ++++++++++++
 .../org/torproject/android/settings/Languages.java |  232 ++
 .../android/settings/SettingsPreferences.java      |  161 ++
 .../java/org/torproject/android/ui/AppManager.java |  389 ++++
 .../torproject/android/ui/BridgeSetupActivity.java |    5 +
 .../torproject/android/ui/ImageProgressView.java   |   78 +
 .../android/ui/OrbotDiagnosticsActivity.java       |  329 +++
 .../torproject/android/ui/PromoAppsActivity.java   |  215 ++
 .../torproject/android/ui/Rotate3dAnimation.java   |   76 +
 .../torproject/android/ui/VPNSetupActivity.java    |    5 +
 .../torproject/android/vpn/OrbotVpnManager.java    |  452 ++++
 .../java/org/torproject/android/vpn/Tun2Socks.java |  126 +
 .../torproject/android/vpn/VPNEnableActivity.java  |  164 ++
 app/src/main/jni/Android.mk                        |  145 ++
 app/src/main/jni/Application.mk                    |    4 +
 app/src/main/jni/libancillary/API                  |  139 ++
 app/src/main/jni/libancillary/COPYING              |   21 +
 app/src/main/jni/libancillary/Makefile             |   73 +
 app/src/main/jni/libancillary/ancillary.h          |  131 ++
 app/src/main/jni/libancillary/fd_recv.c            |   98 +
 app/src/main/jni/libancillary/fd_send.c            |   92 +
 app/src/main/jni/libancillary/test.c               |  112 +
 .../res/drawable-hdpi-v11/ic_stat_notifyerr.png    |  Bin 0 -> 480 bytes
 app/src/main/res/drawable-hdpi-v11/ic_stat_tor.png |  Bin 0 -> 802 bytes
 .../main/res/drawable-hdpi-v11/ic_stat_tor_off.png |  Bin 0 -> 744 bytes
 .../res/drawable-hdpi-v11/ic_stat_tor_xfer.png     |  Bin 0 -> 967 bytes
 app/src/main/res/drawable-hdpi-v11/inverse.png     |  Bin 0 -> 1027 bytes
 .../res/drawable-hdpi-v9/ic_stat_notifyerr.png     |  Bin 0 -> 616 bytes
 app/src/main/res/drawable-hdpi-v9/ic_stat_tor.png  |  Bin 0 -> 713 bytes
 app/src/main/res/drawable-hdpi-v9/inverse.png      |  Bin 0 -> 1027 bytes
 .../main/res/drawable-hdpi/ic_action_settings.png  |  Bin 0 -> 553 bytes
 app/src/main/res/drawable-hdpi/ic_launcher.png     |  Bin 0 -> 4194 bytes
 .../main/res/drawable-hdpi/ic_stat_notifyerr.png   |  Bin 0 -> 1312 bytes
 app/src/main/res/drawable-hdpi/ic_stat_tor.png     |  Bin 0 -> 852 bytes
 .../main/res/drawable-hdpi/ic_stat_tor_xfer.png    |  Bin 0 -> 990 bytes
 app/src/main/res/drawable-hdpi/inverse.png         |  Bin 0 -> 1027 bytes
 .../res/drawable-ldpi-v11/ic_stat_notifyerr.png    |  Bin 0 -> 294 bytes
 app/src/main/res/drawable-ldpi-v11/ic_stat_tor.png |  Bin 0 -> 390 bytes
 app/src/main/res/drawable-ldpi-v11/inverse.png     |  Bin 0 -> 1027 bytes
 .../res/drawable-ldpi-v9/ic_stat_notifyerr.png     |  Bin 0 -> 342 bytes
 app/src/main/res/drawable-ldpi-v9/ic_stat_tor.png  |  Bin 0 -> 358 bytes
 app/src/main/res/drawable-ldpi-v9/inverse.png      |  Bin 0 -> 1027 bytes
 .../main/res/drawable-ldpi/ic_action_settings.png  |  Bin 0 -> 319 bytes
 app/src/main/res/drawable-ldpi/ic_launcher.png     |  Bin 0 -> 2852 bytes
 .../main/res/drawable-ldpi/ic_stat_notifyerr.png   |  Bin 0 -> 647 bytes
 app/src/main/res/drawable-ldpi/ic_stat_tor.png     |  Bin 0 -> 606 bytes
 app/src/main/res/drawable-ldpi/inverse.png         |  Bin 0 -> 1027 bytes
 .../res/drawable-mdpi-v11/ic_stat_notifyerr.png    |  Bin 0 -> 357 bytes
 app/src/main/res/drawable-mdpi-v11/ic_stat_tor.png |  Bin 0 -> 517 bytes
 .../res/drawable-mdpi-v11/ic_stat_tor_xfer.png     |  Bin 0 -> 607 bytes
 app/src/main/res/drawable-mdpi-v11/inverse.png     |  Bin 0 -> 1027 bytes
 .../res/drawable-mdpi-v9/ic_stat_notifyerr.png     |  Bin 0 -> 458 bytes
 app/src/main/res/drawable-mdpi-v9/ic_stat_tor.png  |  Bin 0 -> 475 bytes
 app/src/main/res/drawable-mdpi-v9/inverse.png      |  Bin 0 -> 1027 bytes
 .../main/res/drawable-mdpi/ic_action_settings.png  |  Bin 0 -> 364 bytes
 app/src/main/res/drawable-mdpi/ic_launcher.png     |  Bin 0 -> 2677 bytes
 .../main/res/drawable-mdpi/ic_stat_notifyerr.png   |  Bin 0 -> 883 bytes
 app/src/main/res/drawable-mdpi/ic_stat_tor.png     |  Bin 0 -> 535 bytes
 .../main/res/drawable-mdpi/ic_stat_tor_xfer.png    |  Bin 0 -> 600 bytes
 app/src/main/res/drawable-mdpi/inverse.png         |  Bin 0 -> 1027 bytes
 .../res/drawable-xhdpi-v11/ic_stat_notifyerr.png   |  Bin 0 -> 618 bytes
 .../main/res/drawable-xhdpi-v11/ic_stat_tor.png    |  Bin 0 -> 1165 bytes
 .../res/drawable-xhdpi-v11/ic_stat_tor_xfer.png    |  Bin 0 -> 1337 bytes
 app/src/main/res/drawable-xhdpi-v11/inverse.png    |  Bin 0 -> 1027 bytes
 .../res/drawable-xhdpi-v9/ic_stat_notifyerr.png    |  Bin 0 -> 747 bytes
 app/src/main/res/drawable-xhdpi-v9/ic_stat_tor.png |  Bin 0 -> 970 bytes
 app/src/main/res/drawable-xhdpi-v9/inverse.png     |  Bin 0 -> 1027 bytes
 .../main/res/drawable-xhdpi/ic_action_settings.png |  Bin 0 -> 716 bytes
 app/src/main/res/drawable-xhdpi/ic_launcher.png    |  Bin 0 -> 5964 bytes
 .../main/res/drawable-xhdpi/ic_stat_notifyerr.png  |  Bin 0 -> 1796 bytes
 app/src/main/res/drawable-xhdpi/ic_stat_tor.png    |  Bin 0 -> 1161 bytes
 .../main/res/drawable-xhdpi/ic_stat_tor_xfer.png   |  Bin 0 -> 1378 bytes
 app/src/main/res/drawable-xhdpi/inverse.png        |  Bin 0 -> 1027 bytes
 .../main/res/drawable-xxhdpi-v11/ic_stat_tor.png   |  Bin 0 -> 1903 bytes
 .../res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png   |  Bin 0 -> 2019 bytes
 app/src/main/res/drawable-xxhdpi/ic_launcher.png   |  Bin 0 -> 9556 bytes
 app/src/main/res/drawable-xxhdpi/ic_stat_tor.png   |  Bin 0 -> 1872 bytes
 .../main/res/drawable-xxhdpi/ic_stat_tor_xfer.png  |  Bin 0 -> 2216 bytes
 app/src/main/res/drawable-xxhdpi/inverse.png       |  Bin 0 -> 1027 bytes
 .../main/res/drawable-xxxhdpi-v11/ic_stat_tor.png  |  Bin 0 -> 2661 bytes
 .../res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png  |  Bin 0 -> 3156 bytes
 app/src/main/res/drawable-xxxhdpi/ic_launcher.png  |  Bin 0 -> 13297 bytes
 app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png  |  Bin 0 -> 2631 bytes
 .../main/res/drawable-xxxhdpi/ic_stat_tor_xfer.png |  Bin 0 -> 2859 bytes
 app/src/main/res/drawable-xxxhdpi/inverse.png      |  Bin 0 -> 1027 bytes
 app/src/main/res/drawable/button.xml               |   37 +
 app/src/main/res/drawable/button_off.xml           |   37 +
 app/src/main/res/drawable/button_on.xml            |   35 +
 app/src/main/res/drawable/classyfabric.png         |  Bin 0 -> 8856 bytes
 app/src/main/res/drawable/error.png                |  Bin 0 -> 2922 bytes
 app/src/main/res/drawable/ic_chatsecure.png        |  Bin 0 -> 4013 bytes
 app/src/main/res/drawable/ic_duckduckgo.png        |  Bin 0 -> 5042 bytes
 app/src/main/res/drawable/ic_launcher.png          |  Bin 0 -> 6055 bytes
 app/src/main/res/drawable/ic_menu_about.png        |  Bin 0 -> 1771 bytes
 app/src/main/res/drawable/ic_menu_exit.png         |  Bin 0 -> 2693 bytes
 app/src/main/res/drawable/ic_menu_goto.png         |  Bin 0 -> 1636 bytes
 app/src/main/res/drawable/ic_play.png              |  Bin 0 -> 3560 bytes
 app/src/main/res/drawable/ic_stat_tor_off.png      |  Bin 0 -> 744 bytes
 app/src/main/res/drawable/ic_stat_tor_xfer.png     |  Bin 0 -> 600 bytes
 app/src/main/res/drawable/ic_twitter.png           |  Bin 0 -> 2797 bytes
 app/src/main/res/drawable/icon_martus.png          |  Bin 0 -> 6763 bytes
 app/src/main/res/drawable/icon_orfox.png           |  Bin 0 -> 7617 bytes
 app/src/main/res/drawable/icon_story_maker.png     |  Bin 0 -> 4290 bytes
 app/src/main/res/drawable/inverse.png              |  Bin 0 -> 1027 bytes
 app/src/main/res/drawable/n8fr8.jpg                |  Bin 0 -> 18062 bytes
 app/src/main/res/drawable/oldtoroff.png            |  Bin 0 -> 63700 bytes
 app/src/main/res/drawable/oldtoron.png             |  Bin 0 -> 121036 bytes
 app/src/main/res/drawable/oldtorstarting.png       |  Bin 0 -> 111753 bytes
 app/src/main/res/drawable/onion32.png              |  Bin 0 -> 1599 bytes
 app/src/main/res/drawable/tilebg.xml               |    4 +
 app/src/main/res/drawable/toggle.xml               |    8 +
 app/src/main/res/drawable/tor.png                  |  Bin 0 -> 4766 bytes
 app/src/main/res/drawable/tor25.png                |  Bin 0 -> 2227 bytes
 app/src/main/res/drawable/toroff.png               |  Bin 0 -> 39556 bytes
 app/src/main/res/drawable/toron.png                |  Bin 0 -> 47022 bytes
 app/src/main/res/drawable/torstarting.png          |  Bin 0 -> 41700 bytes
 .../layout-v21/layout_notification_expanded.xml    |  123 +
 app/src/main/res/layout/layout_about.xml           |  120 +
 app/src/main/res/layout/layout_apps.xml            |   74 +
 app/src/main/res/layout/layout_apps_item.xml       |   17 +
 app/src/main/res/layout/layout_diag.xml            |   14 +
 app/src/main/res/layout/layout_help.xml            |   20 +
 app/src/main/res/layout/layout_log.xml             |   52 +
 app/src/main/res/layout/layout_main.xml            |  244 ++
 .../res/layout/layout_notification_expanded.xml    |  122 +
 app/src/main/res/layout/layout_promo_apps.xml      |  115 +
 app/src/main/res/layout/layout_settings.xml        |   29 +
 app/src/main/res/layout/layout_vpn_setup.xml       |   34 +
 .../main/res/layout/scrollingtext_buttons_view.xml |   34 +
 app/src/main/res/menu/orbot_main.xml               |   70 +
 app/src/main/res/menu/share_menu.xml               |    7 +
 app/src/main/res/values-ach/strings.xml            |   12 +
 app/src/main/res/values-ar/strings.xml             |  262 +++
 app/src/main/res/values-az/strings.xml             |  297 +++
 app/src/main/res/values-bg/strings.xml             |  293 +++
 app/src/main/res/values-bn-rBD/strings.xml         |   40 +
 app/src/main/res/values-bn-rIN/strings.xml         |   12 +
 app/src/main/res/values-bn/strings.xml             |   12 +
 app/src/main/res/values-brx/strings.xml            |   12 +
 app/src/main/res/values-bs/strings.xml             |   18 +
 app/src/main/res/values-ca/strings.xml             |  226 ++
 app/src/main/res/values-cs-rCZ/strings.xml         |  223 ++
 app/src/main/res/values-cs/strings.xml             |   74 +
 app/src/main/res/values-cy/strings.xml             |   81 +
 app/src/main/res/values-da/strings.xml             |  203 ++
 app/src/main/res/values-de-rAT/strings.xml         |   12 +
 app/src/main/res/values-de/strings.xml             |  293 +++
 app/src/main/res/values-el/strings.xml             |  208 ++
 app/src/main/res/values-en-rGB/strings.xml         |   13 +
 app/src/main/res/values-eo/strings.xml             |  146 ++
 app/src/main/res/values-es-rAR/strings.xml         |   69 +
 app/src/main/res/values-es/strings.xml             |  294 +++
 app/src/main/res/values-et/strings.xml             |  210 ++
 app/src/main/res/values-eu/strings.xml             |  218 ++
 app/src/main/res/values-fa/strings.xml             |  292 +++
 app/src/main/res/values-fi/strings.xml             |  278 +++
 app/src/main/res/values-fr-rFR/strings.xml         |  293 +++
 app/src/main/res/values-fr/strings.xml             |   54 +
 app/src/main/res/values-gl/strings.xml             |  209 ++
 app/src/main/res/values-gu-rIN/strings.xml         |   14 +
 app/src/main/res/values-gu/strings.xml             |   17 +
 app/src/main/res/values-he/strings.xml             |  233 ++
 app/src/main/res/values-hi/strings.xml             |   26 +
 app/src/main/res/values-hr-rHR/strings.xml         |   30 +
 app/src/main/res/values-hr/strings.xml             |  293 +++
 app/src/main/res/values-hu/strings.xml             |  293 +++
 app/src/main/res/values-hy-rAM/strings.xml         |   12 +
 app/src/main/res/values-ia/strings.xml             |   30 +
 app/src/main/res/values-id/strings.xml             |  284 +++
 app/src/main/res/values-in-rID/strings.xml         |  284 +++
 app/src/main/res/values-in/strings.xml             |   48 +
 app/src/main/res/values-is/strings.xml             |  278 +++
 app/src/main/res/values-it/strings.xml             |  293 +++
 app/src/main/res/values-iw/strings.xml             |  233 ++
 app/src/main/res/values-ja/strings.xml             |  293 +++
 app/src/main/res/values-kn-rIN/strings.xml         |   12 +
 app/src/main/res/values-kn/strings.xml             |   12 +
 app/src/main/res/values-ko/strings.xml             |  214 ++
 app/src/main/res/values-ky/strings.xml             |   21 +
 app/src/main/res/values-lt-rLT/strings.xml         |   12 +
 app/src/main/res/values-lt/strings.xml             |   28 +
 app/src/main/res/values-lv/strings.xml             |  278 +++
 app/src/main/res/values-mk/strings.xml             |  278 +++
 app/src/main/res/values-ml/strings.xml             |   12 +
 app/src/main/res/values-mn/strings.xml             |   12 +
 app/src/main/res/values-mr-rIN/strings.xml         |   12 +
 app/src/main/res/values-ms-rMY/strings.xml         |  196 ++
 app/src/main/res/values-ms/strings.xml             |  200 ++
 app/src/main/res/values-my/strings.xml             |   30 +
 app/src/main/res/values-nb/strings.xml             |  258 +++
 app/src/main/res/values-nl/strings.xml             |  292 +++
 app/src/main/res/values-pa/strings.xml             |   19 +
 app/src/main/res/values-pl/strings.xml             |  293 +++
 app/src/main/res/values-ps/strings.xml             |   12 +
 app/src/main/res/values-pt-rBR/strings.xml         |  285 +++
 app/src/main/res/values-pt-rPT/strings.xml         |   14 +
 app/src/main/res/values-pt/strings.xml             |  181 ++
 app/src/main/res/values-ro-rRO/strings.xml         |   30 +
 app/src/main/res/values-ro/strings.xml             |  231 ++
 app/src/main/res/values-rs-rAR/strings.xml         |   58 +
 app/src/main/res/values-ru/strings.xml             |  293 +++
 app/src/main/res/values-si-rLK/strings.xml         |  190 ++
 app/src/main/res/values-sk-rSK/strings.xml         |   15 +
 app/src/main/res/values-sk/strings.xml             |   45 +
 app/src/main/res/values-sl/strings.xml             |   79 +
 app/src/main/res/values-sn/strings.xml             |   22 +
 app/src/main/res/values-sq/strings.xml             |   30 +
 app/src/main/res/values-sr/strings.xml             |  200 ++
 app/src/main/res/values-sv/strings.xml             |  293 +++
 app/src/main/res/values-ta/strings.xml             |   68 +
 app/src/main/res/values-th/strings.xml             |  169 ++
 app/src/main/res/values-tl/strings.xml             |  249 ++
 app/src/main/res/values-tr/strings.xml             |  282 +++
 app/src/main/res/values-uk/strings.xml             |  278 +++
 app/src/main/res/values-ur/strings.xml             |   18 +
 app/src/main/res/values-uz/strings.xml             |   47 +
 app/src/main/res/values-vi/strings.xml             |  293 +++
 app/src/main/res/values-zh-rCN/strings.xml         |  298 +++
 app/src/main/res/values-zh-rTW/strings.xml         |  116 +
 app/src/main/res/values/arrays.xml                 |   16 +
 app/src/main/res/values/colors.xml                 |    8 +
 app/src/main/res/values/dimens.xml                 |  361 +++
 app/src/main/res/values/pdnsd.xml                  |   33 +
 app/src/main/res/values/strings.xml                |  339 +++
 app/src/main/res/values/styles.xml                 |    5 +
 app/src/main/res/values/theme.xml                  |    8 +
 app/src/main/res/xml/preferences.xml               |  269 +++
 build.gradle                                       |   15 +
 external/Makefile                                  |    4 +-
 external/tor                                       |    2 +-
 gradle/wrapper/gradle-wrapper.jar                  |  Bin 0 -> 53636 bytes
 gradle/wrapper/gradle-wrapper.properties           |    6 +
 gradlew                                            |  160 ++
 gradlew.bat                                        |   90 +
 jsocksAndroid/build.gradle                         |   18 +
 jsocksAndroid/src/main/AndroidManifest.xml         |   11 +
 .../com/runjva/sourceforge/jsocks/main/SOCKS.java  |  267 +++
 .../jsocks/protocol/Authentication.java            |   35 +
 .../jsocks/protocol/AuthenticationNone.java        |   22 +
 .../sourceforge/jsocks/protocol/InetRange.java     |  492 ++++
 .../sourceforge/jsocks/protocol/ProxyMessage.java  |  118 +
 .../sourceforge/jsocks/protocol/ProxyServer.java   |  699 ++++++
 .../sourceforge/jsocks/protocol/Socks4Message.java |  167 ++
 .../sourceforge/jsocks/protocol/Socks4Proxy.java   |  144 ++
 .../jsocks/protocol/Socks5DatagramSocket.java      |  480 ++++
 .../sourceforge/jsocks/protocol/Socks5Message.java |  325 +++
 .../sourceforge/jsocks/protocol/Socks5Proxy.java   |  295 +++
 .../jsocks/protocol/SocksException.java            |  111 +
 .../jsocks/protocol/SocksProxyBase.java            |  543 +++++
 .../jsocks/protocol/SocksServerSocket.java         |  235 ++
 .../sourceforge/jsocks/protocol/SocksSocket.java   |  385 ++++
 .../jsocks/protocol/UDPEncapsulation.java          |   33 +
 .../jsocks/protocol/UDPRelayServer.java            |  227 ++
 .../protocol/UserPasswordAuthentication.java       |   91 +
 .../runjva/sourceforge/jsocks/server/Ident.java    |  171 ++
 .../jsocks/server/IdentAuthenticator.java          |  182 ++
 .../jsocks/server/ServerAuthenticator.java         |  126 +
 .../jsocks/server/ServerAuthenticatorBase.java     |  187 ++
 .../jsocks/server/ServerAuthenticatorNone.java     |   16 +
 .../jsocks/server/UserPasswordAuthenticator.java   |   82 +
 .../sourceforge/jsocks/server/UserValidation.java  |   24 +
 orbotservice/build.gradle                          |   25 +
 .../android/service/ApplicationTest.java           |   13 +
 orbotservice/src/main/AndroidManifest.xml          |    5 +
 .../main/java/net/freehaven/tor/control/.cvsignore |    1 +
 .../main/java/net/freehaven/tor/control/Bytes.java |  114 +
 .../net/freehaven/tor/control/ConfigEntry.java     |   20 +
 .../net/freehaven/tor/control/EventHandler.java    |   75 +
 .../freehaven/tor/control/NullEventHandler.java    |   18 +
 .../net/freehaven/tor/control/PasswordDigest.java  |   98 +
 .../src/main/java/net/freehaven/tor/control/README |    4 +
 .../freehaven/tor/control/TorControlCommands.java  |  148 ++
 .../tor/control/TorControlConnection.java          |  732 ++++++
 .../net/freehaven/tor/control/TorControlError.java |   39 +
 .../tor/control/TorControlSyntaxError.java         |   16 +
 .../net/freehaven/tor/control/examples/.cvsignore  |    1 +
 .../control/examples/DebuggingEventHandler.java    |   44 +
 .../net/freehaven/tor/control/examples/Main.java   |  146 ++
 .../torproject/android/service/DummyActivity.java  |   15 +
 .../android/service/HiddenServiceManager.java      |   25 +
 .../torproject/android/service/OrbotConstants.java |   37 +
 .../java/org/torproject/android/service/Prefs.java |  135 ++
 .../android/service/StartTorReceiver.java          |   35 +
 .../android/service/TorResourceInstaller.java      |  354 +++
 .../org/torproject/android/service/TorService.java | 2404 ++++++++++++++++++++
 .../android/service/TorServiceConstants.java       |  163 ++
 .../android/service/TorServiceUtils.java           |  184 ++
 .../torproject/android/service/TorTransProxy.java  |  753 ++++++
 .../torproject/android/service/TorifiedApp.java    |  139 ++
 .../torproject/android/service/TorrcConfig.java    |   33 +
 .../java/org/torproject/android/service/Utils.java |  100 +
 .../res/drawable-hdpi-v11/ic_stat_notifyerr.png    |  Bin 0 -> 480 bytes
 .../src/main/res/drawable-hdpi-v11/ic_stat_tor.png |  Bin 0 -> 802 bytes
 .../main/res/drawable-hdpi-v11/ic_stat_tor_off.png |  Bin 0 -> 744 bytes
 .../res/drawable-hdpi-v11/ic_stat_tor_xfer.png     |  Bin 0 -> 967 bytes
 .../src/main/res/drawable-hdpi-v11/inverse.png     |  Bin 0 -> 1027 bytes
 .../res/drawable-hdpi-v9/ic_stat_notifyerr.png     |  Bin 0 -> 616 bytes
 .../src/main/res/drawable-hdpi-v9/ic_stat_tor.png  |  Bin 0 -> 713 bytes
 .../src/main/res/drawable-hdpi-v9/inverse.png      |  Bin 0 -> 1027 bytes
 .../main/res/drawable-hdpi/ic_action_settings.png  |  Bin 0 -> 553 bytes
 .../src/main/res/drawable-hdpi/ic_launcher.png     |  Bin 0 -> 4194 bytes
 .../main/res/drawable-hdpi/ic_stat_notifyerr.png   |  Bin 0 -> 1312 bytes
 .../src/main/res/drawable-hdpi/ic_stat_tor.png     |  Bin 0 -> 852 bytes
 .../main/res/drawable-hdpi/ic_stat_tor_xfer.png    |  Bin 0 -> 990 bytes
 .../src/main/res/drawable-hdpi/inverse.png         |  Bin 0 -> 1027 bytes
 .../res/drawable-ldpi-v11/ic_stat_notifyerr.png    |  Bin 0 -> 294 bytes
 .../src/main/res/drawable-ldpi-v11/ic_stat_tor.png |  Bin 0 -> 390 bytes
 .../src/main/res/drawable-ldpi-v11/inverse.png     |  Bin 0 -> 1027 bytes
 .../res/drawable-ldpi-v9/ic_stat_notifyerr.png     |  Bin 0 -> 342 bytes
 .../src/main/res/drawable-ldpi-v9/ic_stat_tor.png  |  Bin 0 -> 358 bytes
 .../src/main/res/drawable-ldpi-v9/inverse.png      |  Bin 0 -> 1027 bytes
 .../main/res/drawable-ldpi/ic_action_settings.png  |  Bin 0 -> 319 bytes
 .../src/main/res/drawable-ldpi/ic_launcher.png     |  Bin 0 -> 2852 bytes
 .../main/res/drawable-ldpi/ic_stat_notifyerr.png   |  Bin 0 -> 647 bytes
 .../src/main/res/drawable-ldpi/ic_stat_tor.png     |  Bin 0 -> 606 bytes
 .../src/main/res/drawable-ldpi/inverse.png         |  Bin 0 -> 1027 bytes
 .../res/drawable-mdpi-v11/ic_stat_notifyerr.png    |  Bin 0 -> 357 bytes
 .../src/main/res/drawable-mdpi-v11/ic_stat_tor.png |  Bin 0 -> 517 bytes
 .../res/drawable-mdpi-v11/ic_stat_tor_xfer.png     |  Bin 0 -> 607 bytes
 .../src/main/res/drawable-mdpi-v11/inverse.png     |  Bin 0 -> 1027 bytes
 .../res/drawable-mdpi-v9/ic_stat_notifyerr.png     |  Bin 0 -> 458 bytes
 .../src/main/res/drawable-mdpi-v9/ic_stat_tor.png  |  Bin 0 -> 475 bytes
 .../src/main/res/drawable-mdpi-v9/inverse.png      |  Bin 0 -> 1027 bytes
 .../main/res/drawable-mdpi/ic_action_settings.png  |  Bin 0 -> 364 bytes
 .../src/main/res/drawable-mdpi/ic_launcher.png     |  Bin 0 -> 2677 bytes
 .../main/res/drawable-mdpi/ic_stat_notifyerr.png   |  Bin 0 -> 883 bytes
 .../src/main/res/drawable-mdpi/ic_stat_tor.png     |  Bin 0 -> 535 bytes
 .../main/res/drawable-mdpi/ic_stat_tor_xfer.png    |  Bin 0 -> 600 bytes
 .../src/main/res/drawable-mdpi/inverse.png         |  Bin 0 -> 1027 bytes
 .../res/drawable-xhdpi-v11/ic_stat_notifyerr.png   |  Bin 0 -> 618 bytes
 .../main/res/drawable-xhdpi-v11/ic_stat_tor.png    |  Bin 0 -> 1165 bytes
 .../res/drawable-xhdpi-v11/ic_stat_tor_xfer.png    |  Bin 0 -> 1337 bytes
 .../src/main/res/drawable-xhdpi-v11/inverse.png    |  Bin 0 -> 1027 bytes
 .../res/drawable-xhdpi-v9/ic_stat_notifyerr.png    |  Bin 0 -> 747 bytes
 .../src/main/res/drawable-xhdpi-v9/ic_stat_tor.png |  Bin 0 -> 970 bytes
 .../src/main/res/drawable-xhdpi-v9/inverse.png     |  Bin 0 -> 1027 bytes
 .../main/res/drawable-xhdpi/ic_action_settings.png |  Bin 0 -> 716 bytes
 .../src/main/res/drawable-xhdpi/ic_launcher.png    |  Bin 0 -> 5964 bytes
 .../main/res/drawable-xhdpi/ic_stat_notifyerr.png  |  Bin 0 -> 1796 bytes
 .../src/main/res/drawable-xhdpi/ic_stat_tor.png    |  Bin 0 -> 1161 bytes
 .../main/res/drawable-xhdpi/ic_stat_tor_xfer.png   |  Bin 0 -> 1378 bytes
 .../src/main/res/drawable-xhdpi/inverse.png        |  Bin 0 -> 1027 bytes
 .../main/res/drawable-xxhdpi-v11/ic_stat_tor.png   |  Bin 0 -> 1903 bytes
 .../res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png   |  Bin 0 -> 2019 bytes
 .../src/main/res/drawable-xxhdpi/ic_launcher.png   |  Bin 0 -> 9556 bytes
 .../src/main/res/drawable-xxhdpi/ic_stat_tor.png   |  Bin 0 -> 1872 bytes
 .../main/res/drawable-xxhdpi/ic_stat_tor_xfer.png  |  Bin 0 -> 2216 bytes
 .../src/main/res/drawable-xxhdpi/inverse.png       |  Bin 0 -> 1027 bytes
 .../main/res/drawable-xxxhdpi-v11/ic_stat_tor.png  |  Bin 0 -> 2661 bytes
 .../res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png  |  Bin 0 -> 3156 bytes
 .../src/main/res/drawable-xxxhdpi/ic_launcher.png  |  Bin 0 -> 13297 bytes
 .../src/main/res/drawable-xxxhdpi/ic_stat_tor.png  |  Bin 0 -> 2631 bytes
 .../main/res/drawable-xxxhdpi/ic_stat_tor_xfer.png |  Bin 0 -> 2859 bytes
 .../src/main/res/drawable-xxxhdpi/inverse.png      |  Bin 0 -> 1027 bytes
 orbotservice/src/main/res/drawable/button.xml      |   37 +
 orbotservice/src/main/res/drawable/button_off.xml  |   37 +
 orbotservice/src/main/res/drawable/button_on.xml   |   35 +
 .../src/main/res/drawable/classyfabric.png         |  Bin 0 -> 8856 bytes
 orbotservice/src/main/res/drawable/error.png       |  Bin 0 -> 2922 bytes
 .../src/main/res/drawable/ic_chatsecure.png        |  Bin 0 -> 4013 bytes
 .../src/main/res/drawable/ic_duckduckgo.png        |  Bin 0 -> 5042 bytes
 orbotservice/src/main/res/drawable/ic_launcher.png |  Bin 0 -> 6055 bytes
 .../src/main/res/drawable/ic_menu_about.png        |  Bin 0 -> 1771 bytes
 .../src/main/res/drawable/ic_menu_exit.png         |  Bin 0 -> 2693 bytes
 .../src/main/res/drawable/ic_menu_goto.png         |  Bin 0 -> 1636 bytes
 orbotservice/src/main/res/drawable/ic_play.png     |  Bin 0 -> 3560 bytes
 .../src/main/res/drawable/ic_stat_tor_off.png      |  Bin 0 -> 744 bytes
 .../src/main/res/drawable/ic_stat_tor_xfer.png     |  Bin 0 -> 600 bytes
 orbotservice/src/main/res/drawable/ic_twitter.png  |  Bin 0 -> 2797 bytes
 orbotservice/src/main/res/drawable/icon_martus.png |  Bin 0 -> 6763 bytes
 orbotservice/src/main/res/drawable/icon_orfox.png  |  Bin 0 -> 7617 bytes
 .../src/main/res/drawable/icon_story_maker.png     |  Bin 0 -> 4290 bytes
 orbotservice/src/main/res/drawable/inverse.png     |  Bin 0 -> 1027 bytes
 orbotservice/src/main/res/drawable/n8fr8.jpg       |  Bin 0 -> 18062 bytes
 orbotservice/src/main/res/drawable/oldtoroff.png   |  Bin 0 -> 63700 bytes
 orbotservice/src/main/res/drawable/oldtoron.png    |  Bin 0 -> 121036 bytes
 .../src/main/res/drawable/oldtorstarting.png       |  Bin 0 -> 111753 bytes
 orbotservice/src/main/res/drawable/onion32.png     |  Bin 0 -> 1599 bytes
 orbotservice/src/main/res/drawable/tilebg.xml      |    4 +
 orbotservice/src/main/res/drawable/toggle.xml      |    8 +
 orbotservice/src/main/res/drawable/tor.png         |  Bin 0 -> 4766 bytes
 orbotservice/src/main/res/drawable/tor25.png       |  Bin 0 -> 2227 bytes
 orbotservice/src/main/res/drawable/toroff.png      |  Bin 0 -> 39556 bytes
 orbotservice/src/main/res/drawable/toron.png       |  Bin 0 -> 47022 bytes
 orbotservice/src/main/res/drawable/torstarting.png |  Bin 0 -> 41700 bytes
 .../res/layout/layout_notification_expanded.xml    |  122 +
 .../notification_template_part_chronometer.xml     |   25 +
 .../res/layout/notification_template_part_time.xml |   25 +
 orbotservice/src/main/res/raw/pluto.properties     |    3 +
 orbotservice/src/main/res/raw/torpolipo.conf       |   23 +
 orbotservice/src/main/res/raw/torrc                |    8 +
 orbotservice/src/main/res/values-ach/strings.xml   |   12 +
 orbotservice/src/main/res/values-ar/strings.xml    |  262 +++
 orbotservice/src/main/res/values-az/strings.xml    |  297 +++
 orbotservice/src/main/res/values-bg/strings.xml    |  293 +++
 .../src/main/res/values-bn-rBD/strings.xml         |   40 +
 .../src/main/res/values-bn-rIN/strings.xml         |   12 +
 orbotservice/src/main/res/values-bn/strings.xml    |   12 +
 orbotservice/src/main/res/values-brx/strings.xml   |   12 +
 orbotservice/src/main/res/values-bs/strings.xml    |   18 +
 orbotservice/src/main/res/values-ca/strings.xml    |  226 ++
 .../src/main/res/values-cs-rCZ/strings.xml         |  223 ++
 orbotservice/src/main/res/values-cs/strings.xml    |   74 +
 orbotservice/src/main/res/values-cy/strings.xml    |   81 +
 orbotservice/src/main/res/values-da/strings.xml    |  203 ++
 .../src/main/res/values-de-rAT/strings.xml         |   12 +
 orbotservice/src/main/res/values-de/strings.xml    |  293 +++
 orbotservice/src/main/res/values-el/strings.xml    |  208 ++
 .../src/main/res/values-en-rGB/strings.xml         |   13 +
 orbotservice/src/main/res/values-eo/strings.xml    |  146 ++
 .../src/main/res/values-es-rAR/strings.xml         |   69 +
 orbotservice/src/main/res/values-es/strings.xml    |  294 +++
 orbotservice/src/main/res/values-et/strings.xml    |  210 ++
 orbotservice/src/main/res/values-eu/strings.xml    |  218 ++
 orbotservice/src/main/res/values-fa/strings.xml    |  292 +++
 orbotservice/src/main/res/values-fi/strings.xml    |  278 +++
 .../src/main/res/values-fr-rFR/strings.xml         |  293 +++
 orbotservice/src/main/res/values-fr/strings.xml    |   54 +
 orbotservice/src/main/res/values-gl/strings.xml    |  209 ++
 .../src/main/res/values-gu-rIN/strings.xml         |   14 +
 orbotservice/src/main/res/values-gu/strings.xml    |   17 +
 orbotservice/src/main/res/values-he/strings.xml    |  233 ++
 orbotservice/src/main/res/values-hi/strings.xml    |   26 +
 .../src/main/res/values-hr-rHR/strings.xml         |   30 +
 orbotservice/src/main/res/values-hr/strings.xml    |  293 +++
 orbotservice/src/main/res/values-hu/strings.xml    |  293 +++
 .../src/main/res/values-hy-rAM/strings.xml         |   12 +
 orbotservice/src/main/res/values-ia/strings.xml    |   30 +
 orbotservice/src/main/res/values-id/strings.xml    |  284 +++
 .../src/main/res/values-in-rID/strings.xml         |  284 +++
 orbotservice/src/main/res/values-in/strings.xml    |   48 +
 orbotservice/src/main/res/values-is/strings.xml    |  278 +++
 orbotservice/src/main/res/values-it/strings.xml    |  293 +++
 orbotservice/src/main/res/values-iw/strings.xml    |  233 ++
 orbotservice/src/main/res/values-ja/strings.xml    |  293 +++
 .../src/main/res/values-kn-rIN/strings.xml         |   12 +
 orbotservice/src/main/res/values-kn/strings.xml    |   12 +
 orbotservice/src/main/res/values-ko/strings.xml    |  214 ++
 orbotservice/src/main/res/values-ky/strings.xml    |   21 +
 .../src/main/res/values-lt-rLT/strings.xml         |   12 +
 orbotservice/src/main/res/values-lt/strings.xml    |   28 +
 orbotservice/src/main/res/values-lv/strings.xml    |  278 +++
 orbotservice/src/main/res/values-mk/strings.xml    |  278 +++
 orbotservice/src/main/res/values-ml/strings.xml    |   12 +
 orbotservice/src/main/res/values-mn/strings.xml    |   12 +
 .../src/main/res/values-mr-rIN/strings.xml         |   12 +
 .../src/main/res/values-ms-rMY/strings.xml         |  196 ++
 orbotservice/src/main/res/values-ms/strings.xml    |  200 ++
 orbotservice/src/main/res/values-my/strings.xml    |   30 +
 orbotservice/src/main/res/values-nb/strings.xml    |  258 +++
 orbotservice/src/main/res/values-nl/strings.xml    |  292 +++
 orbotservice/src/main/res/values-pa/strings.xml    |   19 +
 orbotservice/src/main/res/values-pl/strings.xml    |  293 +++
 orbotservice/src/main/res/values-ps/strings.xml    |   12 +
 .../src/main/res/values-pt-rBR/strings.xml         |  285 +++
 .../src/main/res/values-pt-rPT/strings.xml         |   14 +
 orbotservice/src/main/res/values-pt/strings.xml    |  181 ++
 .../src/main/res/values-ro-rRO/strings.xml         |   30 +
 orbotservice/src/main/res/values-ro/strings.xml    |  231 ++
 .../src/main/res/values-rs-rAR/strings.xml         |   58 +
 orbotservice/src/main/res/values-ru/strings.xml    |  293 +++
 .../src/main/res/values-si-rLK/strings.xml         |  190 ++
 .../src/main/res/values-sk-rSK/strings.xml         |   15 +
 orbotservice/src/main/res/values-sk/strings.xml    |   45 +
 orbotservice/src/main/res/values-sl/strings.xml    |   79 +
 orbotservice/src/main/res/values-sn/strings.xml    |   22 +
 orbotservice/src/main/res/values-sq/strings.xml    |   30 +
 orbotservice/src/main/res/values-sr/strings.xml    |  200 ++
 orbotservice/src/main/res/values-sv/strings.xml    |  293 +++
 orbotservice/src/main/res/values-ta/strings.xml    |   68 +
 orbotservice/src/main/res/values-th/strings.xml    |  169 ++
 orbotservice/src/main/res/values-tl/strings.xml    |  249 ++
 orbotservice/src/main/res/values-tr/strings.xml    |  282 +++
 orbotservice/src/main/res/values-uk/strings.xml    |  278 +++
 orbotservice/src/main/res/values-ur/strings.xml    |   18 +
 orbotservice/src/main/res/values-uz/strings.xml    |   47 +
 orbotservice/src/main/res/values-vi/strings.xml    |  293 +++
 .../src/main/res/values-zh-rCN/strings.xml         |  298 +++
 .../src/main/res/values-zh-rTW/strings.xml         |  116 +
 orbotservice/src/main/res/values/arrays.xml        |   16 +
 orbotservice/src/main/res/values/colors.xml        |    8 +
 orbotservice/src/main/res/values/dimens.xml        |  361 +++
 orbotservice/src/main/res/values/pdnsd.xml         |   33 +
 orbotservice/src/main/res/values/strings.xml       |  339 +++
 orbotservice/src/main/res/values/styles.xml        |    5 +
 orbotservice/src/main/res/values/theme.xml         |    8 +
 .../java/org/torproject/android/control/.cvsignore |    1 +
 .../java/org/torproject/android/control/Bytes.java |  114 +
 .../torproject/android/control/ConfigEntry.java    |   20 +
 .../torproject/android/control/EventHandler.java   |   75 +
 .../android/control/NullEventHandler.java          |   18 +
 .../torproject/android/control/PasswordDigest.java |   98 +
 .../java/org/torproject/android/control/README     |    4 +
 .../android/control/TorControlCommands.java        |  148 ++
 .../android/control/TorControlConnection.java      |  730 ++++++
 .../android/control/TorControlError.java           |   39 +
 .../android/control/TorControlSyntaxError.java     |   16 +
 .../torproject/android/control/examples/.cvsignore |    1 +
 .../control/examples/DebuggingEventHandler.java    |   44 +
 .../torproject/android/control/examples/Main.java  |  146 ++
 .../android/service/ExampleUnitTest.java           |   15 +
 project.properties                                 |    5 +-
 settings.gradle                                    |    2 +
 src/org/torproject/android/service/TorService.java |    6 +-
 512 files changed, 47807 insertions(+), 13 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9a80a30..fd25aca 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.torproject.android" 
-      android:versionName="15.1.3-beta" 
-      android:versionCode="15130000"
+      android:versionName="15.2.0-alpha-1" 
+      android:versionCode="15200001"
         android:installLocation="auto"      
       >
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/>
+    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
     <!-- 
  <permission android:name="org.torproject.android.MANAGE_TOR" 
      android:label="@string/permission_manage_tor_label" 
@@ -103,7 +103,7 @@
              </intent-filter>
         </receiver>
 
-   	<receiver android:name="org.torproject.android.service.OnBootReceiver"
+   	<receiver android:name="org.torproject.android.OnBootReceiver"
    	    android:enabled="true" android:exported="true"
    	    
    	    >
diff --git a/app/build.gradle b/app/build.gradle
new file mode 100644
index 0000000..4b7c1b0
--- /dev/null
+++ b/app/build.gradle
@@ -0,0 +1,29 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 23
+    buildToolsVersion "23.0.2"
+
+    sourceSets.main.jni.srcDirs = []
+
+    defaultConfig {
+        applicationId "org.torproject.android"
+        minSdkVersion 9
+        targetSdkVersion 23
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+}
+
+dependencies {
+    compile project(':jsocksAndroid')
+    compile project(':orbotservice')
+    compile 'com.android.support:support-v4:23.4.0'
+    compile 'com.android.support:appcompat-v7:23.4.0'
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..ba3a0da
--- /dev/null
+++ b/app/src/main/AndroidManifest.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="org.torproject.android" 
+      android:versionName="15.2.0-alpha-1" 
+      android:versionCode="15200001"
+        android:installLocation="auto"      
+      >
+    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
+    <!-- 
+ <permission android:name="org.torproject.android.MANAGE_TOR" 
+     android:label="@string/permission_manage_tor_label" 
+     android:description="@string/permission_manage_tor_description" 
+     android:protectionLevel="signature"/>
+ 
+	<uses-permission android:name="org.torproject.android.MANAGE_TOR"/>
+	-->
+	
+	<uses-permission android:name="android.permission.INTERNET"/>
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+
+    <application android:name="org.torproject.android.OrbotApp" android:icon="@drawable/ic_launcher"
+     android:label="@string/app_name" 
+     android:description="@string/app_description"
+     android:configChanges="locale|orientation|screenSize"
+      android:theme="@style/DefaultTheme" 
+      android:allowBackup="false"
+      android:allowClearUserData="true"
+      android:persistent="true"
+      android:stopWithTask="false"
+      android:largeHeap="false"
+     >
+      
+        <activity android:name=".OrbotMainActivity" 
+            android:configChanges="orientation|screenSize"
+            android:excludeFromRecents="true"
+            android:launchMode="singleTop"
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+          </intent-filter>
+          
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="bridge" />
+            </intent-filter>
+        
+         <intent-filter>
+                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="org.torproject.android.REQUEST_HS_PORT" />
+            </intent-filter>
+             <intent-filter>
+                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="org.torproject.android.START_TOR" />
+            </intent-filter>
+            
+        </activity>
+
+        <!-- 
+        This is for ensuring the background service still runs when/if the app is swiped away
+         -->
+      	<activity
+			android:name=".service.DummyActivity"
+			android:theme="@android:style/Theme.Translucent"
+			android:enabled="true"
+			android:allowTaskReparenting="true"
+			android:noHistory="true"
+			android:excludeFromRecents="true"
+			android:alwaysRetainTaskState="false"
+			android:stateNotNeeded="true"
+			android:clearTaskOnLaunch="true"
+			android:finishOnTaskLaunch="true"
+			
+			/> 
+		
+      	<activity
+			android:name=".vpn.VPNEnableActivity" android:label="@string/app_name" android:exported="false"
+			android:theme="@android:style/Theme.Translucent"			
+			/> 
+		
+			      	
+      	<activity android:name="org.torproject.android.ui.PromoAppsActivity" android:exported="false"/>
+      	
+      	
+      	<activity android:name=".settings.SettingsPreferences"  android:label="@string/app_name"/>
+        <activity android:name=".ui.AppManager"  android:label="@string/app_name"/>
+      
+        <service
+            android:name=".service.TorService"
+            android:enabled="true"
+            android:permission="android.permission.BIND_VPN_SERVICE"
+            android:stopWithTask="false" >
+        </service>
+
+        <receiver
+            android:name=".service.StartTorReceiver"
+            android:exported="true">
+             <intent-filter>
+                 <action android:name="org.torproject.android.intent.action.START" />
+             </intent-filter>
+        </receiver>
+
+   	<receiver android:name=".OnBootReceiver"
+   	    android:enabled="true" android:exported="true"
+   	    
+   	    >
+			<intent-filter>
+				<action	android:name="android.intent.action.BOOT_COMPLETED" />
+				  <category android:name="android.intent.category.HOME" />
+			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.QUICKBOOT_POWERON" />
+				  <category android:name="android.intent.category.HOME" />
+			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.MEDIA_MOUNTED"/>
+				  <category android:name="android.intent.category.HOME" />
+			</intent-filter>
+		</receiver>
+		
+   	<!-- 
+       <service android:name="org.torproject.android.vpn.OrbotVpnService"
+               android:permission="android.permission.BIND_VPN_SERVICE">
+           <intent-filter>
+               <action android:name="android.net.VpnService"/>
+           </intent-filter>
+       </service>
+         -->
+</application>
+</manifest> 
diff --git a/app/src/main/assets/bridges.txt b/app/src/main/assets/bridges.txt
new file mode 100644
index 0000000..679f811
--- /dev/null
+++ b/app/src/main/assets/bridges.txt
@@ -0,0 +1,22 @@
+obfs3 83.212.101.3:80 A09D536DD1752D542E1FBB3C9CE4449D51298239
+obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9
+obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9
+obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED
+obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A
+scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH
+obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0
+obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0
+obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0
+obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0
+obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0
+obfs4 154.35.22.10:41835 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0
+obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0
+obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0
+obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0
+obfs4 154.35.22.10:1984 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0
+obfs4 154.35.22.11:1984 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0
+obfs4 154.35.22.12:1984 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0
+obfs4 154.35.22.13:1984 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0
+meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com
+meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com
+meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com
diff --git a/app/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java b/app/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java
new file mode 100644
index 0000000..d5628e8
--- /dev/null
+++ b/app/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java
@@ -0,0 +1,506 @@
+/*
+ * Copyright 2009 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.integration.android;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Fragment;
+import android.content.ActivityNotFoundException;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.Log;
+
+/**
+ * <p>A utility class which helps ease integration with Barcode Scanner via {@link Intent}s. This is a simple
+ * way to invoke barcode scanning and receive the result, without any need to integrate, modify, or learn the
+ * project's source code.</p>
+ *
+ * <h2>Initiating a barcode scan</h2>
+ *
+ * <p>To integrate, create an instance of {@code IntentIntegrator} and call {@link #initiateScan()} and wait
+ * for the result in your app.</p>
+ *
+ * <p>It does require that the Barcode Scanner (or work-alike) application is installed. The
+ * {@link #initiateScan()} method will prompt the user to download the application, if needed.</p>
+ *
+ * <p>There are a few steps to using this integration. First, your {@link Activity} must implement
+ * the method {@link Activity#onActivityResult(int, int, Intent)} and include a line of code like this:</p>
+ *
+ * <pre>{@code
+ * public void onActivityResult(int requestCode, int resultCode, Intent intent) {
+ *   IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
+ *   if (scanResult != null) {
+ *     // handle scan result
+ *   }
+ *   // else continue with any other code you need in the method
+ *   ...
+ * }
+ * }</pre>
+ *
+ * <p>This is where you will handle a scan result.</p>
+ *
+ * <p>Second, just call this in response to a user action somewhere to begin the scan process:</p>
+ *
+ * <pre>{@code
+ * IntentIntegrator integrator = new IntentIntegrator(yourActivity);
+ * integrator.initiateScan();
+ * }</pre>
+ *
+ * <p>Note that {@link #initiateScan()} returns an {@link AlertDialog} which is non-null if the
+ * user was prompted to download the application. This lets the calling app potentially manage the dialog.
+ * In particular, ideally, the app dismisses the dialog if it's still active in its {@link Activity#onPause()}
+ * method.</p>
+ * 
+ * <p>You can use {@link #setTitle(String)} to customize the title of this download prompt dialog (or, use
+ * {@link #setTitleByID(int)} to set the title by string resource ID.) Likewise, the prompt message, and
+ * yes/no button labels can be changed.</p>
+ *
+ * <p>Finally, you can use {@link #addExtra(String, Object)} to add more parameters to the Intent used
+ * to invoke the scanner. This can be used to set additional options not directly exposed by this
+ * simplified API.</p>
+ * 
+ * <p>By default, this will only allow applications that are known to respond to this intent correctly
+ * do so. The apps that are allowed to response can be set with {@link #setTargetApplications(List)}.
+ * For example, set to {@link #TARGET_BARCODE_SCANNER_ONLY} to only target the Barcode Scanner app itself.</p>
+ *
+ * <h2>Sharing text via barcode</h2>
+ *
+ * <p>To share text, encoded as a QR Code on-screen, similarly, see {@link #shareText(CharSequence)}.</p>
+ *
+ * <p>Some code, particularly download integration, was contributed from the Anobiit application.</p>
+ *
+ * <h2>Enabling experimental barcode formats</h2>
+ *
+ * <p>Some formats are not enabled by default even when scanning with {@link #ALL_CODE_TYPES}, such as
+ * PDF417. Use {@link #initiateScan(java.util.Collection)} with
+ * a collection containing the names of formats to scan for explicitly, like "PDF_417", to use such
+ * formats.</p>
+ *
+ * @author Sean Owen
+ * @author Fred Lin
+ * @author Isaac Potoczny-Jones
+ * @author Brad Drehmer
+ * @author gcstang
+ */
+public class IntentIntegrator {
+
+  public static final int REQUEST_CODE = 0x0000c0de; // Only use bottom 16 bits
+  private static final String TAG = IntentIntegrator.class.getSimpleName();
+
+  public static final String DEFAULT_TITLE = "Install Barcode Scanner?";
+  public static final String DEFAULT_MESSAGE =
+      "This application requires Barcode Scanner. Would you like to install it?";
+  public static final String DEFAULT_YES = "Yes";
+  public static final String DEFAULT_NO = "No";
+
+  private static final String BS_PACKAGE = "com.google.zxing.client.android";
+  private static final String BSPLUS_PACKAGE = "com.srowen.bs.android";
+
+  // supported barcode formats
+  public static final Collection<String> PRODUCT_CODE_TYPES = list("UPC_A", "UPC_E", "EAN_8", "EAN_13", "RSS_14");
+  public static final Collection<String> ONE_D_CODE_TYPES =
+      list("UPC_A", "UPC_E", "EAN_8", "EAN_13", "CODE_39", "CODE_93", "CODE_128",
+           "ITF", "RSS_14", "RSS_EXPANDED");
+  public static final Collection<String> QR_CODE_TYPES = Collections.singleton("QR_CODE");
+  public static final Collection<String> DATA_MATRIX_TYPES = Collections.singleton("DATA_MATRIX");
+
+  public static final Collection<String> ALL_CODE_TYPES = null;
+  
+  public static final List<String> TARGET_BARCODE_SCANNER_ONLY = Collections.singletonList(BS_PACKAGE);
+  public static final List<String> TARGET_ALL_KNOWN = list(
+          BSPLUS_PACKAGE,             // Barcode Scanner+
+          BSPLUS_PACKAGE + ".simple", // Barcode Scanner+ Simple
+          BS_PACKAGE                  // Barcode Scanner          
+          // What else supports this intent?
+      );
+  
+  private final Activity activity;
+  private final Fragment fragment;
+
+  private String title;
+  private String message;
+  private String buttonYes;
+  private String buttonNo;
+  private List<String> targetApplications;
+  private final Map<String,Object> moreExtras = new HashMap<String,Object>(3);
+
+  /**
+   * @param activity {@link Activity} invoking the integration
+   */
+  public IntentIntegrator(Activity activity) {
+    this.activity = activity;
+    this.fragment = null;
+    initializeConfiguration();
+  }
+
+  /**
+   * @param fragment {@link Fragment} invoking the integration.
+   *  {@link #startActivityForResult(Intent, int)} will be called on the {@link Fragment} instead
+   *  of an {@link Activity}
+   */
+  public IntentIntegrator(Fragment fragment) {
+    this.activity = fragment.getActivity();
+    this.fragment = fragment;
+    initializeConfiguration();
+  }
+
+  private void initializeConfiguration() {
+    title = DEFAULT_TITLE;
+    message = DEFAULT_MESSAGE;
+    buttonYes = DEFAULT_YES;
+    buttonNo = DEFAULT_NO;
+    targetApplications = TARGET_ALL_KNOWN;
+  }
+  
+  public String getTitle() {
+    return title;
+  }
+  
+  public void setTitle(String title) {
+    this.title = title;
+  }
+
+  public void setTitleByID(int titleID) {
+    title = activity.getString(titleID);
+  }
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public void setMessageByID(int messageID) {
+    message = activity.getString(messageID);
+  }
+
+  public String getButtonYes() {
+    return buttonYes;
+  }
+
+  public void setButtonYes(String buttonYes) {
+    this.buttonYes = buttonYes;
+  }
+
+  public void setButtonYesByID(int buttonYesID) {
+    buttonYes = activity.getString(buttonYesID);
+  }
+
+  public String getButtonNo() {
+    return buttonNo;
+  }
+
+  public void setButtonNo(String buttonNo) {
+    this.buttonNo = buttonNo;
+  }
+
+  public void setButtonNoByID(int buttonNoID) {
+    buttonNo = activity.getString(buttonNoID);
+  }
+  
+  public Collection<String> getTargetApplications() {
+    return targetApplications;
+  }
+  
+  public final void setTargetApplications(List<String> targetApplications) {
+    if (targetApplications.isEmpty()) {
+      throw new IllegalArgumentException("No target applications");
+    }
+    this.targetApplications = targetApplications;
+  }
+  
+  public void setSingleTargetApplication(String targetApplication) {
+    this.targetApplications = Collections.singletonList(targetApplication);
+  }
+
+  public Map<String,?> getMoreExtras() {
+    return moreExtras;
+  }
+
+  public final void addExtra(String key, Object value) {
+    moreExtras.put(key, value);
+  }
+
+  /**
+   * Initiates a scan for all known barcode types with the default camera.
+   *
+   * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
+   *   if a prompt was needed, or null otherwise.
+   */
+  public final AlertDialog initiateScan() {
+    return initiateScan(ALL_CODE_TYPES, -1);
+  }
+  
+  /**
+   * Initiates a scan for all known barcode types with the specified camera.
+   *
+   * @param cameraId camera ID of the camera to use. A negative value means "no preference".
+   * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
+   *   if a prompt was needed, or null otherwise.
+   */
+  public final AlertDialog initiateScan(int cameraId) {
+    return initiateScan(ALL_CODE_TYPES, cameraId);
+  }
+
+  /**
+   * Initiates a scan, using the default camera, only for a certain set of barcode types, given as strings corresponding
+   * to their names in ZXing's {@code BarcodeFormat} class like "UPC_A". You can supply constants
+   * like {@link #PRODUCT_CODE_TYPES} for example.
+   *
+   * @param desiredBarcodeFormats names of {@code BarcodeFormat}s to scan for
+   * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
+   *   if a prompt was needed, or null otherwise.
+   */
+  public final AlertDialog initiateScan(Collection<String> desiredBarcodeFormats) {
+    return initiateScan(desiredBarcodeFormats, -1);
+  }
+  
+  /**
+   * Initiates a scan, using the specified camera, only for a certain set of barcode types, given as strings corresponding
+   * to their names in ZXing's {@code BarcodeFormat} class like "UPC_A". You can supply constants
+   * like {@link #PRODUCT_CODE_TYPES} for example.
+   *
+   * @param desiredBarcodeFormats names of {@code BarcodeFormat}s to scan for
+   * @param cameraId camera ID of the camera to use. A negative value means "no preference".
+   * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
+   *   if a prompt was needed, or null otherwise
+   */
+  public final AlertDialog initiateScan(Collection<String> desiredBarcodeFormats, int cameraId) {
+    Intent intentScan = new Intent(BS_PACKAGE + ".SCAN");
+    intentScan.addCategory(Intent.CATEGORY_DEFAULT);
+
+    // check which types of codes to scan for
+    if (desiredBarcodeFormats != null) {
+      // set the desired barcode types
+      StringBuilder joinedByComma = new StringBuilder();
+      for (String format : desiredBarcodeFormats) {
+        if (joinedByComma.length() > 0) {
+          joinedByComma.append(',');
+        }
+        joinedByComma.append(format);
+      }
+      intentScan.putExtra("SCAN_FORMATS", joinedByComma.toString());
+    }
+
+    // check requested camera ID
+    if (cameraId >= 0) {
+      intentScan.putExtra("SCAN_CAMERA_ID", cameraId);
+    }
+
+    String targetAppPackage = findTargetAppPackage(intentScan);
+    if (targetAppPackage == null) {
+      return showDownloadDialog();
+    }
+    intentScan.setPackage(targetAppPackage);
+    intentScan.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+    intentScan.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+    attachMoreExtras(intentScan);
+    startActivityForResult(intentScan, REQUEST_CODE);
+    return null;
+  }
+
+  /**
+   * Start an activity. This method is defined to allow different methods of activity starting for
+   * newer versions of Android and for compatibility library.
+   *
+   * @param intent Intent to start.
+   * @param code Request code for the activity
+   * @see android.app.Activity#startActivityForResult(Intent, int)
+   * @see android.app.Fragment#startActivityForResult(Intent, int)
+   */
+  protected void startActivityForResult(Intent intent, int code) {
+    if (fragment == null) {
+      activity.startActivityForResult(intent, code);
+    } else {
+      fragment.startActivityForResult(intent, code);
+    }
+  }
+  
+  private String findTargetAppPackage(Intent intent) {
+    PackageManager pm = activity.getPackageManager();
+    List<ResolveInfo> availableApps = pm.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);
+    if (availableApps != null) {
+      for (String targetApp : targetApplications) {
+        if (contains(availableApps, targetApp)) {
+          return targetApp;
+        }
+      }
+    }
+    return null;
+  }
+  
+  private static boolean contains(Iterable<ResolveInfo> availableApps, String targetApp) {
+    for (ResolveInfo availableApp : availableApps) {
+      String packageName = availableApp.activityInfo.packageName;
+      if (targetApp.equals(packageName)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private AlertDialog showDownloadDialog() {
+    AlertDialog.Builder downloadDialog = new AlertDialog.Builder(activity);
+    downloadDialog.setTitle(title);
+    downloadDialog.setMessage(message);
+    downloadDialog.setPositiveButton(buttonYes, new DialogInterface.OnClickListener() {
+      @Override
+      public void onClick(DialogInterface dialogInterface, int i) {
+        String packageName;
+        if (targetApplications.contains(BS_PACKAGE)) {
+          // Prefer to suggest download of BS if it's anywhere in the list
+          packageName = BS_PACKAGE;
+        } else {
+          // Otherwise, first option:
+          packageName = targetApplications.get(0);
+        }
+        Uri uri = Uri.parse("market://details?id=" + packageName);
+        Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+        try {
+          if (fragment == null) {
+            activity.startActivity(intent);
+          } else {
+            fragment.startActivity(intent);
+          }
+        } catch (ActivityNotFoundException anfe) {
+          // Hmm, market is not installed
+          Log.w(TAG, "Google Play is not installed; cannot install " + packageName);
+        }
+      }
+    });
+    downloadDialog.setNegativeButton(buttonNo, null);
+    downloadDialog.setCancelable(true);
+    return downloadDialog.show();
+  }
+
+
+  /**
+   * <p>Call this from your {@link Activity}'s
+   * {@link Activity#onActivityResult(int, int, Intent)} method.</p>
+   *
+   * @param requestCode request code from {@code onActivityResult()}
+   * @param resultCode result code from {@code onActivityResult()}
+   * @param intent {@link Intent} from {@code onActivityResult()}
+   * @return null if the event handled here was not related to this class, or
+   *  else an {@link IntentResult} containing the result of the scan. If the user cancelled scanning,
+   *  the fields will be null.
+   */
+  public static IntentResult parseActivityResult(int requestCode, int resultCode, Intent intent) {
+    if (requestCode == REQUEST_CODE) {
+      if (resultCode == Activity.RESULT_OK) {
+        String contents = intent.getStringExtra("SCAN_RESULT");
+        String formatName = intent.getStringExtra("SCAN_RESULT_FORMAT");
+        byte[] rawBytes = intent.getByteArrayExtra("SCAN_RESULT_BYTES");
+        int intentOrientation = intent.getIntExtra("SCAN_RESULT_ORIENTATION", Integer.MIN_VALUE);
+        Integer orientation = intentOrientation == Integer.MIN_VALUE ? null : intentOrientation;
+        String errorCorrectionLevel = intent.getStringExtra("SCAN_RESULT_ERROR_CORRECTION_LEVEL");
+        return new IntentResult(contents,
+                                formatName,
+                                rawBytes,
+                                orientation,
+                                errorCorrectionLevel);
+      }
+      return new IntentResult();
+    }
+    return null;
+  }
+
+
+  /**
+   * Defaults to type "TEXT_TYPE".
+   *
+   * @param text the text string to encode as a barcode
+   * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
+   *   if a prompt was needed, or null otherwise
+   * @see #shareText(CharSequence, CharSequence)
+   */
+  public final AlertDialog shareText(CharSequence text) {
+    return shareText(text, "TEXT_TYPE");
+  }
+
+  /**
+   * Shares the given text by encoding it as a barcode, such that another user can
+   * scan the text off the screen of the device.
+   *
+   * @param text the text string to encode as a barcode
+   * @param type type of data to encode. See {@code com.google.zxing.client.android.Contents.Type} constants.
+   * @return the {@link AlertDialog} that was shown to the user prompting them to download the app
+   *   if a prompt was needed, or null otherwise
+   */
+  public final AlertDialog shareText(CharSequence text, CharSequence type) {
+    Intent intent = new Intent();
+    intent.addCategory(Intent.CATEGORY_DEFAULT);
+    intent.setAction(BS_PACKAGE + ".ENCODE");
+    intent.putExtra("ENCODE_TYPE", type);
+    intent.putExtra("ENCODE_DATA", text);
+    String targetAppPackage = findTargetAppPackage(intent);
+    if (targetAppPackage == null) {
+      return showDownloadDialog();
+    }
+    intent.setPackage(targetAppPackage);
+    intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+    intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+    attachMoreExtras(intent);
+    if (fragment == null) {
+      activity.startActivity(intent);
+    } else {
+      fragment.startActivity(intent);
+    }
+    return null;
+  }
+  
+  private static List<String> list(String... values) {
+    return Collections.unmodifiableList(Arrays.asList(values));
+  }
+
+  private void attachMoreExtras(Intent intent) {
+    for (Map.Entry<String,Object> entry : moreExtras.entrySet()) {
+      String key = entry.getKey();
+      Object value = entry.getValue();
+      // Kind of hacky
+      if (value instanceof Integer) {
+        intent.putExtra(key, (Integer) value);
+      } else if (value instanceof Long) {
+        intent.putExtra(key, (Long) value);
+      } else if (value instanceof Boolean) {
+        intent.putExtra(key, (Boolean) value);
+      } else if (value instanceof Double) {
+        intent.putExtra(key, (Double) value);
+      } else if (value instanceof Float) {
+        intent.putExtra(key, (Float) value);
+      } else if (value instanceof Bundle) {
+        intent.putExtra(key, (Bundle) value);
+      } else {
+        intent.putExtra(key, value.toString());
+      }
+    }
+  }
+
+}
diff --git a/app/src/main/java/com/google/zxing/integration/android/IntentResult.java b/app/src/main/java/com/google/zxing/integration/android/IntentResult.java
new file mode 100644
index 0000000..2469af9
--- /dev/null
+++ b/app/src/main/java/com/google/zxing/integration/android/IntentResult.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2009 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.integration.android;
+
+/**
+ * <p>Encapsulates the result of a barcode scan invoked through {@link IntentIntegrator}.</p>
+ *
+ * @author Sean Owen
+ */
+public final class IntentResult {
+
+  private final String contents;
+  private final String formatName;
+  private final byte[] rawBytes;
+  private final Integer orientation;
+  private final String errorCorrectionLevel;
+
+  IntentResult() {
+    this(null, null, null, null, null);
+  }
+
+  IntentResult(String contents,
+               String formatName,
+               byte[] rawBytes,
+               Integer orientation,
+               String errorCorrectionLevel) {
+    this.contents = contents;
+    this.formatName = formatName;
+    this.rawBytes = rawBytes;
+    this.orientation = orientation;
+    this.errorCorrectionLevel = errorCorrectionLevel;
+  }
+
+  /**
+   * @return raw content of barcode
+   */
+  public String getContents() {
+    return contents;
+  }
+
+  /**
+   * @return name of format, like "QR_CODE", "UPC_A". See {@code BarcodeFormat} for more format names.
+   */
+  public String getFormatName() {
+    return formatName;
+  }
+
+  /**
+   * @return raw bytes of the barcode content, if applicable, or null otherwise
+   */
+  public byte[] getRawBytes() {
+    return rawBytes;
+  }
+
+  /**
+   * @return rotation of the image, in degrees, which resulted in a successful scan. May be null.
+   */
+  public Integer getOrientation() {
+    return orientation;
+  }
+
+  /**
+   * @return name of the error correction level used in the barcode, if applicable
+   */
+  public String getErrorCorrectionLevel() {
+    return errorCorrectionLevel;
+  }
+  
+  @Override
+  public String toString() {
+    StringBuilder dialogText = new StringBuilder(100);
+    dialogText.append("Format: ").append(formatName).append('\n');
+    dialogText.append("Contents: ").append(contents).append('\n');
+    int rawBytesLength = rawBytes == null ? 0 : rawBytes.length;
+    dialogText.append("Raw bytes: (").append(rawBytesLength).append(" bytes)\n");
+    dialogText.append("Orientation: ").append(orientation).append('\n');
+    dialogText.append("EC level: ").append(errorCorrectionLevel).append('\n');
+    return dialogText.toString();
+  }
+
+}
diff --git a/app/src/main/java/org/torproject/android/OnBootReceiver.java b/app/src/main/java/org/torproject/android/OnBootReceiver.java
new file mode 100644
index 0000000..c5a3ff4
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/OnBootReceiver.java
@@ -0,0 +1,48 @@
+package org.torproject.android;
+
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import org.torproject.android.service.Prefs;
+import org.torproject.android.service.TorService;
+import org.torproject.android.service.TorServiceConstants;
+import org.torproject.android.vpn.VPNEnableActivity;
+
+public class OnBootReceiver extends BroadcastReceiver {
+	
+	@Override
+	public void onReceive(Context context, Intent intent) {
+	    Prefs.setContext(context);
+		if (Prefs.startOnBoot())
+		{			
+
+			if (Prefs.useVpn())
+				startVpnService(context); //VPN will start Tor once it is done
+			else
+				startService(TorServiceConstants.ACTION_START, context);
+				
+		}
+	}
+	
+	public void startVpnService (final Context context)
+    	{
+		   Intent intent = new Intent(context,VPNEnableActivity.class);
+           intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+           context.startActivity(intent);
+    	}
+
+	private void startService (String action, Context context)
+	{
+		
+		Intent torService = new Intent(context, TorService.class);
+		torService.setAction(action);
+		context.startService(torService);
+		
+        
+	}
+	
+	
+}
+
diff --git a/app/src/main/java/org/torproject/android/OrbotApp.java b/app/src/main/java/org/torproject/android/OrbotApp.java
new file mode 100644
index 0000000..b5ee192
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/OrbotApp.java
@@ -0,0 +1,57 @@
+
+package org.torproject.android;
+
+import android.app.Activity;
+import android.app.Application;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.util.Log;
+
+import org.torproject.android.service.OrbotConstants;
+import org.torproject.android.service.Prefs;
+import org.torproject.android.service.TorServiceConstants;
+
+import org.torproject.android.settings.Languages;
+
+import java.io.File;
+import java.util.Locale;
+
+public class OrbotApp extends Application implements OrbotConstants
+{
+
+    private Locale locale;
+
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        Prefs.setContext(this);
+
+        Languages.setup(OrbotMainActivity.class, R.string.menu_settings);
+        Languages.setLanguage(this, Prefs.getDefaultLocale(), true);
+
+
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        Log.i(TAG, "onConfigurationChanged " + newConfig.locale.getLanguage());
+        Languages.setLanguage(this, Prefs.getDefaultLocale(), true);
+    }
+	
+    public static void forceChangeLanguage(Activity activity) {
+        Intent intent = activity.getIntent();
+        if (intent == null) // when launched as LAUNCHER
+            intent = new Intent(activity, OrbotMainActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+        activity.finish();
+        activity.overridePendingTransition(0, 0);
+        activity.startActivity(intent);
+        activity.overridePendingTransition(0, 0);
+    }
+
+    public static Languages getLanguages(Activity activity) {
+        return Languages.get(activity);
+    }
+}
diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
new file mode 100644
index 0000000..baa9236
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -0,0 +1,1442 @@
+/* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - https://guardianproject.info */
+/* See LICENSE for licensing information */
+
+package org.torproject.android;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Locale;
+import java.util.Random;
+import java.util.StringTokenizer;
+
+import org.json.JSONArray;
+import org.torproject.android.service.OrbotConstants;
+import org.torproject.android.service.Prefs;
+import org.torproject.android.service.TorService;
+import org.torproject.android.service.TorServiceConstants;
+import org.torproject.android.service.TorServiceUtils;
+import org.torproject.android.settings.SettingsPreferences;
+import org.torproject.android.ui.ImageProgressView;
+import org.torproject.android.ui.PromoAppsActivity;
+import org.torproject.android.ui.Rotate3dAnimation;
+import org.torproject.android.vpn.VPNEnableActivity;
+
+import android.annotation.SuppressLint;
+import android.app.ActivityManager;
+import android.app.ActivityManager.RunningServiceInfo;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.os.RemoteException;
+import android.support.v4.content.LocalBroadcastManager;
+import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.GestureDetector;
+import android.view.GestureDetector.SimpleOnGestureListener;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnLongClickListener;
+import android.view.View.OnTouchListener;
+import android.view.animation.AccelerateInterpolator;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.Toast;
+import android.widget.ToggleButton;
+
+import com.google.zxing.integration.android.IntentIntegrator;
+import com.google.zxing.integration.android.IntentResult;
+
+public class OrbotMainActivity extends AppCompatActivity
+        implements OrbotConstants, OnLongClickListener, OnTouchListener {
+
+    /* Useful UI bits */
+    private TextView lblStatus = null; //the main text display widget
+    private ImageProgressView imgStatus = null; //the main touchable image for activating Orbot
+
+    private TextView downloadText = null;
+    private TextView uploadText = null;
+    private TextView mTxtOrbotLog = null;
+    
+    private Button mBtnBrowser = null;
+    private ToggleButton mBtnVPN = null;
+    private ToggleButton mBtnBridges = null;
+    
+    private Spinner spnCountries = null;
+
+	private DrawerLayout mDrawer;
+	private ActionBarDrawerToggle mDrawerToggle;
+	
+    /* Some tracking bits */
+    private String torStatus = null; //latest status reported from the tor service
+    private Intent lastStatusIntent;  // the last ACTION_STATUS Intent received
+
+    private SharedPreferences mPrefs = null;
+
+    private boolean autoStartFromIntent = false;
+    
+    private final static int REQUEST_VPN = 8888;
+    private final static int REQUEST_SETTINGS = 0x9874;
+
+    // message types for mStatusUpdateHandler
+    private final static int STATUS_UPDATE = 1;
+    private static final int MESSAGE_TRAFFIC_COUNT = 2;
+
+	public final static String INTENT_ACTION_REQUEST_HIDDEN_SERVICE = "org.torproject.android.REQUEST_HS_PORT";
+	public final static String INTENT_ACTION_REQUEST_START_TOR = "org.torproject.android.START_TOR";	
+
+	// for bridge loading from the assets default bridges.txt file
+    class Bridge
+    {
+    	String type;
+    	String config;
+    }
+    
+    private ArrayList<Bridge> alBridges = null;
+    
+    //this is needed for backwards compat back to Android 2.3.*
+    @SuppressLint("NewApi")
+    public View onCreateView(View parent, String name, Context context, AttributeSet attrs)
+    {
+        if(Build.VERSION.SDK_INT >= 11)
+          return super.onCreateView(parent, name, context, attrs);
+        return null;
+    }
+    
+    /** Called when the activity is first created. */
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+
+        /* Create the widgets before registering for broadcasts to guarantee
+         * that the widgets exist when the status updates try to update them */
+    	doLayout();
+
+    	/* receive the internal status broadcasts, which are separate from the public
+    	 * status broadcasts to prevent other apps from sending fake/wrong status
+    	 * info to this app */
+        LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);
+        lbm.registerReceiver(mLocalBroadcastReceiver,
+                new IntentFilter(TorServiceConstants.ACTION_STATUS));
+        lbm.registerReceiver(mLocalBroadcastReceiver,
+                new IntentFilter(TorServiceConstants.LOCAL_ACTION_BANDWIDTH));
+        lbm.registerReceiver(mLocalBroadcastReceiver,
+                new IntentFilter(TorServiceConstants.LOCAL_ACTION_LOG));
+	}
+
+	private void sendIntentToService(String action) {
+		Intent torService = new Intent(this, TorService.class);    
+		torService.setAction(action);
+		startService(torService);
+	}
+
+    private void stopTor() {
+        imgStatus.setImageResource(R.drawable.torstarting);
+        Intent torService = new Intent(this, TorService.class);
+        stopService(torService);
+    }
+
+    /**
+     * The state and log info from {@link TorService} are sent to the UI here in
+     * the form of a local broadcast. Regular broadcasts can be sent by any app,
+     * so local ones are used here so other apps cannot interfere with Orbot's
+     * operation.
+     */
+    private BroadcastReceiver mLocalBroadcastReceiver = new BroadcastReceiver() {
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (action == null)
+                return;
+
+            if (action.equals(TorServiceConstants.LOCAL_ACTION_LOG)) {
+                Message msg = mStatusUpdateHandler.obtainMessage(STATUS_UPDATE);
+                msg.obj = intent.getStringExtra(TorServiceConstants.LOCAL_EXTRA_LOG);
+                msg.getData().putString("status", intent.getStringExtra(TorServiceConstants.EXTRA_STATUS));
+                mStatusUpdateHandler.sendMessage(msg);
+
+            } else if (action.equals(TorServiceConstants.LOCAL_ACTION_BANDWIDTH)) {
+                long upload = intent.getLongExtra("up", 0);
+                long download = intent.getLongExtra("down", 0);
+                long written = intent.getLongExtra("written", 0);
+                long read = intent.getLongExtra("read", 0);
+
+                Message msg = mStatusUpdateHandler.obtainMessage(MESSAGE_TRAFFIC_COUNT);
+                msg.getData().putLong("download", download);
+                msg.getData().putLong("upload", upload);
+                msg.getData().putLong("readTotal", read);
+                msg.getData().putLong("writeTotal", written);
+                msg.getData().putString("status", intent.getStringExtra(TorServiceConstants.EXTRA_STATUS));
+
+                mStatusUpdateHandler.sendMessage(msg);
+
+            } else if (action.equals(TorServiceConstants.ACTION_STATUS)) {
+                lastStatusIntent = intent;
+                
+                Message msg = mStatusUpdateHandler.obtainMessage(STATUS_UPDATE);
+                msg.getData().putString("status", intent.getStringExtra(TorServiceConstants.EXTRA_STATUS));
+
+                mStatusUpdateHandler.sendMessage(msg);
+            }
+        }
+    };
+ 
+    private void doLayout ()
+    {
+        setContentView(R.layout.layout_main);
+        
+        setTitle(R.string.app_name);
+
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        
+        mDrawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+          mDrawerToggle = new ActionBarDrawerToggle(
+              this,  mDrawer,        
+              toolbar,
+              android.R.string.ok, android.R.string.cancel
+          );
+
+      getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+      getSupportActionBar().setHomeButtonEnabled(true);
+      
+      mDrawer.setDrawerListener(mDrawerToggle);
+      mDrawerToggle.syncState();
+        
+        mTxtOrbotLog = (TextView)findViewById(R.id.orbotLog);
+        
+        lblStatus = (TextView)findViewById(R.id.lblStatus);
+        lblStatus.setOnLongClickListener(this);
+        imgStatus = (ImageProgressView)findViewById(R.id.imgStatus);
+        imgStatus.setOnLongClickListener(this);
+        imgStatus.setOnTouchListener(this);
+        
+        downloadText = (TextView)findViewById(R.id.trafficDown);
+        uploadText = (TextView)findViewById(R.id.trafficUp);
+        
+        
+        downloadText.setText(formatCount(0) + " / " + formatTotal(0));
+        uploadText.setText(formatCount(0) + " / " + formatTotal(0));
+    
+        // Gesture detection
+		mGestureDetector = new GestureDetector(this, new MyGestureDetector());
+		
+		mBtnBrowser = (Button)findViewById(R.id.btnBrowser);
+		mBtnBrowser.setOnClickListener(new View.OnClickListener ()
+		{
+
+			@Override
+			public void onClick(View v) {
+				doTorCheck();
+				
+			}
+
+		});
+		
+		mBtnBrowser.setEnabled(false);
+		
+		mBtnVPN = (ToggleButton)findViewById(R.id.btnVPN);
+		
+		boolean canDoVPN = Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH;
+
+		if (!canDoVPN)
+		{
+			//if not SDK 14 or higher, we can't use the VPN feature
+			mBtnVPN.setVisibility(View.GONE);
+		}
+		else
+		{
+			boolean useVPN = Prefs.useVpn();
+			mBtnVPN.setChecked(useVPN);
+			
+			//auto start VPN if VPN is enabled
+			if (useVPN)
+			{
+				startActivity(new Intent(OrbotMainActivity.this,VPNEnableActivity.class));
+			}
+			
+			mBtnVPN.setOnClickListener(new View.OnClickListener ()
+			{
+	
+				@Override
+				public void onClick(View v) {
+	
+					if (mBtnVPN.isChecked())
+						startActivity(new Intent(OrbotMainActivity.this,VPNEnableActivity.class));
+					else
+						stopVpnService();
+					
+				}
+	
+			});
+		}
+		
+		
+		mBtnBridges = (ToggleButton)findViewById(R.id.btnBridges);
+		mBtnBridges.setChecked(Prefs.bridgesEnabled());
+		mBtnBridges.setOnClickListener(new View.OnClickListener ()
+		{
+
+			@Override
+			public void onClick(View v) {
+				if (Build.CPU_ABI.contains("arm"))
+				{       
+					promptSetupBridges (); //if ARM processor, show all bridge options
+				
+				}
+				else
+				{
+					Toast.makeText(OrbotMainActivity.this, R.string.note_only_standard_tor_bridges_work_on_intel_x86_atom_devices, Toast.LENGTH_LONG).show();
+					showGetBridgePrompt(""); //if other chip ar, only stock bridges are supported
+				}
+			}
+
+			
+		});
+		
+		
+		String currentExit = Prefs.getExitNodes();
+		int selIdx = -1;
+		
+		ArrayList<String> cList = new ArrayList<String>();
+		cList.add(0, getString(R.string.vpn_default_world));
+	
+		for (int i = 0; i < TorServiceConstants.COUNTRY_CODES.length; i++)
+		{
+			Locale locale = new Locale("",TorServiceConstants.COUNTRY_CODES[i]);
+			cList.add(locale.getDisplayCountry());
+			
+			if (currentExit.contains(TorServiceConstants.COUNTRY_CODES[i]))
+				selIdx = i+1;
+		}
+		
+		spnCountries = (Spinner)findViewById(R.id.spinnerCountry);
+		ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,android.R.layout.simple_spinner_item, cList);
+		spnCountries.setAdapter(adapter);
+		
+		if (selIdx != -1)
+			spnCountries.setSelection(selIdx);
+		
+		spnCountries.setOnItemSelectedListener(new OnItemSelectedListener() {
+		    @Override
+		    public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) {
+		        // your code here
+		    	
+		    	String country = null;
+		    	
+		    	if (position == 0)
+		    		country = "";
+		    	else
+		    		country =  '{' + TorServiceConstants.COUNTRY_CODES[position-1] + '}';
+		    	
+		    	Intent torService = new Intent(OrbotMainActivity.this, TorService.class);    
+				torService.setAction(TorServiceConstants.CMD_SET_EXIT);
+				torService.putExtra("exit",country);
+				startService(torService);
+	    	
+		    }
+
+		    @Override
+		    public void onNothingSelected(AdapterView<?> parentView) {
+		        // your code here
+		    }
+
+		});
+    }
+    
+    GestureDetector mGestureDetector;
+    
+
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        return mGestureDetector.onTouchEvent(event);
+	}
+   	
+    
+   /*
+    * Create the UI Options Menu (non-Javadoc)
+    * @see android.app.Activity#onCreateOptionsMenu(android.view.Menu)
+    */
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.orbot_main, menu);
+
+        return true;
+    }
+    
+    
+
+    @Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		
+    	 if (item.getItemId() == R.id.menu_settings)
+         {
+             Intent intent = new Intent(OrbotMainActivity.this, SettingsPreferences.class);
+             startActivityForResult(intent, REQUEST_SETTINGS);
+         }
+         else if (item.getItemId() == R.id.menu_promo_apps)
+         {
+             startActivity(new Intent(OrbotMainActivity.this, PromoAppsActivity.class));
+
+         }
+         else if (item.getItemId() == R.id.menu_exit)
+         {
+                 //exit app
+                 doExit();
+                 
+                 
+         }
+         else if (item.getItemId() == R.id.menu_about)
+         {
+                 showAbout();
+                 
+                 
+         }
+         else if (item.getItemId() == R.id.menu_scan)
+         {
+         	IntentIntegrator integrator = new IntentIntegrator(OrbotMainActivity.this);
+         	integrator.initiateScan();
+         }
+         else if (item.getItemId() == R.id.menu_share_bridge)
+         {
+         	
+     		String bridges = Prefs.getBridgesList();
+         	
+     		if (bridges != null && bridges.length() > 0)
+     		{
+         		try {
+						bridges = "bridge://" + URLEncoder.encode(bridges,"UTF-8");
+	            		
+	                	IntentIntegrator integrator = new IntentIntegrator(OrbotMainActivity.this);
+	                	integrator.shareText(bridges);
+	                	
+					} catch (UnsupportedEncodingException e) {
+						// TODO Auto-generated catch block
+						e.printStackTrace();
+					}
+     		}
+
+         }
+     
+		return super.onOptionsItemSelected(item);
+	}
+
+	private void showAbout ()
+        {
+                
+            LayoutInflater li = LayoutInflater.from(this);
+            View view = li.inflate(R.layout.layout_about, null); 
+            
+            String version = "";
+            
+            try {
+                version = getPackageManager().getPackageInfo(getPackageName(), 0).versionName + " (Tor " + TorServiceConstants.BINARY_TOR_VERSION + ")";
+            } catch (NameNotFoundException e) {
+                version = "Version Not Found";
+            }
+            
+            TextView versionName = (TextView)view.findViewById(R.id.versionName);
+            versionName.setText(version);    
+            
+                    new AlertDialog.Builder(this)
+            .setTitle(getString(R.string.button_about))
+            .setView(view)
+            .show();
+        }
+
+
+    /**
+     * This is our attempt to REALLY exit Orbot, and stop the background service
+     * However, Android doesn't like people "quitting" apps, and/or our code may
+     * not be quite right b/c no matter what we do, it seems like the TorService
+     * still exists
+     **/
+    private void doExit() {
+        stopTor();
+
+        // Kill all the wizard activities
+        setResult(RESULT_CLOSE_ALL);
+        finish();
+    }
+
+	protected void onPause() {
+		try
+		{
+			super.onPause();
+	
+			if (aDialog != null)
+				aDialog.dismiss();
+		}
+		catch (IllegalStateException ise)
+		{
+			//can happen on exit/shutdown
+		}
+	}
+
+	private void doTorCheck ()
+	{
+		
+		openBrowser(URL_TOR_CHECK,false);
+		
+
+	}
+	
+	private void enableHiddenServicePort (int hsPort) throws RemoteException, InterruptedException
+	{
+		
+		Editor pEdit = mPrefs.edit();
+		
+		String hsPortString = mPrefs.getString("pref_hs_ports", "");
+		String onionHostname = mPrefs.getString("pref_hs_hostname","");
+		
+		if (hsPortString.indexOf(hsPort+"")==-1)
+		{
+			if (hsPortString.length() > 0 && hsPortString.indexOf(hsPort+"")==-1)
+				hsPortString += ',' + hsPort;
+			else
+				hsPortString = hsPort + "";
+			
+			pEdit.putString("pref_hs_ports", hsPortString);
+			pEdit.putBoolean("pref_hs_enable", true);
+			
+			pEdit.commit();
+		}
+
+		if (onionHostname == null || onionHostname.length() == 0)
+		{
+			requestTorRereadConfig();
+
+			new Thread () {
+
+			    public void run ()
+				{
+					String onionHostname = mPrefs.getString("pref_hs_hostname","");
+
+					while (onionHostname.length() == 0)				
+					{
+						//we need to stop and start Tor
+						try {					
+							Thread.sleep(3000); //wait three seconds					
+						} catch (Exception e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						}
+						 
+						onionHostname = mPrefs.getString("pref_hs_hostname","");						
+					}
+					
+					Intent nResult = new Intent();
+					nResult.putExtra("hs_host", onionHostname);
+					setResult(RESULT_OK, nResult);
+					finish();
+				}
+			}.start();
+		
+		}
+		else
+		{
+			Intent nResult = new Intent();
+			nResult.putExtra("hs_host", onionHostname);
+			setResult(RESULT_OK, nResult);
+			finish();
+		}
+	
+	}
+	
+	private synchronized void handleIntents ()
+	{
+		if (getIntent() == null)
+			return;
+		
+	    // Get intent, action and MIME type
+	    Intent intent = getIntent();
+	    String action = intent.getAction();
+	    Log.d(TAG, "handleIntents " + action);
+
+	    //String type = intent.getType();
+		
+		if (action == null)
+			return;
+		
+		if (action.equals(INTENT_ACTION_REQUEST_HIDDEN_SERVICE))
+		{
+        	final int hiddenServicePortRequest = getIntent().getIntExtra("hs_port", -1);
+
+			DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
+			    
+			    public void onClick(DialogInterface dialog, int which) {
+			        switch (which){
+			        case DialogInterface.BUTTON_POSITIVE:
+			            
+						try {
+							enableHiddenServicePort (hiddenServicePortRequest);
+							
+						} catch (RemoteException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						} catch (InterruptedException e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						}
+
+						
+			            break;
+
+			        case DialogInterface.BUTTON_NEGATIVE:
+			            //No button clicked
+			        	finish();
+			            break;
+			        }
+			    }
+			};
+
+
+			String requestMsg = getString(R.string.hidden_service_request, hiddenServicePortRequest);
+			AlertDialog.Builder builder = new AlertDialog.Builder(this);
+			builder.setMessage(requestMsg).setPositiveButton("Allow", dialogClickListener)
+			    .setNegativeButton("Deny", dialogClickListener).show();
+			
+			return; //don't null the setIntent() as we need it later
+		}
+		else if (action.equals(INTENT_ACTION_REQUEST_START_TOR))
+		{
+			autoStartFromIntent = true;
+          
+            startTor();
+
+            //never allow backgrounds start from this type of intent start
+            //app devs who want background starts, can use the service intents
+            /**
+            if (Prefs.allowBackgroundStarts())
+            {            
+	            Intent resultIntent;
+	            if (lastStatusIntent == null) {
+	                resultIntent = new Intent(intent);
+	            } else {
+	                resultIntent = lastStatusIntent;
+	            }
+	            resultIntent.putExtra(TorServiceConstants.EXTRA_STATUS, torStatus);
+	            setResult(RESULT_OK, resultIntent);
+	            finish();
+            }*/
+          
+		}
+		else if (action.equals(Intent.ACTION_VIEW))
+		{
+			String urlString = intent.getDataString();
+			
+			if (urlString != null)
+			{
+				
+				if (urlString.toLowerCase().startsWith("bridge://"))
+
+				{
+					String newBridgeValue = urlString.substring(9); //remove the bridge protocol piece
+					newBridgeValue = URLDecoder.decode(newBridgeValue); //decode the value here
+
+					showAlert(getString(R.string.bridges_updated),getString(R.string.restart_orbot_to_use_this_bridge_) + newBridgeValue,false);	
+					
+					setNewBridges(newBridgeValue);
+				}
+			}
+		}
+		
+		updateStatus(null);
+		
+		setIntent(null);
+		
+		
+	}
+		
+	private void setNewBridges (String newBridgeValue)
+	{
+
+		Prefs.setBridgesList(newBridgeValue); //set the string to a preference
+		Prefs.putBridgesEnabled(true);
+		
+		setResult(RESULT_OK);
+		
+		mBtnBridges.setChecked(true);
+		
+		enableBridges(true);
+	}	
+
+	/*
+	 * Launch the system activity for Uri viewing with the provided url
+	 */
+	private void openBrowser(final String browserLaunchUrl,boolean forceExternal)
+	{
+		boolean isBrowserInstalled = appInstalledOrNot(TorServiceConstants.BROWSER_APP_USERNAME);
+		
+		if (mBtnVPN.isChecked()||forceExternal)
+		{
+			//use the system browser since VPN is on
+			Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl));
+			intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP|Intent.FLAG_ACTIVITY_NEW_TASK);
+			startActivity(intent);
+		}
+		else if (Prefs.useTransparentProxying())
+		{
+			Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl));
+			intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP|Intent.FLAG_ACTIVITY_NEW_TASK);
+			startActivity(intent);
+		}
+		else if (isBrowserInstalled)
+		{
+			startIntent(TorServiceConstants.BROWSER_APP_USERNAME,Intent.ACTION_VIEW,Uri.parse(browserLaunchUrl));						
+		}
+		else
+		{
+			AlertDialog aDialog = new AlertDialog.Builder(OrbotMainActivity.this)
+              .setIcon(R.drawable.onion32)
+		      .setTitle(R.string.install_apps_)
+		      .setMessage(R.string.it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_)
+		      .setPositiveButton(R.string.install_orweb, new Dialog.OnClickListener ()
+		      {
+
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+
+					//prompt to install Orweb
+					Intent intent = new Intent(OrbotMainActivity.this,PromoAppsActivity.class);
+					startActivity(intent);
+					
+				}
+		    	  
+		      })
+		      .setNegativeButton(R.string.standard_browser, new Dialog.OnClickListener ()
+		      {
+
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl));
+					intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP|Intent.FLAG_ACTIVITY_NEW_TASK);
+					startActivity(intent);
+					
+				}
+		    	  
+		      })
+		      .show();
+			  
+		}
+		
+	}
+	
+	
+	
+    
+
+    private void startIntent (String pkg, String action, Uri data)
+    {
+        Intent i;
+        PackageManager manager = getPackageManager();
+        try {
+            i = manager.getLaunchIntentForPackage(pkg);
+            if (i == null)
+                throw new PackageManager.NameNotFoundException();            
+            i.setAction(action);
+            i.setData(data);
+            startActivity(i);
+        } catch (PackageManager.NameNotFoundException e) {
+
+        }
+    }
+    
+    private boolean appInstalledOrNot(String uri)
+    {
+        PackageManager pm = getPackageManager();
+        try
+        {
+               PackageInfo pi = pm.getPackageInfo(uri, PackageManager.GET_ACTIVITIES);               
+               return pi.applicationInfo.enabled;
+        }
+        catch (PackageManager.NameNotFoundException e)
+        {
+              return false;
+        }
+   }    
+    
+    @Override
+    protected void onActivityResult(int request, int response, Intent data) {
+        super.onActivityResult(request, response, data);
+
+        if (request == REQUEST_SETTINGS && response == RESULT_OK)
+        {
+            OrbotApp.forceChangeLanguage(this);
+            if (data != null && data.getBooleanExtra("transproxywipe", false))
+            {
+                    
+                    boolean result = flushTransProxy();
+                    
+                    if (result)
+                    {
+
+                        Toast.makeText(this, R.string.transparent_proxy_rules_flushed_, Toast.LENGTH_SHORT).show();
+                         
+                    }
+                    else
+                    {
+
+                        Toast.makeText(this, R.string.you_do_not_have_root_access_enabled, Toast.LENGTH_SHORT).show();
+                         
+                    }
+                
+            }
+            else if (torStatus == TorServiceConstants.STATUS_ON)
+            {
+                updateTransProxy();
+               // Toast.makeText(this, R.string.you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_, Toast.LENGTH_SHORT).show();
+
+            }
+        }
+        else if (request == REQUEST_VPN && response == RESULT_OK)
+        {
+            sendIntentToService(TorServiceConstants.CMD_VPN);
+        }
+        
+        IntentResult scanResult = IntentIntegrator.parseActivityResult(request, response, data);
+        if (scanResult != null) {
+             // handle scan result
+        	
+        	String results = scanResult.getContents();
+        	
+        	if (results != null && results.length() > 0)
+        	{
+	        	try {
+					
+					int urlIdx = results.indexOf("://");
+					
+					if (urlIdx!=-1)
+					{
+						results = URLDecoder.decode(results, "UTF-8");
+						results = results.substring(urlIdx+3);
+
+						showAlert(getString(R.string.bridges_updated),getString(R.string.restart_orbot_to_use_this_bridge_) + results,false);	
+						
+						setNewBridges(results);
+					}
+					else
+					{
+						JSONArray bridgeJson = new JSONArray(results);
+						StringBuffer bridgeLines = new StringBuffer();
+						
+						for (int i = 0; i < bridgeJson.length(); i++)
+						{
+							String bridgeLine = bridgeJson.getString(i);
+							bridgeLines.append(bridgeLine).append("\n");
+						}
+						
+						setNewBridges(bridgeLines.toString());
+					}
+					
+					
+				} catch (Exception e) {
+					Log.e(TAG,"unsupported",e);
+				}
+        	}
+        	
+          }
+        
+    }
+    
+    public void promptSetupBridges ()
+    {
+    	loadBridgeDefaults();
+    	
+    	LayoutInflater li = LayoutInflater.from(this);
+        View view = li.inflate(R.layout.layout_diag, null); 
+        
+        TextView versionName = (TextView)view.findViewById(R.id.diaglog);
+        versionName.setText(R.string.if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_);    
+        
+        if (mBtnBridges.isChecked())
+        {
+	        new AlertDialog.Builder(this)
+	        .setTitle(R.string.bridge_mode)
+	        .setView(view)
+	        .setItems(R.array.bridge_options, new DialogInterface.OnClickListener() {
+               public void onClick(DialogInterface dialog, int which) {
+               // The 'which' argument contains the index position
+               // of the selected item
+            	   
+            	   switch (which)
+            	   {
+            	   case 0: //obfs 4;
+            		   setupBridgeType("obfs4");
+            		   enableBridges(true);
+
+            		   break;
+            	   case 1: //obfs3
+            		   setupBridgeType("obfs3");
+            		   enableBridges(true);
+
+            		   break;
+            	   case 2: //scramblesuit
+            		   setupBridgeType("scramblesuit");
+            		   enableBridges(true);
+
+            		   break;
+            	   case 3: //azure
+            		   Prefs.setBridgesList("2");
+            		   enableBridges(true);
+            		   
+            		   break;
+            	   case 4: //amazon
+                       Prefs.setBridgesList("1");
+            		   enableBridges(true);
+            		   
+            		   break;
+            	   case 5: //google
+                       Prefs.setBridgesList("0");
+            		   enableBridges(true);
+            		   break;	   
+            	   case 6:
+            		   showGetBridgePrompt("obfs4");
+            		   
+            		   break;
+            		  
+            	   }
+            	   
+               }
+           }).setNegativeButton(android.R.string.cancel, new Dialog.OnClickListener()
+	        {
+	        	@Override
+				public void onClick(DialogInterface dialog, int which) {
+					
+	            	//mBtnBridges.setChecked(false);
+					
+				}
+	        })
+	        .show();
+	        
+	       
+        }
+        else
+        {
+        	enableBridges(false);
+        }
+        
+    }
+    
+    private void showGetBridgePrompt (final String type)
+    {
+    	LayoutInflater li = LayoutInflater.from(this);
+        View view = li.inflate(R.layout.layout_diag, null); 
+        
+        TextView versionName = (TextView)view.findViewById(R.id.diaglog);
+        versionName.setText(R.string.you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_);    
+        
+        new AlertDialog.Builder(this)
+        .setTitle(R.string.bridge_mode)
+        .setView(view)
+        .setNegativeButton(android.R.string.cancel, new Dialog.OnClickListener()
+        {
+        	@Override
+			public void onClick(DialogInterface dialog, int which) {
+				//do nothing
+			}
+        })
+        .setNeutralButton(R.string.get_bridges_email, new Dialog.OnClickListener ()
+        {
+
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				
+
+				sendGetBridgeEmail(type);
+
+			}
+
+       	 
+        })
+        .setPositiveButton(R.string.get_bridges_web, new Dialog.OnClickListener ()
+        {
+
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				
+				openBrowser(URL_TOR_BRIDGES + type,true);
+
+			}
+
+       	 
+        }).show();
+    }
+    
+    private void sendGetBridgeEmail (String type)
+    {
+    	Intent intent = new Intent(Intent.ACTION_SEND);
+    	intent.setType("message/rfc822");
+		intent.putExtra(Intent.EXTRA_EMAIL  , new String[]{"bridges at torproject.org"});
+		
+		if (type != null)
+		{
+	    	intent.putExtra(Intent.EXTRA_SUBJECT, "get transport " + type);
+	    	intent.putExtra(Intent.EXTRA_TEXT, "get transport " + type);
+	    	
+		}
+		else
+		{
+			intent.putExtra(Intent.EXTRA_SUBJECT, "get bridges");
+			intent.putExtra(Intent.EXTRA_TEXT, "get bridges");
+			
+		}
+		
+    	startActivity(Intent.createChooser(intent, getString(R.string.send_email)));
+    }
+    
+    private void enableBridges (boolean enable)
+    {
+		Prefs.putBridgesEnabled(enable);
+
+		if (torStatus == TorServiceConstants.STATUS_ON)
+		{
+			String bridgeList = Prefs.getBridgesList();
+			if (bridgeList != null && bridgeList.length() > 0)
+			{
+				requestTorRereadConfig ();
+			}
+		}
+    }
+
+    private void requestTorRereadConfig() {
+        sendIntentToService(TorServiceConstants.CMD_SIGNAL_HUP);
+    }
+    
+    public void stopVpnService ()
+    {    	
+        sendIntentToService(TorServiceConstants.CMD_VPN_CLEAR);
+    }
+
+    private boolean flushTransProxy ()
+    {
+        sendIntentToService(TorServiceConstants.CMD_FLUSH);
+        return true;
+    }
+    
+    private boolean updateTransProxy ()
+    {
+        sendIntentToService(TorServiceConstants.CMD_UPDATE_TRANS_PROXY);
+        return true;
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        if (mPrefs != null)
+        {
+			mBtnVPN.setChecked(Prefs.useVpn());			
+			mBtnBridges.setChecked(Prefs.bridgesEnabled());
+        }
+
+		requestTorStatus();
+
+		updateStatus(null);
+		
+    }
+
+    AlertDialog aDialog = null;
+    
+    //general alert dialog for mostly Tor warning messages
+    //sometimes this can go haywire or crazy with too many error
+    //messages from Tor, and the user cannot stop or exit Orbot
+    //so need to ensure repeated error messages are not spamming this method
+    private void showAlert(String title, String msg, boolean button)
+    {
+            try
+            {
+                    if (aDialog != null && aDialog.isShowing())
+                            aDialog.dismiss();
+            }
+            catch (Exception e){} //swallow any errors
+            
+             if (button)
+             {
+                            aDialog = new AlertDialog.Builder(OrbotMainActivity.this)
+                     .setIcon(R.drawable.onion32)
+             .setTitle(title)
+             .setMessage(msg)
+             .setPositiveButton(android.R.string.ok, null)
+             .show();
+             }
+             else
+             {
+                     aDialog = new AlertDialog.Builder(OrbotMainActivity.this)
+                     .setIcon(R.drawable.onion32)
+             .setTitle(title)
+             .setMessage(msg)
+             .show();
+             }
+    
+             aDialog.setCanceledOnTouchOutside(true);
+    }
+
+    /**
+     * Update the layout_main UI based on the status of {@link TorService}.
+     * {@code torServiceMsg} must never be {@code null}
+     */
+    private void updateStatus(String torServiceMsg) {
+
+    	if (torStatus == null)
+    		return; //UI not init'd yet
+    	
+        if (torStatus == TorServiceConstants.STATUS_ON) {
+        	
+            imgStatus.setImageResource(R.drawable.toron);
+
+            mBtnBrowser.setEnabled(true);
+
+            if (torServiceMsg != null)
+            {
+            	if (torServiceMsg.contains(TorServiceConstants.LOG_NOTICE_HEADER))
+            		lblStatus.setText(torServiceMsg);
+            }
+        	else
+        		lblStatus.setText(getString(R.string.status_activated));
+
+
+            boolean showFirstTime = mPrefs.getBoolean("connect_first_time", true);
+
+            if (showFirstTime)
+            {
+                Editor pEdit = mPrefs.edit();
+                pEdit.putBoolean("connect_first_time", false);
+                pEdit.commit();
+                showAlert(getString(R.string.status_activated),
+                        getString(R.string.connect_first_time), true);
+            }
+
+            if (autoStartFromIntent)
+            {
+                autoStartFromIntent = false;
+                Intent resultIntent = lastStatusIntent;	            
+	            resultIntent.putExtra(TorServiceConstants.EXTRA_STATUS, torStatus);
+	            setResult(RESULT_OK, resultIntent);
+                finish();
+                Log.d(TAG, "autoStartFromIntent finish");
+            }
+            
+            
+
+        } else if (torStatus == TorServiceConstants.STATUS_STARTING) {
+
+            imgStatus.setImageResource(R.drawable.torstarting);
+
+            if (torServiceMsg != null)
+            {
+            	if (torServiceMsg.contains(TorServiceConstants.LOG_NOTICE_BOOTSTRAPPED))
+            		lblStatus.setText(torServiceMsg);            	            
+            }
+            else
+            	lblStatus.setText(getString(R.string.status_starting_up));
+            
+            mBtnBrowser.setEnabled(false);
+
+        } else if (torStatus == TorServiceConstants.STATUS_STOPPING) {
+
+        	  if (torServiceMsg != null && torServiceMsg.contains(TorServiceConstants.LOG_NOTICE_HEADER))
+              	lblStatus.setText(torServiceMsg);	
+        	  
+            imgStatus.setImageResource(R.drawable.torstarting);
+            lblStatus.setText(torServiceMsg);
+            mBtnBrowser.setEnabled(false);
+
+        } else if (torStatus == TorServiceConstants.STATUS_OFF) {
+
+            imgStatus.setImageResource(R.drawable.toroff);
+            lblStatus.setText(getString(R.string.press_to_start));
+            mBtnBrowser.setEnabled(false);
+        }
+
+        if (torServiceMsg != null && torServiceMsg.length() > 0)
+        {
+            mTxtOrbotLog.append(torServiceMsg + '\n');
+        }
+    }
+
+    /**
+     * Starts tor and related daemons by sending an
+     * {@link TorServiceConstants#ACTION_START} {@link Intent} to
+     * {@link TorService}
+     */
+    private void startTor() {
+        sendIntentToService(TorServiceConstants.ACTION_START);
+    }
+    
+    /**
+     * Request tor status without starting it
+     * {@link TorServiceConstants#ACTION_START} {@link Intent} to
+     * {@link TorService}
+     */
+    private void requestTorStatus() {
+        sendIntentToService(TorServiceConstants.ACTION_STATUS);
+    }
+
+    private boolean isTorServiceRunning() {
+        ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
+        for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
+            if (TorService.class.getName().equals(service.service.getClassName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean onLongClick(View view) {
+
+        if (torStatus == TorServiceConstants.STATUS_OFF) {
+            lblStatus.setText(getString(R.string.status_starting_up));
+            startTor();
+        } else {
+        	lblStatus.setText(getString(R.string.status_shutting_down));
+        	
+            stopTor();
+        }
+        
+        return true;
+                
+    }
+
+// this is what takes messages or values from the callback threads or other non-mainUI threads
+//and passes them back into the main UI thread for display to the user
+    private Handler mStatusUpdateHandler = new Handler() {
+
+        @Override
+        public void handleMessage(final Message msg) {
+        	
+        	String newTorStatus = msg.getData().getString("status");
+        	String log = (String)msg.obj;
+        	
+        	if (torStatus == null && newTorStatus != null) //first time status
+        	{
+        		torStatus = newTorStatus;
+        		findViewById(R.id.pbConnecting).setVisibility(View.GONE);
+        		findViewById(R.id.frameMain).setVisibility(View.VISIBLE);
+        		updateStatus(log);
+        		
+        		//now you can handle the intents properly
+        		handleIntents();
+        		
+        	}
+        	else if (newTorStatus != null && !torStatus.equals(newTorStatus)) //status changed
+        	{
+        		torStatus = newTorStatus;
+        		updateStatus(log);
+        	}        	
+        	else if (log != null) //it is just a log
+        		updateStatus(log);
+        	
+            switch (msg.what) {
+                case MESSAGE_TRAFFIC_COUNT:
+
+                    Bundle data = msg.getData();
+                    DataCount datacount =  new DataCount(data.getLong("upload"),data.getLong("download"));     
+                    
+                    long totalRead = data.getLong("readTotal");
+                    long totalWrite = data.getLong("writeTotal");
+                
+                    downloadText.setText(formatCount(datacount.Download) + " / " + formatTotal(totalRead));
+                    uploadText.setText(formatCount(datacount.Upload) + " / " + formatTotal(totalWrite));
+
+                    break;
+                default:
+                    super.handleMessage(msg);
+            }
+        }
+    };
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+          LocalBroadcastManager.getInstance(this).unregisterReceiver(mLocalBroadcastReceiver);
+
+    }
+
+    public class DataCount {
+           // data uploaded
+           public long Upload;
+           // data downloaded
+           public long Download;
+           
+           DataCount(long Upload, long Download){
+               this.Upload = Upload;
+               this.Download = Download;
+           }
+       }
+       
+    private String formatCount(long count) {
+        NumberFormat numberFormat = NumberFormat.getInstance(Locale.getDefault());
+        // Converts the supplied argument into a string.
+        // Under 2Mb, returns "xxx.xKb"
+        // Over 2Mb, returns "xxx.xxMb"
+        if (count < 1e6)
+            return numberFormat.format(Math.round(((float) ((int) (count * 10 / 1024)) / 10)))
+                    + getString(R.string.kbps);
+        else
+            return numberFormat.format(Math
+                    .round(((float) ((int) (count * 100 / 1024 / 1024)) / 100)))
+                    + getString(R.string.mbps);
+    }
+
+    private String formatTotal(long count) {
+        NumberFormat numberFormat = NumberFormat.getInstance(Locale.getDefault());
+        // Converts the supplied argument into a string.
+        // Under 2Mb, returns "xxx.xKb"
+        // Over 2Mb, returns "xxx.xxMb"
+        if (count < 1e6)
+            return numberFormat.format(Math.round(((float) ((int) (count * 10 / 1024)) / 10)))
+                    + getString(R.string.kb);
+        else
+            return numberFormat.format(Math
+                    .round(((float) ((int) (count * 100 / 1024 / 1024)) / 100)))
+                    + getString(R.string.mb);
+    }
+
+      private static final float ROTATE_FROM = 0.0f;
+        private static final float ROTATE_TO = 360.0f*4f;// 3.141592654f * 32.0f;
+
+    public void spinOrbot (float direction)
+    {
+            sendIntentToService (TorServiceConstants.CMD_NEWNYM);
+        
+        
+            Toast.makeText(this, R.string.newnym, Toast.LENGTH_SHORT).show();
+            
+        //    Rotate3dAnimation rotation = new Rotate3dAnimation(ROTATE_FROM, ROTATE_TO*direction, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
+             Rotate3dAnimation rotation = new Rotate3dAnimation(ROTATE_FROM, ROTATE_TO*direction, imgStatus.getWidth()/2f,imgStatus.getWidth()/2f,20f,false);
+             rotation.setFillAfter(true);
+              rotation.setInterpolator(new AccelerateInterpolator());
+              rotation.setDuration((long) 2*1000);
+              rotation.setRepeatCount(0);
+              imgStatus.startAnimation(rotation);
+              
+        
+    }
+    
+    class MyGestureDetector extends SimpleOnGestureListener {
+            @Override
+            public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+                try {                    
+                    if (torStatus == TorServiceConstants.STATUS_ON)
+                    {
+                        float direction = 1f;
+                        if (velocityX < 0)
+                            direction = -1f;
+                        spinOrbot (direction);
+                    }
+                } catch (Exception e) {
+                    // nothing
+                }
+                return false;
+            }
+    }
+    
+    private void loadBridgeDefaults ()
+    {
+    	if (alBridges == null)
+    	{
+	    	alBridges = new ArrayList<Bridge>();
+	    	
+	    	try
+	    	{
+	    	 	BufferedReader in=
+	    	        new BufferedReader(new InputStreamReader(getAssets().open("bridges.txt"), "UTF-8"));
+	    	    String str;
+	
+	    	    while ((str=in.readLine()) != null) {
+	    	    
+	    	    	StringTokenizer st = new StringTokenizer (str," ");
+	    	    	Bridge b = new Bridge();
+	    	    	b.type = st.nextToken();
+	    	    	
+	    	    	StringBuffer sbConfig = new StringBuffer();
+	    	    	
+	    	    	while(st.hasMoreTokens())
+	    	    		sbConfig.append(st.nextToken()).append(' ');
+	    	    	
+	    	    	b.config = sbConfig.toString().trim();
+	    	    	
+	    	    	alBridges.add(b);
+	    	    	
+	    	    }
+	
+	    	    in.close();
+	    	}
+	    	catch (Exception e)
+	    	{
+	    		e.printStackTrace();
+	    	}
+    	}    	
+    	
+    }
+    
+    private void setupBridgeType (String type)
+    {
+    	StringBuffer sbConfig = new StringBuffer ();
+    	
+    	//we should randomly sort alBridges so we don't have the same bridge order each time
+    	long seed = System.nanoTime();
+    	Collections.shuffle(alBridges, new Random(seed));
+    	
+    	//let's just pull up to 2 bridges from the defaults at time
+    	int maxBridges = 2;
+    	int bridgeCount = 0;
+    	
+    	//now go through the list to find the bridges we want
+    	for (Bridge b : alBridges)
+    	{
+    		if (b.type.equals(type))
+    		{
+    			
+    			sbConfig.append(b.type);
+    			sbConfig.append(' ');
+    			sbConfig.append(b.config);      			
+    			
+    			bridgeCount++;
+    			
+    			if (bridgeCount == maxBridges)
+    				break;
+    			else
+    				sbConfig.append("\n");
+    		}
+    	}
+    	
+    	setNewBridges(sbConfig.toString());
+    }
+}
diff --git a/app/src/main/java/org/torproject/android/settings/Languages.java b/app/src/main/java/org/torproject/android/settings/Languages.java
new file mode 100644
index 0000000..dabddea
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/settings/Languages.java
@@ -0,0 +1,232 @@
+package org.torproject.android.settings;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.ContextWrapper;
+import android.content.Intent;
+import android.content.res.AssetManager;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Build;
+import android.text.TextUtils;
+import android.util.DisplayMetrics;
+
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+
+public class Languages {
+    public static final String TAG = "Languages";
+
+    public static final Locale defaultLocale;
+    public static final Locale TIBETAN = new Locale("bo");
+    static final Locale localesToTest[] = {
+            Locale.ENGLISH, Locale.FRENCH, Locale.GERMAN,
+            Locale.ITALIAN, Locale.JAPANESE, Locale.KOREAN,
+            Locale.TRADITIONAL_CHINESE, Locale.SIMPLIFIED_CHINESE,
+            TIBETAN, new Locale("af"), new Locale("am"),
+            new Locale("ar"), new Locale("az"), new Locale("bg"),
+            new Locale("bn"), new Locale("ca"), new Locale("cs"),
+            new Locale("da"), new Locale("el"), new Locale("es"),
+            new Locale("et"), new Locale("eu"), new Locale("fa"),
+            new Locale("fi"), new Locale("gl"), new Locale("hi"),
+            new Locale("hr"), new Locale("hu"), new Locale("hy"),
+            new Locale("in"), new Locale("hy"), new Locale("in"),
+            new Locale("is"), new Locale("it"), new Locale("iw"),
+            new Locale("ka"), new Locale("kk"), new Locale("km"),
+            new Locale("kn"), new Locale("ky"), new Locale("lo"),
+            new Locale("lt"), new Locale("lv"), new Locale("mk"),
+            new Locale("ml"), new Locale("mn"), new Locale("mr"),
+            new Locale("ms"), new Locale("my"), new Locale("nb"),
+            new Locale("ne"), new Locale("nl"), new Locale("pl"),
+            new Locale("pt"), new Locale("rm"), new Locale("ro"),
+            new Locale("ru"), new Locale("si"), new Locale("sk"),
+            new Locale("sl"), new Locale("sn"), new Locale("sr"),
+            new Locale("sv"), new Locale("sw"), new Locale("ta"),
+            new Locale("te"), new Locale("th"), new Locale("tl"),
+            new Locale("tr"), new Locale("uk"), new Locale("ur"),
+            new Locale("uz"), new Locale("vi"), new Locale("zu"),
+    };
+
+    private static final String USE_SYSTEM_DEFAULT = "";
+    private static final String defaultString = "Use System Default";
+
+    private static Locale locale;
+    private static Languages singleton;
+    private static Class<?> clazz;
+    private static int resId;
+    private static Map<String, String> tmpMap = new TreeMap<String, String>();
+    private static Map<String, String> nameMap;
+
+    static {
+        defaultLocale = Locale.getDefault();
+    }
+
+    private Languages(Activity activity) {
+        AssetManager assets = activity.getAssets();
+        Configuration config = activity.getResources().getConfiguration();
+        // Resources() requires DisplayMetrics, but they are only needed for drawables
+        DisplayMetrics ignored = new DisplayMetrics();
+        activity.getWindowManager().getDefaultDisplay().getMetrics(ignored);
+        Resources resources;
+        Set<Locale> localeSet = new LinkedHashSet<Locale>();
+        for (Locale locale : localesToTest) {
+            config.locale = locale;
+            resources = new Resources(assets, ignored, config);
+            if (!TextUtils.equals(defaultString, resources.getString(resId))
+                    || locale.equals(Locale.ENGLISH))
+                localeSet.add(locale);
+        }
+        for (Locale locale : localeSet) {
+            if (locale.equals(TIBETAN)) {
+                // include English name for devices without Tibetan font support
+                tmpMap.put(TIBETAN.getLanguage(), "Tibetan བོད་སྐད།"); // Tibetan
+            } else if (locale.equals(Locale.SIMPLIFIED_CHINESE)) {
+                tmpMap.put(Locale.SIMPLIFIED_CHINESE.toString(), "中文 (中国)"); // Chinese (China)
+            } else if (locale.equals(Locale.TRADITIONAL_CHINESE)) {
+                tmpMap.put(Locale.TRADITIONAL_CHINESE.toString(), "中文 (台灣)"); // Chinese (Taiwan)
+            } else {
+                tmpMap.put(locale.getLanguage(), locale.getDisplayLanguage(locale));
+            }
+        }
+
+        /* USE_SYSTEM_DEFAULT is a fake one for displaying in a chooser menu. */
+        localeSet.add(null);
+        tmpMap.put(USE_SYSTEM_DEFAULT, activity.getString(resId));
+        nameMap = Collections.unmodifiableMap(tmpMap);
+    }
+
+    /**
+     * Get the instance of {@link Languages} to work with, providing the
+     * {@link Activity} that is will be working as part of, as well as the
+     * {@code resId} that has the exact string "Use System Default",
+     * i.e. {@code R.string.use_system_default}.
+     * <p/>
+     * That string resource {@code resId} is also used to find the supported
+     * translations: if an included translation has a translated string that
+     * matches that {@code resId}, then that language will be included as a
+     * supported language.
+     *
+     * @param clazz the {@link Class} of the default {@code Activity},
+     *              usually the main {@code Activity} from where the
+     *              Settings is launched from.
+     * @param resId the string resource ID to for the string "Use System Default",
+     *              e.g. {@code R.string.use_system_default}
+     * @return
+     */
+    public static void setup(Class<?> clazz, int resId) {
+        if (Languages.clazz == null) {
+            Languages.clazz = clazz;
+            Languages.resId = resId;
+        } else {
+            throw new RuntimeException("Languages singleton was already initialized, duplicate call to Languages.setup()!");
+        }
+    }
+
+    /**
+     * Get the singleton to work with.
+     *
+     * @param activity the {@link Activity} this is working as part of
+     * @return
+     */
+    public static Languages get(Activity activity) {
+        if (singleton == null) {
+            singleton = new Languages(activity);
+        }
+        return singleton;
+    }
+
+    //@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
+    @SuppressLint("NewApi")
+	public static void setLanguage(final ContextWrapper contextWrapper, String language, boolean refresh) {
+        if (locale != null && TextUtils.equals(locale.getLanguage(), language) && (!refresh)) {
+            return; // already configured
+        } else if (language == null || language == USE_SYSTEM_DEFAULT) {
+            locale = defaultLocale;
+        } else {
+            /* handle locales with the country in it, i.e. zh_CN, zh_TW, etc */
+            String localeSplit[] = language.split("_");
+            if (localeSplit.length > 1) {
+                locale = new Locale(localeSplit[0], localeSplit[1]);
+            } else {
+                locale = new Locale(language);
+            }
+        }
+
+        final Resources resources = contextWrapper.getBaseContext().getResources();
+        Configuration config = resources.getConfiguration();
+        if (Build.VERSION.SDK_INT >= 17) {
+            config.setLocale(locale);
+        } else {
+            config.locale = locale;
+        }
+        resources.updateConfiguration(config, resources.getDisplayMetrics());
+        Locale.setDefault(locale);
+
+    }
+
+    /**
+     * Force reload the {@link Activity to make language changes take effect.}
+     *
+     * @param activity the {@code Activity} to force reload
+     */
+    public static void forceChangeLanguage(Activity activity) {
+        Intent intent = activity.getIntent();
+        if (intent == null) // when launched as LAUNCHER
+            return;
+        intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+        activity.finish();
+        activity.overridePendingTransition(0, 0);
+        activity.startActivity(intent);
+        activity.overridePendingTransition(0, 0);
+    }
+
+    /**
+     * Return the name of the language based on the locale.
+     *
+     * @param locale
+     * @return
+     */
+    public String getName(String locale) {
+        String ret = nameMap.get(locale);
+        // if no match, try to return a more general name (i.e. English for
+        // en_IN)
+        if (ret == null && locale.contains("_"))
+            ret = nameMap.get(locale.split("_")[0]);
+        return ret;
+    }
+
+    /**
+     * Return an array of the names of all the supported languages, sorted to
+     * match what is returned by {@link Languages#getSupportedLocales()}.
+     *
+     * @return
+     */
+    public String[] getAllNames() {
+        return nameMap.values().toArray(new String[nameMap.size()]);
+    }
+
+    public int getPosition(Locale locale) {
+        String localeName = locale.getLanguage();
+        int i = 0;
+        for (String key : nameMap.keySet())
+            if (TextUtils.equals(key, localeName))
+                return i;
+            else
+                i++;
+        return -1;
+    }
+
+    /**
+     * Get sorted list of supported locales.
+     *
+     * @return
+     */
+    public String[] getSupportedLocales() {
+        Set<String> keys = nameMap.keySet();
+        return keys.toArray(new String[keys.size()]);
+    }
+}
diff --git a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
new file mode 100644
index 0000000..c26580f
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
@@ -0,0 +1,161 @@
+/* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - http://openideals.com/guardian */
+/* See LICENSE for licensing information */
+
+package org.torproject.android.settings;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.EditTextPreference;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceActivity;
+
+import org.torproject.android.OrbotApp;
+import org.torproject.android.R;
+import org.torproject.android.ui.AppManager;
+import org.torproject.android.service.TorServiceUtils;
+
+import java.util.Locale;
+
+
+public class SettingsPreferences 
+		extends PreferenceActivity implements OnPreferenceClickListener {
+    private static final String TAG = "SettingsPreferences";
+
+	private CheckBoxPreference prefCBTransProxy = null;
+	private CheckBoxPreference prefcBTransProxyAll = null;
+	private Preference prefTransProxyFlush = null;
+	
+	private Preference prefTransProxyApps = null;
+    private CheckBoxPreference prefHiddenServices = null;
+    private EditTextPreference prefHiddenServicesPorts;
+    private EditTextPreference prefHiddenServicesHostname;
+	private CheckBoxPreference prefRequestRoot = null;
+	private ListPreference prefLocale = null;
+	
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        addPreferencesFromResource(R.xml.preferences);
+        getPreferenceManager().setSharedPreferencesMode(Context.MODE_MULTI_PROCESS);
+        SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+
+        prefRequestRoot = (CheckBoxPreference) findPreference("has_root");
+        prefRequestRoot.setOnPreferenceClickListener(this);
+
+        prefLocale = (ListPreference) findPreference("pref_default_locale");
+        prefLocale.setOnPreferenceClickListener(this);
+        Languages languages = Languages.get(this);
+        prefLocale.setEntries(languages.getAllNames());
+        prefLocale.setEntryValues(languages.getSupportedLocales());
+        prefLocale.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                String language = (String) newValue;
+                if (preference == prefLocale) {
+                    SharedPreferences settings = TorServiceUtils
+                            .getSharedPrefs(getApplicationContext());
+
+                    String lang = settings.getString("pref_default_locale",
+                            Locale.getDefault().getLanguage());
+                    OrbotApp app = (OrbotApp) getApplication();
+                    Languages.setLanguage(app, language, true);
+                    lang = settings.getString("pref_default_locale",
+                            Locale.getDefault().getLanguage());
+                    OrbotApp.forceChangeLanguage(SettingsPreferences.this);
+                }
+                return false;
+            }
+        });
+
+        prefCBTransProxy = (CheckBoxPreference) findPreference("pref_transparent");
+        prefcBTransProxyAll = (CheckBoxPreference) findPreference("pref_transparent_all");
+
+        prefTransProxyFlush = (Preference) findPreference("pref_transproxy_flush");
+        prefTransProxyFlush.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+
+            @Override
+            public boolean onPreferenceClick(Preference arg0) {
+
+                Intent data = new Intent();
+                data.putExtra("transproxywipe", true);
+                setResult(RESULT_OK, data);
+
+                finish();
+                return false;
+            }
+
+        });
+
+        
+        prefTransProxyApps = findPreference("pref_transparent_app_list");
+        prefTransProxyApps.setOnPreferenceClickListener(this);
+        prefCBTransProxy.setOnPreferenceClickListener(this);
+        prefcBTransProxyAll.setOnPreferenceClickListener(this);
+        prefHiddenServices = (CheckBoxPreference) findPreference("pref_hs_enable");
+        prefHiddenServices.setOnPreferenceClickListener(this);
+        prefHiddenServicesHostname = (EditTextPreference) findPreference("pref_hs_hostname");
+        
+        
+        prefCBTransProxy.setEnabled(prefRequestRoot.isChecked());
+        
+        prefcBTransProxyAll.setEnabled(prefCBTransProxy.isChecked());
+        
+        if (prefCBTransProxy.isChecked())
+        	prefTransProxyApps.setEnabled((!prefcBTransProxyAll.isChecked()));
+        
+        prefHiddenServicesPorts = (EditTextPreference) findPreference("pref_hs_ports");
+        prefHiddenServicesHostname.setEnabled(prefHiddenServices.isChecked());
+        prefHiddenServicesPorts.setEnabled(prefHiddenServices.isChecked());
+        
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
+        {
+       	 	prefTransProxyApps.setEnabled(true);
+        }
+        
+        
+    }
+
+	public boolean onPreferenceClick(Preference preference) {
+		
+		setResult(RESULT_OK);
+		
+		if (preference == prefRequestRoot)
+		{
+			if (prefRequestRoot.isChecked())
+			{
+
+                    prefCBTransProxy.setEnabled(true);
+
+			}
+		}
+		else if (preference == prefTransProxyApps)
+		{
+			startActivity(new Intent(this, AppManager.class));
+			
+		}
+		else if (preference == prefHiddenServices)
+		{
+	        prefHiddenServicesPorts.setEnabled(prefHiddenServices.isChecked());
+	        prefHiddenServicesHostname.setEnabled(prefHiddenServices.isChecked());
+		}
+		else
+		{
+			prefcBTransProxyAll.setEnabled(prefCBTransProxy.isChecked());
+			prefTransProxyApps.setEnabled(prefCBTransProxy.isChecked() && (!prefcBTransProxyAll.isChecked()));
+			
+			
+		}
+		
+		return true;
+	}
+
+
+}
diff --git a/app/src/main/java/org/torproject/android/ui/AppManager.java b/app/src/main/java/org/torproject/android/ui/AppManager.java
new file mode 100644
index 0000000..7a1faa1
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/ui/AppManager.java
@@ -0,0 +1,389 @@
+/* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - http://openideals.com/guardian */
+/* See LICENSE for licensing information */
+
+package org.torproject.android.ui;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import org.torproject.android.service.OrbotConstants;
+import org.torproject.android.R;
+import org.torproject.android.service.TorServiceUtils;
+import org.torproject.android.service.TorifiedApp;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.ImageView;
+import android.widget.ListAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+
+public class AppManager extends Activity implements OnCheckedChangeListener, OnClickListener, OrbotConstants {
+
+    private ListView listApps;
+    private final static String TAG = "Orbot";
+    
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    
+        this.setContentView(R.layout.layout_apps);
+        
+        Button buttonSelectAll, buttonSelectNone, buttonInvert;
+
+        buttonSelectAll =   (Button) findViewById(R.id.button_proxy_all);
+        buttonSelectNone =  (Button) findViewById(R.id.button_proxy_none);
+        buttonInvert =      (Button) findViewById(R.id.button_invert_selection);
+
+        buttonSelectAll.setOnClickListener(new OnAutoClickListener(0));
+        buttonSelectNone.setOnClickListener(new OnAutoClickListener(1));
+        buttonInvert.setOnClickListener(new OnAutoClickListener(2));
+    }
+
+    class OnAutoClickListener implements Button.OnClickListener {
+        private int status;
+        public OnAutoClickListener(int status){
+            this.status = status;
+        }
+        @SuppressWarnings("unchecked")
+        public void onClick(View button){
+            ListView listView;
+            ViewGroup viewGroup;
+            View parentView, currentView;
+            ArrayAdapter<TorifiedApp> adapter;
+            TorifiedApp app;
+            CheckBox box;
+            float buttonId;
+            boolean[] isSelected;
+            int posI, selectedI, lvSz;
+
+            buttonId = button.getId();
+            listView = (ListView) findViewById(R.id.applistview);
+            lvSz = listView.getCount();
+            isSelected = new boolean[lvSz];
+
+            selectedI = -1;
+
+            if (this.status == 0){
+                Log.d(TAG, "Proxifying ALL");
+            }else if (this.status == 1){
+                Log.d(TAG, "Proxifying NONE");
+            }else {
+                Log.d(TAG, "Proxifying invert");
+            }
+
+            Context context = getApplicationContext();
+            SharedPreferences prefs = TorServiceUtils.getSharedPrefs(context);
+            ArrayList<TorifiedApp> apps = getApps(context, prefs);
+            parentView = (View) findViewById(R.id.applistview);
+            viewGroup = (ViewGroup) listView;
+
+            adapter = (ArrayAdapter<TorifiedApp>) listApps.getAdapter();
+            if (adapter == null){
+                Log.w(TAG, "List adapter is null. Getting apps.");
+                loadApps(prefs);
+                adapter = (ArrayAdapter<TorifiedApp>) listApps.getAdapter();
+            }
+
+            for (int i = 0 ; i < adapter.getCount(); ++i){
+                app = (TorifiedApp) adapter.getItem(i);
+                currentView = adapter.getView(i, parentView, viewGroup);
+                box = (CheckBox) currentView.findViewById(R.id.itemcheck);
+                if (this.status == 0){
+                    if (!box.isChecked())
+                        box.performClick();
+                }else if (this.status == 1){
+                    if (box.isChecked())
+                        box.performClick();
+                }else {
+                    box.performClick();
+                }
+            }
+            saveAppSettings(context);
+            loadApps(prefs);
+        }
+    }
+    
+    @Override
+    protected void onResume() {
+        super.onResume();
+        listApps = (ListView)findViewById(R.id.applistview);
+
+        Button btnSave = (Button)findViewById(R.id.btnsave);
+        btnSave.setOnClickListener(new OnClickListener()
+        {
+
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        
+        mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+        loadApps(mPrefs);
+    }
+
+    SharedPreferences mPrefs = null;
+    ArrayList<TorifiedApp> mApps = null;
+    
+    private void loadApps (SharedPreferences prefs)
+    {
+        
+        mApps = getApps(getApplicationContext(), prefs);
+        
+        /*
+        Arrays.sort(apps, new Comparator<TorifiedApp>() {
+            public int compare(TorifiedApp o1, TorifiedApp o2) {
+                if (o1.isTorified() == o2.isTorified()) return o1.getName().compareTo(o2.getName());
+                if (o1.isTorified()) return -1;
+                return 1;
+            }
+        });*/
+        
+        final LayoutInflater inflater = getLayoutInflater();
+        
+        ListAdapter adapter = new ArrayAdapter<TorifiedApp>(this, R.layout.layout_apps_item, R.id.itemtext,mApps) {
+            public View getView(int position, View convertView, ViewGroup parent) {
+                ListEntry entry;
+                if (convertView == null) {
+                    // Inflate a new view
+                    convertView = inflater.inflate(R.layout.layout_apps_item, parent, false);
+                    entry = new ListEntry();
+                    entry.icon = (ImageView) convertView.findViewById(R.id.itemicon);
+                    entry.box = (CheckBox) convertView.findViewById(R.id.itemcheck);
+                    entry.text = (TextView) convertView.findViewById(R.id.itemtext);
+                    
+                    entry.text.setOnClickListener(AppManager.this);
+                    entry.text.setOnClickListener(AppManager.this);
+                    
+                    convertView.setTag(entry);
+                
+                    entry.box.setOnCheckedChangeListener(AppManager.this);
+                } else {
+                    // Convert an existing view
+                    entry = (ListEntry) convertView.getTag();
+                }
+                
+                
+                final TorifiedApp app = mApps.get(position);
+                
+                if (app.getIcon() != null)
+                    entry.icon.setImageDrawable(app.getIcon());
+                else
+                    entry.icon.setVisibility(View.GONE);
+                
+                entry.text.setText(app.getName());
+                
+                final CheckBox box = entry.box;
+                box.setTag(app);
+                box.setChecked(app.isTorified());
+                
+                entry.text.setTag(box);
+                entry.icon.setTag(box);
+                
+                return convertView;
+            }
+        };
+        
+        listApps.setAdapter(adapter);
+        
+    }
+    
+    private static class ListEntry {
+        private CheckBox box;
+        private TextView text;
+        private ImageView icon;
+    }
+    
+    /* (non-Javadoc)
+     * @see android.app.Activity#onStop()
+     */
+    @Override
+    protected void onStop() {
+        super.onStop();
+        
+    }
+
+    
+    public static ArrayList<TorifiedApp> getApps (Context context, SharedPreferences prefs)
+    {
+
+        String tordAppString = prefs.getString(PREFS_KEY_TORIFIED, "");
+        String[] tordApps;
+        
+        StringTokenizer st = new StringTokenizer(tordAppString,"|");
+        tordApps = new String[st.countTokens()];
+        int tordIdx = 0;
+        while (st.hasMoreTokens())
+        {
+            tordApps[tordIdx++] = st.nextToken();
+        }
+        
+        Arrays.sort(tordApps);
+
+        //else load the apps up
+        PackageManager pMgr = context.getPackageManager();
+        
+        List<ApplicationInfo> lAppInfo = pMgr.getInstalledApplications(0);
+        
+        Iterator<ApplicationInfo> itAppInfo = lAppInfo.iterator();
+        
+        ArrayList<TorifiedApp> apps = new ArrayList<TorifiedApp>();
+        
+        ApplicationInfo aInfo = null;
+        
+        int appIdx = 0;
+        TorifiedApp app = null;
+        
+        while (itAppInfo.hasNext())
+        {
+            aInfo = itAppInfo.next();
+            
+            app = new TorifiedApp();
+            
+            try {
+                PackageInfo pInfo = pMgr.getPackageInfo(aInfo.packageName, PackageManager.GET_PERMISSIONS);
+                
+                if (pInfo != null && pInfo.requestedPermissions != null)
+                {
+                    for (String permInfo:pInfo.requestedPermissions)
+                    {
+                        if (permInfo.equals("android.permission.INTERNET"))
+                        {
+                            app.setUsesInternet(true);
+                            
+                        }
+                    }
+                    
+                }
+                
+                
+            } catch (Exception e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+            
+            if ((aInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 1)
+            {
+                 //System app
+                app.setUsesInternet(true);
+           }
+            
+            
+            if (!app.usesInternet())
+                continue;
+            else
+            {
+                apps.add(app);
+            }
+            
+            
+            app.setEnabled(aInfo.enabled);
+            app.setUid(aInfo.uid);
+            app.setUsername(pMgr.getNameForUid(app.getUid()));
+            app.setProcname(aInfo.processName);
+            app.setPackageName(aInfo.packageName);
+            
+            try
+            {
+                app.setName(pMgr.getApplicationLabel(aInfo).toString());
+            }
+            catch (Exception e)
+            {
+                app.setName(aInfo.packageName);
+            }
+            
+            
+            //app.setIcon(pMgr.getApplicationIcon(aInfo));
+            
+            // check if this application is allowed
+            if (Arrays.binarySearch(tordApps, app.getUsername()) >= 0) {
+                app.setTorified(true);
+            }
+            else
+            {
+                app.setTorified(false);
+            }
+            
+            appIdx++;
+        }
+    
+        Collections.sort(apps);
+        
+        return apps;
+    }
+    
+
+    public void saveAppSettings (Context context)
+    {
+
+        StringBuilder tordApps = new StringBuilder();
+
+        for (TorifiedApp tApp:mApps)
+        {
+            if (tApp.isTorified())
+            {
+                tordApps.append(tApp.getUsername());
+                tordApps.append("|");
+            }
+        }
+        
+        Editor edit = mPrefs.edit();
+        edit.putString(PREFS_KEY_TORIFIED, tordApps.toString());
+        edit.commit();
+        
+    }
+    
+
+    /**
+     * Called an application is check/unchecked
+     */
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        final TorifiedApp app = (TorifiedApp) buttonView.getTag();
+        if (app != null) {
+            app.setTorified(isChecked);
+        }
+        
+        saveAppSettings(this);
+
+    }
+
+    
+
+
+    public void onClick(View v) {
+        
+        CheckBox cbox = (CheckBox)v.getTag();
+        
+        final TorifiedApp app = (TorifiedApp)cbox.getTag();
+        if (app != null) {
+            app.setTorified(!app.isTorified());
+            cbox.setChecked(app.isTorified());
+        }
+        
+        saveAppSettings(this);
+        
+    }
+
+
+
+    
+}
diff --git a/app/src/main/java/org/torproject/android/ui/BridgeSetupActivity.java b/app/src/main/java/org/torproject/android/ui/BridgeSetupActivity.java
new file mode 100644
index 0000000..7cabe35
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/ui/BridgeSetupActivity.java
@@ -0,0 +1,5 @@
+package org.torproject.android.ui;
+
+public class BridgeSetupActivity {
+
+}
diff --git a/app/src/main/java/org/torproject/android/ui/ImageProgressView.java b/app/src/main/java/org/torproject/android/ui/ImageProgressView.java
new file mode 100644
index 0000000..641c444
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/ui/ImageProgressView.java
@@ -0,0 +1,78 @@
+package org.torproject.android.ui;
+
+import java.util.Random;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.ImageView;
+
+public class ImageProgressView extends ImageView
+{
+
+	  private Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG);
+
+	  private float progress = 0f; // 0 to 1
+	  
+	  private RectF circle;
+	  
+	public ImageProgressView(Context context) {
+	 super(context);
+	 // TODO Auto-generated constructor stub
+	 init();
+	 
+	}
+
+	public ImageProgressView(Context context, AttributeSet attrs) {
+	 super(context, attrs);
+	 init();
+	}
+
+	public ImageProgressView(Context context, AttributeSet attrs, int defStyle) {
+	 super(context, attrs, defStyle);
+	 
+	 init();
+	}
+
+	private void init(){
+	 paint.setStyle(Paint.Style.STROKE);
+	 paint.setColor(Color.GREEN);
+	 paint.setAntiAlias(true);
+	 paint.setStrokeWidth(20);
+	 
+	}
+
+	@Override
+	protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+	   super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+	   
+	   setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec),
+	   MeasureSpec.getSize(heightMeasureSpec));
+	 
+	}
+
+	@Override
+	protected void onDraw(Canvas canvas) {
+
+		super.onDraw(canvas);
+		
+		if (circle == null)
+		{
+		circle = new RectF(getWidth()/2,getHeight()/2+getHeight()/8, getWidth()/3,getHeight()/3);
+		}
+		
+		float sweepAngle = 360f * progress;
+		
+		canvas.drawArc(circle, 0, sweepAngle, true, paint);
+		
+	}
+	
+	
+
+	
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/torproject/android/ui/OrbotDiagnosticsActivity.java b/app/src/main/java/org/torproject/android/ui/OrbotDiagnosticsActivity.java
new file mode 100644
index 0000000..061e1ea
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/ui/OrbotDiagnosticsActivity.java
@@ -0,0 +1,329 @@
+package org.torproject.android.ui;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+
+import org.torproject.android.R;
+import org.torproject.android.service.TorResourceInstaller;
+import org.torproject.android.service.TorServiceConstants;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Message;
+import android.os.StatFs;
+import android.text.format.Formatter;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.TextView;
+
+
+public class OrbotDiagnosticsActivity extends Activity {
+
+	private TextView mTextView = null;
+	private final static String TAG = "OrbotDiag";
+	private StringBuffer log = new StringBuffer();
+	Process mProcess;
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) { 
+		super.onCreate(savedInstanceState);
+		
+		setContentView(R.layout.layout_diag);
+		
+		mTextView = (TextView)findViewById(R.id.diaglog);
+		
+	}
+
+	private String getFreeStorage ()
+	{
+		File path = Environment.getDataDirectory();
+		StatFs stat = new StatFs(path.getPath());
+		long blockSize = stat.getBlockSize();
+		long availableBlocks = stat.getAvailableBlocks();
+		return Formatter.formatFileSize(this, availableBlocks * blockSize);
+	}
+	
+	@Override
+	protected void onPause() {
+		super.onPause();
+		
+		stopTor();
+	}
+
+	@Override
+	protected void onDestroy() {
+
+		super.onDestroy();
+		
+	}
+	
+	private void stopTor ()
+	{
+		File appBinHome = this.getDir("bin", Context.MODE_PRIVATE);
+
+		File fileTor= new File(appBinHome, TorServiceConstants.TOR_ASSET_KEY);
+    	
+		if (mProcess != null)
+			mProcess.destroy();
+		
+		
+	}
+	
+	
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+
+
+		log("Hello, Orbot!");
+		
+		try
+		{
+			log(android.os.Build.DEVICE);
+			log(android.os.Build.HARDWARE);
+			log(android.os.Build.MANUFACTURER);
+			log(android.os.Build.MODEL);
+			log(android.os.Build.VERSION.CODENAME);
+			log(android.os.Build.VERSION.RELEASE);
+		}
+		catch (Exception e)
+		{
+			log("error getting device info");
+		}
+		
+		showFileTree ();
+		
+		runTorTest();
+	}
+
+	private void runTorTest ()
+	{
+		try
+		{
+			File appBinHome = this.getDir("bin", Context.MODE_PRIVATE);
+			File appDataHome = this.getDir("data", Context.MODE_PRIVATE);
+	
+	    	File fileTor= new File(appBinHome, TorServiceConstants.TOR_ASSET_KEY);
+	    	enableBinExec (fileTor, appBinHome);	    	
+	    	
+			InputStream is = getResources().openRawResource(R.raw.torrc);
+			File fileTorrc = new File(appBinHome, TorServiceConstants.TORRC_ASSET_KEY + "diag");
+			TorResourceInstaller.streamToFile(is,fileTorrc, false, false);
+		
+			/**
+			ArrayList<String> alEnv = new ArrayList<String>();
+			alEnv.add("HOME=" + appBinHome.getAbsolutePath());
+			Shell shell = Shell.startShell(alEnv,appBinHome.getAbsolutePath());
+			SimpleCommand cmdTor = new SimpleCommand(fileTor.getAbsolutePath() + " DataDirectory " + appDataHome.getAbsolutePath() + " -f " + fileTorrc.getAbsolutePath());			
+			shell.add(cmdTor);
+			**/
+			
+			String cmd = fileTor.getAbsolutePath() + " DataDirectory " + appDataHome.getAbsolutePath() + " -f " + fileTorrc.getAbsolutePath();
+			
+			log ("Executing command> " + cmd);
+			
+			mProcess = Runtime.getRuntime().exec(cmd);
+			
+			BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(mProcess.getInputStream()));
+			StreamGobbler sg = new StreamGobbler();
+			sg.reader = bufferedReader;
+			sg.process = mProcess;
+			new Thread(sg).start();
+			
+			if (mProcess.getErrorStream() != null)
+			{
+				bufferedReader = new BufferedReader(new InputStreamReader(mProcess.getErrorStream()));
+				sg = new StreamGobbler();
+				sg.reader = bufferedReader;
+				sg.process = mProcess;
+				new Thread(sg).start();
+			}
+			
+			
+		}
+		catch (Exception e)
+		{
+			Log.d(TAG,"runTorTest exception",e);
+		}
+        
+	}
+	
+	class StreamGobbler implements Runnable
+	{
+		BufferedReader reader;
+		Process process;
+		
+		public void run ()
+		{
+			String line = null;			
+			try {
+				while ( (line = reader.readLine()) != null)
+				{
+					Message msg = mHandler.obtainMessage(0);
+					msg.getData().putString("log", line);
+					mHandler.sendMessage(msg);
+				}
+				
+			} catch (IOException e) {
+				Log.d(TAG, "error reading line",e);
+			}
+			
+			//log("Tor exit code=" + process.exitValue() + ";");
+			
+		}
+	}
+	
+	 private boolean enableBinExec (File fileBin, File appBinHome) throws Exception
+	    {
+	    	
+	    	log(fileBin.getName() + ": PRE: Is binary exec? " + fileBin.canExecute());
+	  
+	    	if (!fileBin.canExecute())
+	    	{
+	    		log("(re)Setting permission on binary: " + fileBin.getAbsolutePath());	
+
+				Runtime.getRuntime().exec("chmod " + TorServiceConstants.CHMOD_EXE_VALUE + ' ' + fileBin.getAbsolutePath()).waitFor();
+				
+				File fileTest = new File(fileBin.getAbsolutePath());
+				log(fileTest.getName() + ": POST: Is binary exec? " + fileTest.canExecute());
+
+	    	}
+	    	
+			return fileBin.canExecute();
+	    }
+	
+	private void showFileTree ()
+	{
+		
+		File fileDir = this.getDir("bin", Context.MODE_PRIVATE);
+		
+		if (fileDir.exists())
+		{
+			log("checking file tree: " + fileDir.getAbsolutePath());
+			printDir (fileDir.getName(), fileDir);
+		}
+		else
+		{
+			log("app_bin does not exist");
+		}
+		
+		fileDir = this.getDir("data", Context.MODE_PRIVATE);
+		if (fileDir.exists())
+		{
+			log("checking file tree: " + fileDir.getAbsolutePath());
+			printDir (fileDir.getName(), fileDir);
+		}
+		else
+		{
+			log ("app_data does not exist");
+		}
+				
+
+	}
+	
+	private void printDir (String path, File fileDir)
+	{
+		File[] files = fileDir.listFiles();
+		
+		if (files != null && files.length > 0)
+		{
+			for (File file : files)
+			{
+
+				try
+				{
+					if (file.isDirectory())
+					{
+						printDir(path + '/' + file.getName(), file);
+					}
+					else
+					{
+						log(path + '/' + file.getName() + " len:" + file.length() + " exec:" + file.canExecute());
+						
+					}
+				}
+				catch (Exception e)
+				{
+					log("problem printing out file information");
+				}
+			
+			}
+		}
+	}
+	
+	Handler mHandler = new Handler ()
+	{
+
+		@Override
+		public void handleMessage(Message msg) {
+		
+			super.handleMessage(msg);
+			
+			String logMsg = msg.getData().getString("log");
+			log(logMsg);
+		}
+		
+	};
+	
+	private void log (String msg)
+	{
+		Log.d(TAG, msg);
+		mTextView.append(msg + '\n');
+		log.append(msg + '\n');
+	}
+	
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+	    // Inflate menu resource file.
+	    getMenuInflater().inflate(R.menu.share_menu, menu);
+	
+	    // Locate MenuItem with ShareActionProvider
+	    MenuItem item = menu.findItem(R.id.menu_item_share);
+	
+	    return true;
+	}
+	
+	@Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+	    switch (item.getItemId()) {
+	
+	    case R.id.menu_item_share:
+	    	sendLog();
+	        return true;
+	
+	    default:
+	        return super.onOptionsItemSelected(item);
+	    }
+    }
+	
+	private void sendLog ()
+	{
+		int maxLength = 5000;
+		
+		String logShare = null;
+		
+		if (log.length() > maxLength)
+			logShare = log.substring(0,  maxLength);
+		else
+			logShare = log.toString();
+		
+		Intent sendIntent = new Intent();
+		sendIntent.setAction(Intent.ACTION_SEND);
+		sendIntent.putExtra(Intent.EXTRA_TEXT, logShare);
+		sendIntent.setType("text/plain");
+		startActivity(sendIntent);
+	}
+
+
+}
diff --git a/app/src/main/java/org/torproject/android/ui/PromoAppsActivity.java b/app/src/main/java/org/torproject/android/ui/PromoAppsActivity.java
new file mode 100644
index 0000000..01c2483
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/ui/PromoAppsActivity.java
@@ -0,0 +1,215 @@
+package org.torproject.android.ui;
+
+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;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+
+import org.torproject.android.service.OrbotConstants;
+import org.torproject.android.R;
+import org.torproject.android.service.TorServiceConstants;
+
+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);
+
+    }
+
+    @Override
+    protected void onStart() {
+
+        super.onStart();
+        setContentView(R.layout.layout_promo_apps);
+
+        stepFive();
+
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+
+    }
+
+    void stepFive(){
+
+
+        String title = getString(R.string.wizard_tips_title);
+
+        setTitle(title);
+
+        Button btnLink = (Button)findViewById(R.id.WizardRootButtonInstallGibberbot);
+
+        btnLink.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View view) {
+                finish();
+                startActivity(getInstallIntent("info.guardianproject.otr.app.im"));
+
+            }
+        });
+
+        btnLink = (Button)findViewById(R.id.WizardRootButtonInstallOrweb);
+
+        btnLink.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View view) {
+                finish();
+                startActivity(getInstallIntent(TorServiceConstants.BROWSER_APP_USERNAME));
+
+            }
+        });
+
+        btnLink = (Button)findViewById(R.id.WizardRootButtonInstallDuckgo);
+
+        btnLink.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View view) {
+
+                finish();
+                startActivity(getInstallIntent("com.duckduckgo.mobile.android"));
+
+            }
+        });
+
+        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) {
+                finish();
+                startActivity(getInstallIntent("info.guardianproject.mrapp"));
+
+            }
+        });
+
+        btnLink = (Button)findViewById(R.id.WizardRootButtonInstallMartus);
+
+        btnLink.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View view) {
+                finish();
+                startActivity(getInstallIntent("org.martus.android"));
+
+            }
+        });
+
+        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() {
+
+            @Override
+            public void onClick(View view) {
+                startActivity(intent);
+            }
+        });
+
+        Button next = ((Button)findViewById(R.id.btnWizard2));
+    	next.setOnClickListener(new View.OnClickListener() {
+			
+			public void onClick(View v) {
+				finish();
+			}
+		});
+
+	}
+
+    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));
+
+        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;
+    }
+}
diff --git a/app/src/main/java/org/torproject/android/ui/Rotate3dAnimation.java b/app/src/main/java/org/torproject/android/ui/Rotate3dAnimation.java
new file mode 100644
index 0000000..7829d2d
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/ui/Rotate3dAnimation.java
@@ -0,0 +1,76 @@
+package org.torproject.android.ui;
+
+import android.graphics.Camera;
+import android.graphics.Matrix;
+import android.view.animation.Animation;
+import android.view.animation.Transformation;
+
+/**
+ * An animation that rotates the view on the Y axis between two specified angles.
+ * This animation also adds a translation on the Z axis (depth) to improve the effect.
+ */
+public class Rotate3dAnimation extends Animation {
+    private final float mFromDegrees;
+    private final float mToDegrees;
+    private final float mCenterX;
+    private final float mCenterY;
+    private final float mDepthZ;
+    private final boolean mReverse;
+    private Camera mCamera;
+
+    /**
+     * Creates a new 3D rotation on the Y axis. The rotation is defined by its
+     * start angle and its end angle. Both angles are in degrees. The rotation
+     * is performed around a center point on the 2D space, definied by a pair
+     * of X and Y coordinates, called centerX and centerY. When the animation
+     * starts, a translation on the Z axis (depth) is performed. The length
+     * of the translation can be specified, as well as whether the translation
+     * should be reversed in time.
+     *
+     * @param fromDegrees the start angle of the 3D rotation
+     * @param toDegrees the end angle of the 3D rotation
+     * @param centerX the X center of the 3D rotation
+     * @param centerY the Y center of the 3D rotation
+     * @param reverse true if the translation should be reversed, false otherwise
+     */
+    public Rotate3dAnimation(float fromDegrees, float toDegrees,
+            float centerX, float centerY, float depthZ, boolean reverse) {
+        mFromDegrees = fromDegrees;
+        mToDegrees = toDegrees;
+        mCenterX = centerX;
+        mCenterY = centerY;
+        mDepthZ = depthZ;
+        mReverse = reverse;
+    }
+
+    @Override
+    public void initialize(int width, int height, int parentWidth, int parentHeight) {
+        super.initialize(width, height, parentWidth, parentHeight);
+        mCamera = new Camera();
+    }
+
+    @Override
+    protected void applyTransformation(float interpolatedTime, Transformation t) {
+        final float fromDegrees = mFromDegrees;
+        float degrees = fromDegrees + ((mToDegrees - fromDegrees) * interpolatedTime);
+
+        final float centerX = mCenterX;
+        final float centerY = mCenterY;
+        final Camera camera = mCamera;
+
+        final Matrix matrix = t.getMatrix();
+
+        camera.save();
+        if (mReverse) {
+            camera.translate(0.0f, 0.0f, mDepthZ * interpolatedTime);
+        } else {
+            camera.translate(0.0f, 0.0f, mDepthZ * (1.0f - interpolatedTime));
+        }
+        camera.rotateY(degrees);
+        camera.getMatrix(matrix);
+        camera.restore();
+
+        matrix.preTranslate(-centerX, -centerY);
+        matrix.postTranslate(centerX, centerY);
+    }
+}
diff --git a/app/src/main/java/org/torproject/android/ui/VPNSetupActivity.java b/app/src/main/java/org/torproject/android/ui/VPNSetupActivity.java
new file mode 100644
index 0000000..d8674c0
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/ui/VPNSetupActivity.java
@@ -0,0 +1,5 @@
+package org.torproject.android.ui;
+
+public class VPNSetupActivity {
+
+}
diff --git a/app/src/main/java/org/torproject/android/vpn/OrbotVpnManager.java b/app/src/main/java/org/torproject/android/vpn/OrbotVpnManager.java
new file mode 100644
index 0000000..8a5ac7e
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/vpn/OrbotVpnManager.java
@@ -0,0 +1,452 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.torproject.android.vpn;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.concurrent.TimeoutException;
+
+import org.torproject.android.OrbotApp;
+import org.torproject.android.R;
+import org.torproject.android.service.TorService;
+import org.torproject.android.service.TorServiceConstants;
+import org.torproject.android.service.TorServiceUtils;
+import org.torproject.android.service.TorifiedApp;
+import org.torproject.android.ui.AppManager;
+
+import android.annotation.TargetApi;
+import android.app.Application;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.net.VpnService;
+import android.net.VpnService.Builder;
+import android.os.Build;
+import android.os.Handler;
+import android.os.Message;
+import android.os.ParcelFileDescriptor;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.runjva.sourceforge.jsocks.protocol.ProxyServer;
+import com.runjva.sourceforge.jsocks.server.ServerAuthenticatorNone;
+
+ at TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
+public class OrbotVpnManager implements Handler.Callback {
+    private static final String TAG = "OrbotVpnService";
+
+    private PendingIntent mConfigureIntent;
+
+    private Thread mThreadVPN;
+
+    private String mSessionName = "OrbotVPN";
+    private ParcelFileDescriptor mInterface;
+
+    private int mTorSocks = TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT;
+    
+    public static int sSocksProxyServerPort = -1;
+    public static String sSocksProxyLocalhost = null;
+    private ProxyServer mSocksProxyServer;
+   
+    
+    private final static int VPN_MTU = 1500;
+    
+    private final static boolean mIsLollipop = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
+    
+    //this is the actual DNS server we talk to over UDP or TCP (now using Tor's DNS port)
+    private final static String DEFAULT_ACTUAL_DNS_HOST = "127.0.0.1";
+    private final static int DEFAULT_ACTUAL_DNS_PORT = TorServiceConstants.TOR_DNS_PORT_DEFAULT;
+    
+    private boolean isRestart = false;
+    
+    private VpnService mService;
+    
+
+    static{
+    	  System.loadLibrary("tun2socks");
+    	}
+    
+    public OrbotVpnManager (VpnService service)
+    {
+    	mService = service;
+    }
+   
+    //public int onStartCommand(Intent intent, int flags, int startId) {
+    public int handleIntent(Builder builder, Intent intent) {
+
+    	if (intent != null)
+    	{
+	    	String action = intent.getAction();
+	    	
+	    	if (action.equals("start"))
+	    	{
+		
+		        // Stop the previous session by interrupting the thread.
+		        if (mThreadVPN == null || (!mThreadVPN.isAlive()))
+		        {
+		        	Log.d(TAG,"starting OrbotVPNService service!");
+		        	
+		        	mTorSocks = intent.getIntExtra("torSocks", TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT);
+			    	
+		        	if (!mIsLollipop)
+		        	{
+	
+		        		startSocksBypass();
+		        	}
+		        	
+		            setupTun2Socks(builder);               
+		        }
+	    	}
+	    	else if (action.equals("stop"))
+	    	{
+	    		Log.d(TAG,"stop OrbotVPNService service!");
+	    		
+	    		stopVPN();    		
+	    		//if (mHandler != null)
+	    			//mHandler.postDelayed(new Runnable () { public void run () { stopSelf(); }}, 1000);
+	    	}
+	    	else if (action.equals("refresh"))
+	    	{
+	    		Log.d(TAG,"refresh OrbotVPNService service!");
+	    		
+	    		if (!mIsLollipop)
+	    		  startSocksBypass();
+	    		
+	    		if (!isRestart)
+	    			setupTun2Socks(builder);
+	    	}
+    	}
+     
+        
+        return Service.START_STICKY;
+    }
+  
+    private void startSocksBypass()
+    {
+       
+    	new Thread ()
+    	{
+    		
+    		public void run ()
+    		{
+
+                //generate the proxy port that the 
+                if (sSocksProxyServerPort == -1)
+                {
+                	try {
+						
+                		sSocksProxyLocalhost = "127.0.0.1";// InetAddress.getLocalHost().getHostAddress();
+	                	sSocksProxyServerPort = (int)((Math.random()*1000)+10000); 
+	                	
+					} catch (Exception e) {
+						Log.e(TAG,"Unable to access localhost",e);
+						throw new RuntimeException("Unable to access localhost: " + e);
+						
+					}
+                	
+                }
+                
+                
+		    	if (mSocksProxyServer != null)
+		    	{
+		    		stopSocksBypass ();
+		    	}
+
+		    	try
+		    	{
+			        mSocksProxyServer = new ProxyServer(new ServerAuthenticatorNone(null, null));
+			        ProxyServer.setVpnService(mService);
+			        mSocksProxyServer.start(sSocksProxyServerPort, 5, InetAddress.getLocalHost());
+			        
+		    	}
+		    	catch (Exception e)
+		    	{
+		    		Log.e(TAG,"error getting host",e);
+		    	}
+    		}
+    	}.start();
+       
+    }
+
+    private synchronized void stopSocksBypass ()
+    {
+
+        if (mSocksProxyServer != null){
+            mSocksProxyServer.stop();
+            mSocksProxyServer = null;
+        }
+        
+        
+    }
+    
+    /**
+    @Override
+	public void onCreate() {
+		super.onCreate();
+		
+		// Set the locale to English (or probably any other language that^M
+        // uses Hindu-Arabic (aka Latin) numerals).^M
+        // We have found that VpnService.Builder does something locale-dependent^M
+        // internally that causes errors when the locale uses its own numerals^M
+        // (i.e., Farsi and Arabic).^M
+		Locale.setDefault(new Locale("en"));
+		
+	}
+
+
+	@Override
+    public void onDestroy() {
+    	stopVPN();
+    }*/
+    
+    private void stopVPN ()
+    {
+    	if (mIsLollipop)
+    		stopSocksBypass ();
+        
+        if (mInterface != null){
+            try
+            {
+            	Log.d(TAG,"closing interface, destroying VPN interface");
+                
+        		mInterface.close();
+        		mInterface = null;
+            	
+            }
+            catch (Exception e)
+            {
+                Log.d(TAG,"error stopping tun2socks",e);
+            }
+            catch (Error e)
+            {
+                Log.d(TAG,"error stopping tun2socks",e);
+            }   
+        }
+        
+        Tun2Socks.Stop();
+        
+        try {
+        	TorServiceUtils.killProcess(filePdnsd);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        
+        mThreadVPN = null;
+        
+
+    }
+
+    @Override
+    public boolean handleMessage(Message message) {
+        if (message != null) {
+            Toast.makeText(mService, message.what, Toast.LENGTH_SHORT).show();
+        }
+        return true;
+    }
+
+  
+    private synchronized void setupTun2Socks(final Builder builder)  {
+
+    	
+        if (mInterface != null) //stop tun2socks now to give it time to clean up
+        {
+        	isRestart = true;
+        	Tun2Socks.Stop();
+        }
+        
+    	mThreadVPN = new Thread ()
+    	{
+    		
+    		public void run ()
+    		{
+	    		try
+		        {
+	    			
+	    			if (isRestart)
+	    			{
+	    				Log.d(TAG,"is a restart... let's wait for a few seconds");
+			        	Thread.sleep(3000);
+	    			}
+	    			
+	    			//start PDNSD daemon pointing to actual DNS
+	    			startDNS(DEFAULT_ACTUAL_DNS_HOST,DEFAULT_ACTUAL_DNS_PORT);
+	    			
+		    		final String vpnName = "OrbotVPN";
+		    		final String localhost = "127.0.0.1";
+
+		    		final String virtualGateway = "10.10.10.1";
+		    		final String virtualIP = "10.10.10.2";
+		    		final String virtualNetMask = "255.255.255.0";
+		    		final String dummyDNS = "8.8.8.8"; //this is intercepted by the tun2socks library, but we must put in a valid DNS to start
+		    		final String defaultRoute = "0.0.0.0";
+		    		
+		    		final String localSocks = localhost + ':'
+		    		        + String.valueOf(mTorSocks);
+		    		
+		    		final String localDNS = virtualGateway + ':' + "8091";//String.valueOf(TorServiceConstants.TOR_DNS_PORT_DEFAULT);
+		    		final boolean localDnsTransparentProxy = true;
+		        	
+			        builder.setMtu(VPN_MTU);
+			        builder.addAddress(virtualGateway,32);
+			        
+			        builder.setSession(vpnName);		        
+
+			        builder.addDnsServer(dummyDNS);
+			        builder.addRoute(dummyDNS,32);
+				        
+			        //route all traffic through VPN (we might offer country specific exclude lists in the future)
+			        builder.addRoute(defaultRoute,0);	
+			        
+			        //handle ipv6
+			        //builder.addAddress("fdfe:dcba:9876::1", 126);
+					//builder.addRoute("::", 0);
+			        
+			        if (mIsLollipop)			        
+			        	doLollipopAppRouting(builder);			        
+
+			         // Create a new interface using the builder and save the parameters.
+			        ParcelFileDescriptor newInterface = builder.setSession(mSessionName)
+			                .setConfigureIntent(mConfigureIntent)
+			                .establish();
+		
+			        if (mInterface != null)
+			        {
+			        	Log.d(TAG,"Stopping existing VPN interface");
+			        	mInterface.close();
+			        	mInterface = null;
+			        }
+
+		        	mInterface = newInterface;
+			        
+		        	Tun2Socks.Start(mInterface, VPN_MTU, virtualIP, virtualNetMask, localSocks , localDNS , localDnsTransparentProxy);
+		        	
+		        	isRestart = false;
+		        	
+		        }
+		        catch (Exception e)
+		        {
+		        	Log.d(TAG,"tun2Socks has stopped",e);
+		        }
+	    	}
+    		
+    	};
+    	
+    	mThreadVPN.start();
+    	
+    }
+    
+    
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+	private void doLollipopAppRouting (Builder builder) throws NameNotFoundException
+    {    
+    	   
+        ArrayList<TorifiedApp> apps = AppManager.getApps(mService, TorServiceUtils.getSharedPrefs(mService.getApplicationContext()));
+    
+        boolean perAppEnabled = false;
+        
+        for (TorifiedApp app : apps)
+        {
+        	if (app.isTorified() && (!app.getPackageName().equals(mService.getPackageName())))
+        	{
+        		builder.addAllowedApplication(app.getPackageName());
+        		perAppEnabled = true;
+        	}
+        	
+        }
+    
+        if (!perAppEnabled)
+        	builder.addDisallowedApplication(mService.getPackageName());
+    
+    }
+    
+    
+    public void onRevoke() {
+    
+    	Log.w(TAG,"VPNService REVOKED!");
+    	
+    	if (!isRestart)
+    	{
+	    	SharedPreferences prefs = TorServiceUtils.getSharedPrefs(mService.getApplicationContext()); 
+	        prefs.edit().putBoolean("pref_vpn", false).commit();      
+	    	stopVPN();	
+    	}
+    	
+    	isRestart = false;
+    	
+    	//super.onRevoke();
+    
+    }
+
+    File filePdnsd = null;
+
+    private void startDNS (String dns, int port) throws IOException, TimeoutException
+    {
+		File filePdnsd = null;//getDir(TorServiceConstants.DIRECTORY_TOR_BINARY, Application.MODE_PRIVATE);
+
+    	makePdnsdConf(mService, dns, port,filePdnsd.getParentFile() );
+    	
+        ArrayList<String> customEnv = new ArrayList<String>();
+    	String baseDirectory = filePdnsd.getParent();
+
+        String cmdString = "sh " + filePdnsd.getCanonicalPath() +
+        		" -c " + baseDirectory + "/pdnsd.conf";
+
+		Process proc = Runtime.getRuntime().exec(cmdString);
+		try { proc.waitFor();} catch (Exception e){}
+
+        Log.i(TAG,"PDNSD: " + proc.exitValue());
+        
+    }
+    
+    public static void makePdnsdConf(Context context, String dns, int port, File fileDir) throws FileNotFoundException {
+        String conf = String.format(context.getString(R.string.pdnsd_conf), dns, port);
+
+        File f = new File(fileDir,"pdnsd.conf");
+
+        if (f.exists()) {
+                f.delete();
+        }
+
+        FileOutputStream fos = new FileOutputStream(f, false);
+    	PrintStream ps = new PrintStream(fos);
+    	ps.print(conf);
+    	ps.close();
+    	
+        //f.withWriter { out -> out.print conf };
+        
+        
+        File cache = new File(fileDir,"pdnsd.cache");
+
+        if (!cache.exists()) {
+                try {
+                        cache.createNewFile();
+                } catch (Exception e) {
+
+                }
+        }
+}
+
+    
+}
diff --git a/app/src/main/java/org/torproject/android/vpn/Tun2Socks.java b/app/src/main/java/org/torproject/android/vpn/Tun2Socks.java
new file mode 100644
index 0000000..a7c638e
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/vpn/Tun2Socks.java
@@ -0,0 +1,126 @@
+package org.torproject.android.vpn;
+
+/*
+ * Copyright (c) 2013, Psiphon Inc.
+ * All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import java.net.DatagramSocket;
+import java.net.Socket;
+
+import android.annotation.TargetApi;
+import android.os.Build;
+import android.os.ParcelFileDescriptor;
+import android.util.Log;
+
+ at TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1)
+public class Tun2Socks
+{
+    public static interface IProtectSocket
+    {
+        boolean doVpnProtect(Socket socket);
+        boolean doVpnProtect(DatagramSocket socket);
+    };
+
+    private static final String TAG = Tun2Socks.class.getSimpleName();
+    private static final boolean LOGD = true;
+
+    private static Thread mThread;
+    private static ParcelFileDescriptor mVpnInterfaceFileDescriptor;
+    private static int mVpnInterfaceMTU;
+    private static String mVpnIpAddress;
+    private static String mVpnNetMask;
+    private static String mSocksServerAddress;
+    private static String mUdpgwServerAddress;
+    private static boolean mUdpgwTransparentDNS;
+    
+    // Note: this class isn't a singleton, but you can't run more
+    // than one instance due to the use of global state (the lwip
+    // module, etc.) in the native code.
+    
+    private static boolean mLibLoaded = false;
+    
+    public static void Start(
+            ParcelFileDescriptor vpnInterfaceFileDescriptor,
+            int vpnInterfaceMTU,
+            String vpnIpAddress,
+            String vpnNetMask,
+            String socksServerAddress,
+            String udpgwServerAddress,
+            boolean udpgwTransparentDNS)
+    {
+        
+        if (!mLibLoaded)
+        {
+            System.loadLibrary("tun2socks");
+            mLibLoaded = true;
+        }
+
+        mVpnInterfaceFileDescriptor = vpnInterfaceFileDescriptor;
+        mVpnInterfaceMTU = vpnInterfaceMTU;
+        mVpnIpAddress = vpnIpAddress;
+        mVpnNetMask = vpnNetMask;
+        mSocksServerAddress = socksServerAddress;
+        mUdpgwServerAddress = udpgwServerAddress;
+        mUdpgwTransparentDNS = udpgwTransparentDNS;
+
+        if (mVpnInterfaceFileDescriptor != null)
+            runTun2Socks(
+                    mVpnInterfaceFileDescriptor.detachFd(),
+                    mVpnInterfaceMTU,
+                    mVpnIpAddress,
+                    mVpnNetMask,
+                    mSocksServerAddress,
+                    mUdpgwServerAddress,
+                    mUdpgwTransparentDNS ? 1 : 0);
+    }
+    
+    public static void Stop()
+    {
+       
+        terminateTun2Socks();
+    
+    }
+
+    public static void logTun2Socks(
+            String level,
+            String channel,
+            String msg)
+    {
+        String logMsg = level + "(" + channel + "): " + msg;
+        if (0 == level.compareTo("ERROR"))
+        {
+            Log.e(TAG, logMsg);
+        }
+        else
+        {
+            if (LOGD) Log.d(TAG, logMsg);
+        }
+    }
+
+    private native static int runTun2Socks(
+            int vpnInterfaceFileDescriptor,
+            int vpnInterfaceMTU,
+            String vpnIpAddress,
+            String vpnNetMask,
+            String socksServerAddress,
+            String udpgwServerAddress,
+            int udpgwTransparentDNS);
+
+    private native static void terminateTun2Socks();
+    
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java b/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java
new file mode 100644
index 0000000..f205673
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java
@@ -0,0 +1,164 @@
+package org.torproject.android.vpn;
+
+import org.torproject.android.R;
+import org.torproject.android.service.Prefs;
+import org.torproject.android.service.TorService;
+import org.torproject.android.service.TorServiceConstants;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.VpnService;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.TextView;
+
+/*
+ * To combat background service being stopped/swiped
+ */
+public class VPNEnableActivity extends Activity {
+	
+	private final static int REQUEST_VPN = 7777;
+	private	Intent intent = null;
+	private boolean checkVpn = true;
+	private Handler h = new Handler();
+	
+	@Override
+	public void onCreate( Bundle icicle ) {
+		
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
+        //getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+
+		super.onCreate( icicle );
+
+		Log.d("VPNEnableActivity","prompting user to start Orbot VPN");
+
+		
+	}
+	
+	public void onResume ()
+	{
+		super.onResume();
+		
+		if (checkVpn)
+		{
+			intent = VpnService.prepare(this);
+			
+			if (intent != null)
+				promptStartVpnService();
+			else
+				startVpnService ();
+			
+			checkVpn = false;
+		}
+	}
+	
+	public void promptStartVpnService ()
+    {
+    	 
+         AlertDialog dialog = new AlertDialog.Builder(this)
+         .setTitle(getString(R.string.app_name) + ' ' + getString(R.string.apps_mode))
+         .setMessage(getString(R.string.you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_))
+         .setPositiveButton(R.string.activate, new Dialog.OnClickListener ()
+         {
+
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+		        Prefs.putUseVpn(true);
+		        
+				startVpnService();
+				
+			}
+
+        	 
+         })
+         .setNegativeButton(R.string.btn_cancel, new Dialog.OnClickListener ()
+         {
+
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				
+				 h.postDelayed(new Runnable () {
+		            	
+		            	public void run ()
+		            	{
+		            		VPNEnableActivity.this.finish();	
+		            		
+		            	}
+		            }, 100);
+			}
+        	 
+         }).create();
+         
+         dialog.show();
+         
+         
+    }
+	 
+	private void startVpnService ()
+	{
+   		if (intent == null)
+   		{
+   			Log.d("VPNEnableActivity","VPN enabled, starting Tor...");
+            sendIntentToService(TorServiceConstants.CMD_VPN);
+            
+            Handler h = new Handler();
+            h.postDelayed(new Runnable () {
+            	
+            	public void run ()
+            	{
+            		sendIntentToService(TorServiceConstants.ACTION_START);		
+            		finish();
+            	}
+            }, 100);
+           
+   			
+   		}
+   		else
+   		{
+   			Log.w("VPNEnableActivity","prompt for VPN");
+            startActivityForResult(intent,REQUEST_VPN);
+
+   		}
+
+	}
+	
+	  @Override
+	    protected void onActivityResult(int request, int response, Intent data) {
+	        super.onActivityResult(request, response, data);
+	        
+	        if (request == REQUEST_VPN && response == RESULT_OK)
+	        {
+	            sendIntentToService(TorServiceConstants.CMD_VPN);	    
+	            
+	            h.postDelayed(new Runnable () {
+	            	
+	            	public void run ()
+	            	{
+	            		sendIntentToService(TorServiceConstants.ACTION_START);		
+	            		 finish();
+	            	}
+	            }, 1000);
+	            
+	           
+	            
+	        }
+	  }
+	  
+
+		private void sendIntentToService(String action) {
+			Intent torService = new Intent(this, TorService.class);    
+			torService.setAction(action);
+			startService(torService);
+		}
+    
+}
diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk
new file mode 100644
index 0000000..f4af1d9
--- /dev/null
+++ b/app/src/main/jni/Android.mk
@@ -0,0 +1,145 @@
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+LOCAL_PATH := $(call my-dir)
+ROOT_PATH := $(LOCAL_PATH)
+EXTERN_PATH := $(LOCAL_PATH)/../external
+
+########################################################
+## pdnsd library
+########################################################
+
+include $(CLEAR_VARS)
+
+PDNSD_SOURCES  := $(wildcard $(LOCAL_PATH)/pdnsd/src/*.c)
+
+LOCAL_MODULE    := pdnsd
+LOCAL_SRC_FILES := $(PDNSD_SOURCES:$(LOCAL_PATH)/%=%)
+LOCAL_CFLAGS    := -Wall -O2 -I$(LOCAL_PATH)/pdnsd -DHAVE_STPCPY
+
+include $(BUILD_EXECUTABLE)
+
+########################################################
+## libancillary
+########################################################
+
+include $(CLEAR_VARS)
+
+ANCILLARY_SOURCE := fd_recv.c fd_send.c
+
+LOCAL_MODULE := libancillary
+LOCAL_CFLAGS := -O2 -I$(LOCAL_PATH)/libancillary
+
+LOCAL_SRC_FILES := $(addprefix libancillary/, $(ANCILLARY_SOURCE))
+
+include $(BUILD_STATIC_LIBRARY)
+
+
+########################################################
+## tun2socks
+########################################################
+
+include $(CLEAR_VARS)
+
+LOCAL_CFLAGS := -std=gnu99
+LOCAL_CFLAGS += -DBADVPN_THREADWORK_USE_PTHREAD -DBADVPN_LINUX -DBADVPN_BREACTOR_BADVPN -D_GNU_SOURCE
+LOCAL_CFLAGS += -DBADVPN_USE_SELFPIPE -DBADVPN_USE_EPOLL
+LOCAL_CFLAGS += -DBADVPN_LITTLE_ENDIAN -DBADVPN_THREAD_SAFE
+LOCAL_CFLAGS += -DNDEBUG -DANDROID
+LOCAL_CFLAGS += -DTUN2SOCKS_JNI
+LOCAL_CFLAGS += -DPSIPHON
+
+LOCAL_STATIC_LIBRARIES := libancillary
+
+LOCAL_C_INCLUDES:= \
+		$(LOCAL_PATH)/libancillary \
+        $(EXTERN_PATH)/badvpn/ \
+        $(EXTERN_PATH)/badvpn/lwip/src/include/ipv4 \
+        $(EXTERN_PATH)/badvpn/lwip/src/include/ipv6 \
+        $(EXTERN_PATH)/badvpn/lwip/src/include \
+        $(EXTERN_PATH)/badvpn/lwip/custom \
+
+TUN2SOCKS_SOURCES := \
+        base/BLog_syslog.c \
+        system/BReactor_badvpn.c \
+        system/BSignal.c \
+        system/BConnection_unix.c \
+        system/BTime.c \
+        system/BUnixSignal.c \
+        system/BNetwork.c \
+        flow/StreamRecvInterface.c \
+        flow/PacketRecvInterface.c \
+        flow/PacketPassInterface.c \
+        flow/StreamPassInterface.c \
+        flow/SinglePacketBuffer.c \
+        flow/BufferWriter.c \
+        flow/PacketBuffer.c \
+        flow/PacketStreamSender.c \
+        flow/PacketPassConnector.c \
+        flow/PacketProtoFlow.c \
+        flow/PacketPassFairQueue.c \
+        flow/PacketProtoEncoder.c \
+        flow/PacketProtoDecoder.c \
+        socksclient/BSocksClient.c \
+        tuntap/BTap.c \
+        lwip/src/core/timers.c \
+        lwip/src/core/udp.c \
+        lwip/src/core/memp.c \
+        lwip/src/core/init.c \
+        lwip/src/core/pbuf.c \
+        lwip/src/core/tcp.c \
+        lwip/src/core/tcp_out.c \
+        lwip/src/core/netif.c \
+        lwip/src/core/def.c \
+        lwip/src/core/mem.c \
+        lwip/src/core/tcp_in.c \
+        lwip/src/core/stats.c \
+        lwip/src/core/inet_chksum.c \
+        lwip/src/core/ipv4/icmp.c \
+        lwip/src/core/ipv4/igmp.c \
+        lwip/src/core/ipv4/ip4_addr.c \
+        lwip/src/core/ipv4/ip_frag.c \
+        lwip/src/core/ipv4/ip4.c \
+        lwip/src/core/ipv4/autoip.c \
+        lwip/src/core/ipv6/ethip6.c \
+        lwip/src/core/ipv6/inet6.c \
+        lwip/src/core/ipv6/ip6_addr.c \
+        lwip/src/core/ipv6/mld6.c \
+        lwip/src/core/ipv6/dhcp6.c \
+        lwip/src/core/ipv6/icmp6.c \
+        lwip/src/core/ipv6/ip6.c \
+        lwip/src/core/ipv6/ip6_frag.c \
+        lwip/src/core/ipv6/nd6.c \
+        lwip/custom/sys.c \
+        tun2socks/tun2socks.c \
+        base/DebugObject.c \
+        base/BLog.c \
+        base/BPending.c \
+		system/BDatagram_unix.c \
+        flowextra/PacketPassInactivityMonitor.c \
+        tun2socks/SocksUdpGwClient.c \
+        udpgw_client/UdpGwClient.c
+
+LOCAL_MODULE := tun2socks
+
+LOCAL_LDLIBS := -ldl -llog
+
+LOCAL_SRC_FILES := $(addprefix ../external/badvpn/, $(TUN2SOCKS_SOURCES))
+
+##include $(BUILD_EXECUTABLE)
+include $(BUILD_SHARED_LIBRARY)
+
+# Import cpufeatures
+$(call import-module,android/cpufeatures)
diff --git a/app/src/main/jni/Application.mk b/app/src/main/jni/Application.mk
new file mode 100644
index 0000000..a52bf0f
--- /dev/null
+++ b/app/src/main/jni/Application.mk
@@ -0,0 +1,4 @@
+APP_ABI      			:= armeabi x86
+APP_PLATFORM 			:= android-9
+APP_STL      			:= stlport_static
+NDK_TOOLCHAIN_VERSION 	:= 4.8
diff --git a/app/src/main/jni/libancillary/API b/app/src/main/jni/libancillary/API
new file mode 100644
index 0000000..b558995
--- /dev/null
+++ b/app/src/main/jni/libancillary/API
@@ -0,0 +1,139 @@
+  This library provide an easy interface to the black magic that can be done
+  on Unix domain sockets, like passing file descriptors from one process to
+  another.
+
+  Programs that uses this library should include the ancillary.h header file.
+  Nothing else is required.
+
+  All functions of this library require the following header:
+
+	#include <ancillary.h>
+
+  At this time, the only ancillary data defined by the Single Unix
+  Specification (v3) is file descriptors.
+
+Passing file descriptors
+
+	int ancil_send_fd(socket, file_descriptor)
+	  int socket: the Unix socket
+	  int file_descriptor: the file descriptor
+	  Return value: 0 for success, -1 for failure.
+
+  Sends one file descriptor on a socket.
+  In case of failure, errno is set; the possible values are the ones of the
+  sendmsg(2) system call.
+
+
+	int ancil_recv_fd(socket, file_descriptor)
+	  int socket: the Unix socket
+	  int *file_descriptor: pointer to the returned file descriptor
+	  Return value: 0 for success, -1 for failure
+
+  Receives one file descriptor from a socket.
+  In case of success, the file descriptor is stored in the integer pointed
+  to by file_descriptor.
+  In case of failure, errno is set; the possible values are the ones of the
+  recvmsg(2) system call.
+  The behavior is undefined if the recv_fd does not match a send_fd* on the
+  other side.
+
+
+	int ancil_send_fds(socket, file_descriptors, num_file_descriptors)
+	  int socket: the Unix socket
+	  const int *file_descriptors: array of file descriptors
+	  unsigned num_file_descriptors: number of file descriptors
+	  Return value: 0 for success, -1 for failure
+
+  Sends several file descriptors on a socket.
+  In case of failure, errno is set; the possible values are the ones of the
+  sendmsg(2) system call.
+  The maximum number of file descriptors that can be sent using this
+  function is ANCIL_MAX_N_FDS; the behavior is undefined in case of
+  overflow, probably a stack corruption.
+
+
+	int ancil_recv_fds(socket, file_descriptors, num_file_descriptors)
+	  int socket: the Unix socket
+	  int *file_descriptors: return array of file descriptors
+	  unsigned num_file_descriptors: number of file descriptors
+	  Return value: number of received fd for success, -1 for failure
+
+  Receives several file descriptors from a socket, no more than
+  num_file_descriptors.
+  In case of success, the received file descriptors are stored in the array
+  pointed to by file_descriptors.
+  In case of failure, errno is set; the possible values are the ones of the
+  recvmsg(2) system call.
+  The maximum number of file descriptors that can be received using this
+  function is ANCIL_MAX_N_FDS; the behavior is undefined in case of
+  overflow, probably a stack corruption.
+  The behavior is undefined if the recv_fds does not match a send_fd* on
+  the other side, or if the number of received file descriptors is more than
+  num_file_descriptors.
+
+
+	int ancil_send_fds_with_buffer(socket, fds, num, buffer)
+	  int socket: the Unix socket
+	  const int *fds: array of file descriptors
+	  unsigned num: number of file descriptors
+	  void *buffer: buffer to hold the system data structures
+	  Return value: 0 for success, -1 for failure
+
+  Sends several file descriptors on a socket.
+  In case of failure, errno is set; the possible values are the ones of the
+  sendmsg(2) system call.
+  The buffer argument must point to a memory area large enough to hold the
+  system data structures, see ANCIL_FD_BUFFER.
+
+
+	int ancil_send_fds_with_buffer(socket, fds, num, buffer)
+	  int socket: the Unix socket
+	  int *fds: return array of file descriptors
+	  unsigned num: number of file descriptors
+	  void *buffer: buffer to hold the system data structures
+	  Return value: number of received fd for success, -1 for failure
+
+  Receives several file descriptors from a socket, no more than
+  num_file_descriptors.
+  In case of success, the received file descriptors are stored in the array
+  pointed to by file_descriptors.
+  In case of failure, errno is set; the possible values are the ones of the
+  recvmsg(2) system call.
+  The behavior is undefined if the recv_fds does not match a send_fd* on
+  the other side, or if the number of received file descriptors is more than
+  num_file_descriptors.
+  The buffer argument must point to a memory area large enough to hold the
+  system data structures, see ANCIL_FD_BUFFER.
+
+
+	ANCIL_MAX_N_FDS
+
+  Maximum number of file descriptors that can be sent with the sent_fds and
+  recv_fds functions. If you have to send more at once, use the
+  *_with_buffer versions. The value is enough to send "quite a few" file
+  descriptors.
+
+
+	ANCIL_FD_BUFFER(n)
+	  int n: number of file descriptors
+
+  Expands to a structure data type large enough to hold the system data
+  structures for n file descriptors. So the address of a variable declared
+  of type ANCIL_FD_BUFFER(n) is suitable as the buffer argument for
+  *_with_buffer on n file descriptors.
+  To use this macro, you need <sys/types.h> and <sys/socket.h>. Bevare: with
+  Solaris, the _XPG4_2 macro must be defined before sys/socket is included.
+
+
+Tuning the compilation
+
+  This library is designed to be included in projects, not installed in
+  /usr/lib. If your project does not use some of the functions, the
+  TUNE_OPTS variable in the Makefile allows not to build them. It is a list
+  of proprocessor options:
+
+  -DNDEBUG: turn assertions off (see assert(3))
+  -DSPARE_SEND_FDS: do not build ancil_send_fds
+  -DSPARE_SEND_FD:  do not build ancil_send_fd
+  -DSPARE_RECV_FDS: do not build ancil_recv_fds
+  -DSPARE_RECV_FD:  do not build ancil_recv_fd
diff --git a/app/src/main/jni/libancillary/COPYING b/app/src/main/jni/libancillary/COPYING
new file mode 100644
index 0000000..5bcd9c2
--- /dev/null
+++ b/app/src/main/jni/libancillary/COPYING
@@ -0,0 +1,21 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/app/src/main/jni/libancillary/Makefile b/app/src/main/jni/libancillary/Makefile
new file mode 100644
index 0000000..3d32533
--- /dev/null
+++ b/app/src/main/jni/libancillary/Makefile
@@ -0,0 +1,73 @@
+###########################################################################
+# libancillary - black magic on Unix domain sockets
+# (C) Nicolas George
+# Makefile - guess what
+###########################################################################
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+#  1. Redistributions of source code must retain the above copyright notice,
+#     this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#  3. The name of the author may not be used to endorse or promote products
+#     derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+CC=gcc
+CFLAGS=-Wall -g -O2
+LDFLAGS=
+LIBS=
+AR=ar
+RANLIB=ranlib
+RM=rm
+CP=cp
+MKDIR=mkdir
+TAR=tar
+GZIP=gzip -9
+
+NAME=libancillary
+DISTRIBUTION=API COPYING Makefile ancillary.h fd_send.c fd_recv.c test.c
+VERSION=0.9.1
+
+OBJECTS=fd_send.o fd_recv.o
+
+TUNE_OPTS=-DNDEBUG
+#TUNE_OPTS=-DNDEBUG \
+	-DSPARE_SEND_FDS -DSPARE_SEND_FD -DSPARE_RECV_FDS -DSPARE_RECV_FD
+
+.c.o:
+	$(CC) -c $(CFLAGS) $(TUNE_OPTS) $<
+
+all: libancillary.a
+
+libancillary.a: $(OBJECTS)
+	$(AR) cr $@ $(OBJECTS)
+	$(RANLIB) $@
+
+fd_send.o: ancillary.h
+fd_recv.o: ancillary.h
+
+test: test.c libancillary.a
+	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) -L. test.c -lancillary $(LIBS)
+
+clean:
+	-$(RM) -f *.o *.a test 
+
+dist:
+	$(MKDIR) $(NAME)-$(VERSION)
+	$(CP) $(DISTRIBUTION) $(NAME)-$(VERSION)
+	$(TAR) -cf - $(NAME)-$(VERSION) | $(GZIP) > $(NAME)-$(VERSION).tar.gz
+	$(RM) -rf $(NAME)-$(VERSION)
diff --git a/app/src/main/jni/libancillary/ancillary.h b/app/src/main/jni/libancillary/ancillary.h
new file mode 100644
index 0000000..636d867
--- /dev/null
+++ b/app/src/main/jni/libancillary/ancillary.h
@@ -0,0 +1,131 @@
+/***************************************************************************
+ * libancillary - black magic on Unix domain sockets
+ * (C) Nicolas George
+ * ancillary.c - public header
+ ***************************************************************************/
+
+/*
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ *  1. Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *  3. The name of the author may not be used to endorse or promote products
+ *     derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ANCILLARY_H__
+#define ANCILLARY_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/***************************************************************************
+ * Start of the readable part.
+ ***************************************************************************/
+
+#define ANCIL_MAX_N_FDS 960
+/*
+ * Maximum number of fds that can be sent or received using the "esay"
+ * functions; this is so that all can fit in one page.
+ */
+
+extern int
+ancil_send_fds_with_buffer(int, const int *, unsigned, void *);
+/*
+ * ancil_send_fds_with_buffer(sock, n_fds, fds, buffer)
+ *
+ * Sends the file descriptors in the array pointed by fds, of length n_fds
+ * on the socket sock.
+ * buffer is a writeable memory area large enough to hold the required data
+ * structures.
+ * Returns: -1 and errno in case of error, 0 in case of success.
+ */
+
+extern int
+ancil_recv_fds_with_buffer(int, int *, unsigned, void *);
+/*
+ * ancil_recv_fds_with_buffer(sock, n_fds, fds, buffer)
+ *
+ * Receives *n_fds file descriptors into the array pointed by fds
+ * from the socket sock.
+ * buffer is a writeable memory area large enough to hold the required data
+ * structures.
+ * Returns: -1 and errno in case of error, the actual number of received fd
+ * in case of success
+ */
+
+#define ANCIL_FD_BUFFER(n) \
+    struct { \
+	struct cmsghdr h; \
+	int fd[n]; \
+    }
+/* ANCIL_FD_BUFFER(n)
+ *
+ * A structure type suitable to be used as buffer for n file descriptors.
+ * Requires <sys/socket.h>.
+ * Example:
+ * ANCIL_FD_BUFFER(42) buffer;
+ * ancil_recv_fds_with_buffer(sock, 42, my_fds, &buffer);
+ */
+
+extern int
+ancil_send_fds(int, const int *, unsigned);
+/*
+ * ancil_send_fds(sock, n_fds, fds)
+ *
+ * Sends the file descriptors in the array pointed by fds, of length n_fds
+ * on the socket sock.
+ * n_fds must not be greater than ANCIL_MAX_N_FDS.
+ * Returns: -1 and errno in case of error, 0 in case of success.
+ */
+
+extern int
+ancil_recv_fds(int, int *, unsigned);
+/*
+ * ancil_recv_fds(sock, n_fds, fds)
+ *
+ * Receives *n_fds file descriptors into the array pointed by fds
+ * from the socket sock.
+ * *n_fds must not be greater than ANCIL_MAX_N_FDS.
+ * Returns: -1 and errno in case of error, the actual number of received fd
+ * in case of success.
+ */
+
+
+extern int
+ancil_send_fd(int, int);
+/* ancil_recv_fd(sock, fd);
+ *
+ * Sends the file descriptor fd on the socket sock.
+ * Returns : -1 and errno in case of error, 0 in case of success.
+ */
+
+extern int
+ancil_recv_fd(int, int *);
+/* ancil_send_fd(sock, &fd);
+ *
+ * Receives the file descriptor fd from the socket sock.
+ * Returns : -1 and errno in case of error, 0 in case of success.
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ANCILLARY_H__ */
diff --git a/app/src/main/jni/libancillary/fd_recv.c b/app/src/main/jni/libancillary/fd_recv.c
new file mode 100644
index 0000000..46c2e69
--- /dev/null
+++ b/app/src/main/jni/libancillary/fd_recv.c
@@ -0,0 +1,98 @@
+/***************************************************************************
+ * libancillary - black magic on Unix domain sockets
+ * (C) Nicolas George
+ * fd_send.c - receiving file descriptors
+ ***************************************************************************/
+
+/*
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ *  1. Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *  3. The name of the author may not be used to endorse or promote products
+ *     derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _XPG4_2 /* Solaris sucks */
+# define _XPG4_2
+#endif
+
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+#include <assert.h>
+#if defined(__FreeBSD__)
+# include <sys/param.h> /* FreeBSD sucks */
+#endif
+
+#include "ancillary.h"
+
+int
+ancil_recv_fds_with_buffer(int sock, int *fds, unsigned n_fds, void *buffer)
+{
+    struct msghdr msghdr;
+    char nothing;
+    struct iovec nothing_ptr;
+    struct cmsghdr *cmsg;
+    int i;
+
+    nothing_ptr.iov_base = ¬hing;
+    nothing_ptr.iov_len = 1;
+    msghdr.msg_name = NULL;
+    msghdr.msg_namelen = 0;
+    msghdr.msg_iov = &nothing_ptr;
+    msghdr.msg_iovlen = 1;
+    msghdr.msg_flags = 0;
+    msghdr.msg_control = buffer;
+    msghdr.msg_controllen = sizeof(struct cmsghdr) + sizeof(int) * n_fds;
+    cmsg = CMSG_FIRSTHDR(&msghdr);
+    cmsg->cmsg_len = msghdr.msg_controllen;
+    cmsg->cmsg_level = SOL_SOCKET;
+    cmsg->cmsg_type = SCM_RIGHTS;
+    for(i = 0; i < n_fds; i++)
+	((int *)CMSG_DATA(cmsg))[i] = -1;
+    
+    if(recvmsg(sock, &msghdr, 0) < 0)
+	return(-1);
+    for(i = 0; i < n_fds; i++)
+	fds[i] = ((int *)CMSG_DATA(cmsg))[i];
+    n_fds = (msghdr.msg_controllen - sizeof(struct cmsghdr)) / sizeof(int);
+    return(n_fds);
+}
+
+#ifndef SPARE_RECV_FDS
+int
+ancil_recv_fds(int sock, int *fd, unsigned n_fds)
+{
+    ANCIL_FD_BUFFER(ANCIL_MAX_N_FDS) buffer;
+
+    assert(n_fds <= ANCIL_MAX_N_FDS);
+    return(ancil_recv_fds_with_buffer(sock, fd, n_fds, &buffer));
+}
+#endif /* SPARE_RECV_FDS */
+
+#ifndef SPARE_RECV_FD
+int
+ancil_recv_fd(int sock, int *fd)
+{
+    ANCIL_FD_BUFFER(1) buffer;
+
+    return(ancil_recv_fds_with_buffer(sock, fd, 1, &buffer) == 1 ? 0 : -1);
+}
+#endif /* SPARE_RECV_FD */
diff --git a/app/src/main/jni/libancillary/fd_send.c b/app/src/main/jni/libancillary/fd_send.c
new file mode 100644
index 0000000..01de87f
--- /dev/null
+++ b/app/src/main/jni/libancillary/fd_send.c
@@ -0,0 +1,92 @@
+/***************************************************************************
+ * libancillary - black magic on Unix domain sockets
+ * (C) Nicolas George
+ * fd_send.c - sending file descriptors
+ ***************************************************************************/
+
+/*
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ *  1. Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *  3. The name of the author may not be used to endorse or promote products
+ *     derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _XPG4_2 /* Solaris sucks */
+# define _XPG4_2
+#endif
+
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+#include <assert.h>
+#if defined(__FreeBSD__)
+# include <sys/param.h> /* FreeBSD sucks */
+#endif
+
+#include "ancillary.h"
+
+int
+ancil_send_fds_with_buffer(int sock, const int *fds, unsigned n_fds, void *buffer)
+{
+    struct msghdr msghdr;
+    char nothing = '!';
+    struct iovec nothing_ptr;
+    struct cmsghdr *cmsg;
+    int i;
+
+    nothing_ptr.iov_base = ¬hing;
+    nothing_ptr.iov_len = 1;
+    msghdr.msg_name = NULL;
+    msghdr.msg_namelen = 0;
+    msghdr.msg_iov = &nothing_ptr;
+    msghdr.msg_iovlen = 1;
+    msghdr.msg_flags = 0;
+    msghdr.msg_control = buffer;
+    msghdr.msg_controllen = sizeof(struct cmsghdr) + sizeof(int) * n_fds;
+    cmsg = CMSG_FIRSTHDR(&msghdr);
+    cmsg->cmsg_len = msghdr.msg_controllen;
+    cmsg->cmsg_level = SOL_SOCKET;
+    cmsg->cmsg_type = SCM_RIGHTS;
+    for(i = 0; i < n_fds; i++)
+	((int *)CMSG_DATA(cmsg))[i] = fds[i];
+    return(sendmsg(sock, &msghdr, 0) >= 0 ? 0 : -1);
+}
+
+#ifndef SPARE_SEND_FDS
+int
+ancil_send_fds(int sock, const int *fds, unsigned n_fds)
+{
+    ANCIL_FD_BUFFER(ANCIL_MAX_N_FDS) buffer;
+
+    assert(n_fds <= ANCIL_MAX_N_FDS);
+    return(ancil_send_fds_with_buffer(sock, fds, n_fds, &buffer));
+}
+#endif /* SPARE_SEND_FDS */
+
+#ifndef SPARE_SEND_FD
+int
+ancil_send_fd(int sock, int fd)
+{
+    ANCIL_FD_BUFFER(1) buffer;
+
+    return(ancil_send_fds_with_buffer(sock, &fd, 1, &buffer));
+}
+#endif /* SPARE_SEND_FD */
diff --git a/app/src/main/jni/libancillary/test.c b/app/src/main/jni/libancillary/test.c
new file mode 100644
index 0000000..d3c1fda
--- /dev/null
+++ b/app/src/main/jni/libancillary/test.c
@@ -0,0 +1,112 @@
+/***************************************************************************
+ * libancillary - black magic on Unix domain sockets
+ * (C) Nicolas George
+ * test.c - testing and example program
+ ***************************************************************************/
+
+/*
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ *  1. Redistributions of source code must retain the above copyright notice,
+ *     this list of conditions and the following disclaimer.
+ *  2. Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *  3. The name of the author may not be used to endorse or promote products
+ *     derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <sys/wait.h>
+#include <sys/socket.h>
+#include "ancillary.h"
+
+void child_process(int sock)
+{
+    int fd;
+    int fds[3], nfds;
+    char b[] = "This is on the received fd!\n";
+
+    if(ancil_recv_fd(sock, &fd)) {
+	perror("ancil_recv_fd");
+	exit(1);
+    } else {
+	printf("Received fd: %d\n", fd);
+    }
+    write(fd, b, sizeof(b));
+    close(fd);
+    sleep(2);
+
+    nfds = ancil_recv_fds(sock, fds, 3);
+    if(nfds < 0) {
+	perror("ancil_recv_fds");
+	exit(1);
+    } else {
+	printf("Received %d/3 fds : %d %d %d.\n", nfds,
+	    fds[0], fds[1], fds[2]);
+    }
+}
+
+void parent_process(int sock)
+{
+    int fds[2] = { 1, 2 };
+
+    if(ancil_send_fd(sock, 1)) {
+	perror("ancil_send_fd");
+	exit(1);
+    } else {
+	printf("Sent fd.\n");
+    }
+    sleep(1);
+
+    if(ancil_send_fds(sock, fds, 2)) {
+	perror("ancil_send_fds");
+	exit(1);
+    } else {
+	printf("Sent two fds.\n");
+    }
+}
+
+int main(void)
+{
+    int sock[2];
+
+    if(socketpair(PF_UNIX, SOCK_STREAM, 0, sock)) {
+	perror("socketpair");
+	exit(1);
+    } else {
+	printf("Established socket pair: (%d, %d)\n", sock[0], sock[1]);
+    }
+
+    switch(fork()) {
+	case 0:
+	    close(sock[0]);
+	    child_process(sock[1]);
+	    break;
+	case -1:
+	    perror("fork");
+	    exit(1);
+	default:
+	    close(sock[1]);
+	    parent_process(sock[0]);
+	    wait(NULL);
+	    break;
+    }
+    return(0);
+}
diff --git a/app/src/main/res/drawable-hdpi-v11/ic_stat_notifyerr.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_notifyerr.png
new file mode 100644
index 0000000..1f97a9e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v11/ic_stat_notifyerr.png differ
diff --git a/app/src/main/res/drawable-hdpi-v11/ic_stat_tor.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_tor.png
new file mode 100644
index 0000000..b4d2e33
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v11/ic_stat_tor.png differ
diff --git a/app/src/main/res/drawable-hdpi-v11/ic_stat_tor_off.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_tor_off.png
new file mode 100644
index 0000000..6df646e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v11/ic_stat_tor_off.png differ
diff --git a/app/src/main/res/drawable-hdpi-v11/ic_stat_tor_xfer.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..3d75721
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v11/ic_stat_tor_xfer.png differ
diff --git a/app/src/main/res/drawable-hdpi-v11/inverse.png b/app/src/main/res/drawable-hdpi-v11/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v11/inverse.png differ
diff --git a/app/src/main/res/drawable-hdpi-v9/ic_stat_notifyerr.png b/app/src/main/res/drawable-hdpi-v9/ic_stat_notifyerr.png
new file mode 100644
index 0000000..58fc5ae
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v9/ic_stat_notifyerr.png differ
diff --git a/app/src/main/res/drawable-hdpi-v9/ic_stat_tor.png b/app/src/main/res/drawable-hdpi-v9/ic_stat_tor.png
new file mode 100644
index 0000000..1dfdc09
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v9/ic_stat_tor.png differ
diff --git a/app/src/main/res/drawable-hdpi-v9/inverse.png b/app/src/main/res/drawable-hdpi-v9/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v9/inverse.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_action_settings.png b/app/src/main/res/drawable-hdpi/ic_action_settings.png
new file mode 100644
index 0000000..d57b290
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_settings.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..e9954eb
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_notifyerr.png b/app/src/main/res/drawable-hdpi/ic_stat_notifyerr.png
new file mode 100644
index 0000000..b65fa64
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_notifyerr.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_tor.png b/app/src/main/res/drawable-hdpi/ic_stat_tor.png
new file mode 100644
index 0000000..0f3b147
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_tor.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_stat_tor_xfer.png b/app/src/main/res/drawable-hdpi/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..d222fb6
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_tor_xfer.png differ
diff --git a/app/src/main/res/drawable-hdpi/inverse.png b/app/src/main/res/drawable-hdpi/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/inverse.png differ
diff --git a/app/src/main/res/drawable-ldpi-v11/ic_stat_notifyerr.png b/app/src/main/res/drawable-ldpi-v11/ic_stat_notifyerr.png
new file mode 100644
index 0000000..b73292d
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v11/ic_stat_notifyerr.png differ
diff --git a/app/src/main/res/drawable-ldpi-v11/ic_stat_tor.png b/app/src/main/res/drawable-ldpi-v11/ic_stat_tor.png
new file mode 100644
index 0000000..0f24ee8
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v11/ic_stat_tor.png differ
diff --git a/app/src/main/res/drawable-ldpi-v11/inverse.png b/app/src/main/res/drawable-ldpi-v11/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v11/inverse.png differ
diff --git a/app/src/main/res/drawable-ldpi-v9/ic_stat_notifyerr.png b/app/src/main/res/drawable-ldpi-v9/ic_stat_notifyerr.png
new file mode 100644
index 0000000..2787bbb
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v9/ic_stat_notifyerr.png differ
diff --git a/app/src/main/res/drawable-ldpi-v9/ic_stat_tor.png b/app/src/main/res/drawable-ldpi-v9/ic_stat_tor.png
new file mode 100644
index 0000000..82d5446
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v9/ic_stat_tor.png differ
diff --git a/app/src/main/res/drawable-ldpi-v9/inverse.png b/app/src/main/res/drawable-ldpi-v9/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/app/src/main/res/drawable-ldpi-v9/inverse.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_action_settings.png b/app/src/main/res/drawable-ldpi/ic_action_settings.png
new file mode 100644
index 0000000..c3927fd
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_action_settings.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_launcher.png b/app/src/main/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 0000000..dd665db
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_stat_notifyerr.png b/app/src/main/res/drawable-ldpi/ic_stat_notifyerr.png
new file mode 100644
index 0000000..518e188
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_stat_notifyerr.png differ
diff --git a/app/src/main/res/drawable-ldpi/ic_stat_tor.png b/app/src/main/res/drawable-ldpi/ic_stat_tor.png
new file mode 100644
index 0000000..3cd399d
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/ic_stat_tor.png differ
diff --git a/app/src/main/res/drawable-ldpi/inverse.png b/app/src/main/res/drawable-ldpi/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/app/src/main/res/drawable-ldpi/inverse.png differ
diff --git a/app/src/main/res/drawable-mdpi-v11/ic_stat_notifyerr.png b/app/src/main/res/drawable-mdpi-v11/ic_stat_notifyerr.png
new file mode 100644
index 0000000..935e209
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v11/ic_stat_notifyerr.png differ
diff --git a/app/src/main/res/drawable-mdpi-v11/ic_stat_tor.png b/app/src/main/res/drawable-mdpi-v11/ic_stat_tor.png
new file mode 100644
index 0000000..a34840d
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v11/ic_stat_tor.png differ
diff --git a/app/src/main/res/drawable-mdpi-v11/ic_stat_tor_xfer.png b/app/src/main/res/drawable-mdpi-v11/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..fe291e7
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v11/ic_stat_tor_xfer.png differ
diff --git a/app/src/main/res/drawable-mdpi-v11/inverse.png b/app/src/main/res/drawable-mdpi-v11/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v11/inverse.png differ
diff --git a/app/src/main/res/drawable-mdpi-v9/ic_stat_notifyerr.png b/app/src/main/res/drawable-mdpi-v9/ic_stat_notifyerr.png
new file mode 100644
index 0000000..b149031
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v9/ic_stat_notifyerr.png differ
diff --git a/app/src/main/res/drawable-mdpi-v9/ic_stat_tor.png b/app/src/main/res/drawable-mdpi-v9/ic_stat_tor.png
new file mode 100644
index 0000000..c150ced
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v9/ic_stat_tor.png differ
diff --git a/app/src/main/res/drawable-mdpi-v9/inverse.png b/app/src/main/res/drawable-mdpi-v9/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v9/inverse.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_action_settings.png b/app/src/main/res/drawable-mdpi/ic_action_settings.png
new file mode 100644
index 0000000..d90f125
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_settings.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..e45ce29
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_notifyerr.png b/app/src/main/res/drawable-mdpi/ic_stat_notifyerr.png
new file mode 100644
index 0000000..c4b3178
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_notifyerr.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_tor.png b/app/src/main/res/drawable-mdpi/ic_stat_tor.png
new file mode 100644
index 0000000..6649e14
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_tor.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_stat_tor_xfer.png b/app/src/main/res/drawable-mdpi/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..73ab233
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_tor_xfer.png differ
diff --git a/app/src/main/res/drawable-mdpi/inverse.png b/app/src/main/res/drawable-mdpi/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/inverse.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_stat_notifyerr.png b/app/src/main/res/drawable-xhdpi-v11/ic_stat_notifyerr.png
new file mode 100644
index 0000000..bed9e21
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v11/ic_stat_notifyerr.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_stat_tor.png b/app/src/main/res/drawable-xhdpi-v11/ic_stat_tor.png
new file mode 100644
index 0000000..e742ae7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v11/ic_stat_tor.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_stat_tor_xfer.png b/app/src/main/res/drawable-xhdpi-v11/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..27e8672
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v11/ic_stat_tor_xfer.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v11/inverse.png b/app/src/main/res/drawable-xhdpi-v11/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v11/inverse.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v9/ic_stat_notifyerr.png b/app/src/main/res/drawable-xhdpi-v9/ic_stat_notifyerr.png
new file mode 100644
index 0000000..7d1139c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v9/ic_stat_notifyerr.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v9/ic_stat_tor.png b/app/src/main/res/drawable-xhdpi-v9/ic_stat_tor.png
new file mode 100644
index 0000000..9e56f4f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v9/ic_stat_tor.png differ
diff --git a/app/src/main/res/drawable-xhdpi-v9/inverse.png b/app/src/main/res/drawable-xhdpi-v9/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v9/inverse.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_settings.png b/app/src/main/res/drawable-xhdpi/ic_action_settings.png
new file mode 100644
index 0000000..f2572c8
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_settings.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..13ee02b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_notifyerr.png b/app/src/main/res/drawable-xhdpi/ic_stat_notifyerr.png
new file mode 100644
index 0000000..f48e8e8
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_notifyerr.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_tor.png b/app/src/main/res/drawable-xhdpi/ic_stat_tor.png
new file mode 100644
index 0000000..11254d2
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_tor.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_tor_xfer.png b/app/src/main/res/drawable-xhdpi/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..522d653
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_tor_xfer.png differ
diff --git a/app/src/main/res/drawable-xhdpi/inverse.png b/app/src/main/res/drawable-xhdpi/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/inverse.png differ
diff --git a/app/src/main/res/drawable-xxhdpi-v11/ic_stat_tor.png b/app/src/main/res/drawable-xxhdpi-v11/ic_stat_tor.png
new file mode 100644
index 0000000..1451c50
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v11/ic_stat_tor.png differ
diff --git a/app/src/main/res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png b/app/src/main/res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..59e63d4
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..c2f2f45
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_tor.png b/app/src/main/res/drawable-xxhdpi/ic_stat_tor.png
new file mode 100644
index 0000000..778cc1e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_stat_tor.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_tor_xfer.png b/app/src/main/res/drawable-xxhdpi/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..eb8809c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_stat_tor_xfer.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/inverse.png b/app/src/main/res/drawable-xxhdpi/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/inverse.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor.png b/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor.png
new file mode 100644
index 0000000..a78d290
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png b/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..30fe589
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..74a3130
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png
new file mode 100644
index 0000000..a2ff338
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_stat_tor_xfer.png b/app/src/main/res/drawable-xxxhdpi/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..8f96779
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_stat_tor_xfer.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/inverse.png b/app/src/main/res/drawable-xxxhdpi/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/inverse.png differ
diff --git a/app/src/main/res/drawable/button.xml b/app/src/main/res/drawable/button.xml
new file mode 100644
index 0000000..9f44d24
--- /dev/null
+++ b/app/src/main/res/drawable/button.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_pressed="true" >
+    <shape>
+      <solid
+          android:color="@color/panel_background" />
+      <stroke
+          android:width="1dp"
+          android:color="#ffffff" />
+      <corners
+          android:radius="6dp" />
+      <padding
+          android:left="10dp"
+          android:top="10dp"
+          android:right="10dp"
+          android:bottom="10dp" />
+    </shape>
+  </item>
+  <item>
+    <shape>
+      <gradient
+          android:startColor="@color/panel_background_dark"
+          android:endColor="@color/panel_background_main"
+          android:angle="270" />
+      <stroke
+          android:width="2dp"
+          android:color="#aaaaaa" />
+      <corners
+          android:radius="6dp" />
+      <padding
+          android:left="10dp"
+          android:top="10dp"
+          android:right="10dp"
+          android:bottom="10dp" />
+    </shape>
+  </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_off.xml b/app/src/main/res/drawable/button_off.xml
new file mode 100644
index 0000000..1304d1b
--- /dev/null
+++ b/app/src/main/res/drawable/button_off.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_pressed="true" >
+    <shape>
+      <solid
+          android:color="@color/panel_background" />
+      <stroke
+          android:width="1dp"
+          android:color="#ffffff" />
+      <corners
+          android:radius="6dp" />
+      <padding
+          android:left="10dp"
+          android:top="10dp"
+          android:right="10dp"
+          android:bottom="10dp" />
+    </shape>
+  </item>
+  <item>
+    <shape>
+      <gradient
+          android:startColor="@color/panel_background_dark"
+          android:endColor="@color/panel_background_main"
+          android:angle="270" />
+      <stroke
+          android:width="2dp"
+          android:color="#555555" />
+      <corners
+          android:radius="6dp" />
+      <padding
+          android:left="10dp"
+          android:top="10dp"
+          android:right="10dp"
+          android:bottom="10dp" />
+    </shape>
+  </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_on.xml b/app/src/main/res/drawable/button_on.xml
new file mode 100644
index 0000000..27dc092
--- /dev/null
+++ b/app/src/main/res/drawable/button_on.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_pressed="true" >
+    <shape>
+      <solid
+          android:color="@color/bright_green" />
+      <stroke
+          android:width="1dp"
+          android:color="#ffffff" />
+      <corners
+          android:radius="6dp" />
+      <padding
+          android:left="10dp"
+          android:top="10dp"
+          android:right="10dp"
+          android:bottom="10dp" />
+    </shape>
+  </item>
+  <item>
+  <shape>
+      <solid
+          android:color="@color/dark_green" />
+      <stroke
+          android:width="1dp"
+          android:color="#ffffff" />
+      <corners
+          android:radius="6dp" />
+      <padding
+          android:left="10dp"
+          android:top="10dp"
+          android:right="10dp"
+          android:bottom="10dp" />
+    </shape>
+  </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/classyfabric.png b/app/src/main/res/drawable/classyfabric.png
new file mode 100644
index 0000000..ca3d267
Binary files /dev/null and b/app/src/main/res/drawable/classyfabric.png differ
diff --git a/app/src/main/res/drawable/error.png b/app/src/main/res/drawable/error.png
new file mode 100644
index 0000000..42dc6d6
Binary files /dev/null and b/app/src/main/res/drawable/error.png differ
diff --git a/app/src/main/res/drawable/ic_chatsecure.png b/app/src/main/res/drawable/ic_chatsecure.png
new file mode 100644
index 0000000..aaddd88
Binary files /dev/null and b/app/src/main/res/drawable/ic_chatsecure.png differ
diff --git a/app/src/main/res/drawable/ic_duckduckgo.png b/app/src/main/res/drawable/ic_duckduckgo.png
new file mode 100644
index 0000000..696dcd6
Binary files /dev/null and b/app/src/main/res/drawable/ic_duckduckgo.png differ
diff --git a/app/src/main/res/drawable/ic_launcher.png b/app/src/main/res/drawable/ic_launcher.png
new file mode 100644
index 0000000..ea47373
Binary files /dev/null and b/app/src/main/res/drawable/ic_launcher.png differ
diff --git a/app/src/main/res/drawable/ic_menu_about.png b/app/src/main/res/drawable/ic_menu_about.png
new file mode 100644
index 0000000..866d4e0
Binary files /dev/null and b/app/src/main/res/drawable/ic_menu_about.png differ
diff --git a/app/src/main/res/drawable/ic_menu_exit.png b/app/src/main/res/drawable/ic_menu_exit.png
new file mode 100644
index 0000000..d301ea6
Binary files /dev/null and b/app/src/main/res/drawable/ic_menu_exit.png differ
diff --git a/app/src/main/res/drawable/ic_menu_goto.png b/app/src/main/res/drawable/ic_menu_goto.png
new file mode 100644
index 0000000..40183eb
Binary files /dev/null and b/app/src/main/res/drawable/ic_menu_goto.png differ
diff --git a/app/src/main/res/drawable/ic_play.png b/app/src/main/res/drawable/ic_play.png
new file mode 100644
index 0000000..a919794
Binary files /dev/null and b/app/src/main/res/drawable/ic_play.png differ
diff --git a/app/src/main/res/drawable/ic_stat_tor_off.png b/app/src/main/res/drawable/ic_stat_tor_off.png
new file mode 100644
index 0000000..6df646e
Binary files /dev/null and b/app/src/main/res/drawable/ic_stat_tor_off.png differ
diff --git a/app/src/main/res/drawable/ic_stat_tor_xfer.png b/app/src/main/res/drawable/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..73ab233
Binary files /dev/null and b/app/src/main/res/drawable/ic_stat_tor_xfer.png differ
diff --git a/app/src/main/res/drawable/ic_twitter.png b/app/src/main/res/drawable/ic_twitter.png
new file mode 100644
index 0000000..1e61c0a
Binary files /dev/null and b/app/src/main/res/drawable/ic_twitter.png differ
diff --git a/app/src/main/res/drawable/icon_martus.png b/app/src/main/res/drawable/icon_martus.png
new file mode 100644
index 0000000..e72db19
Binary files /dev/null and b/app/src/main/res/drawable/icon_martus.png differ
diff --git a/app/src/main/res/drawable/icon_orfox.png b/app/src/main/res/drawable/icon_orfox.png
new file mode 100644
index 0000000..57ed1f0
Binary files /dev/null and b/app/src/main/res/drawable/icon_orfox.png differ
diff --git a/app/src/main/res/drawable/icon_story_maker.png b/app/src/main/res/drawable/icon_story_maker.png
new file mode 100644
index 0000000..9c54ca5
Binary files /dev/null and b/app/src/main/res/drawable/icon_story_maker.png differ
diff --git a/app/src/main/res/drawable/inverse.png b/app/src/main/res/drawable/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/app/src/main/res/drawable/inverse.png differ
diff --git a/app/src/main/res/drawable/n8fr8.jpg b/app/src/main/res/drawable/n8fr8.jpg
new file mode 100644
index 0000000..4939d5c
Binary files /dev/null and b/app/src/main/res/drawable/n8fr8.jpg differ
diff --git a/app/src/main/res/drawable/oldtoroff.png b/app/src/main/res/drawable/oldtoroff.png
new file mode 100644
index 0000000..4b23e0b
Binary files /dev/null and b/app/src/main/res/drawable/oldtoroff.png differ
diff --git a/app/src/main/res/drawable/oldtoron.png b/app/src/main/res/drawable/oldtoron.png
new file mode 100644
index 0000000..a99bec1
Binary files /dev/null and b/app/src/main/res/drawable/oldtoron.png differ
diff --git a/app/src/main/res/drawable/oldtorstarting.png b/app/src/main/res/drawable/oldtorstarting.png
new file mode 100644
index 0000000..a56844a
Binary files /dev/null and b/app/src/main/res/drawable/oldtorstarting.png differ
diff --git a/app/src/main/res/drawable/onion32.png b/app/src/main/res/drawable/onion32.png
new file mode 100644
index 0000000..7846760
Binary files /dev/null and b/app/src/main/res/drawable/onion32.png differ
diff --git a/app/src/main/res/drawable/tilebg.xml b/app/src/main/res/drawable/tilebg.xml
new file mode 100644
index 0000000..6f0d2a3
--- /dev/null
+++ b/app/src/main/res/drawable/tilebg.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/classyfabric"
+    android:tileMode="repeat" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable/toggle.xml b/app/src/main/res/drawable/toggle.xml
new file mode 100644
index 0000000..0f9a36e
--- /dev/null
+++ b/app/src/main/res/drawable/toggle.xml
@@ -0,0 +1,8 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_checked="false"
+        android:drawable="@drawable/button_off" />
+    <item
+        android:state_checked="true"
+        android:drawable="@drawable/button_on" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tor.png b/app/src/main/res/drawable/tor.png
new file mode 100644
index 0000000..0d63dd9
Binary files /dev/null and b/app/src/main/res/drawable/tor.png differ
diff --git a/app/src/main/res/drawable/tor25.png b/app/src/main/res/drawable/tor25.png
new file mode 100644
index 0000000..20b7666
Binary files /dev/null and b/app/src/main/res/drawable/tor25.png differ
diff --git a/app/src/main/res/drawable/toroff.png b/app/src/main/res/drawable/toroff.png
new file mode 100644
index 0000000..a72790b
Binary files /dev/null and b/app/src/main/res/drawable/toroff.png differ
diff --git a/app/src/main/res/drawable/toron.png b/app/src/main/res/drawable/toron.png
new file mode 100644
index 0000000..e3592b1
Binary files /dev/null and b/app/src/main/res/drawable/toron.png differ
diff --git a/app/src/main/res/drawable/torstarting.png b/app/src/main/res/drawable/torstarting.png
new file mode 100644
index 0000000..6e84a6f
Binary files /dev/null and b/app/src/main/res/drawable/torstarting.png differ
diff --git a/app/src/main/res/layout-v21/layout_notification_expanded.xml b/app/src/main/res/layout-v21/layout_notification_expanded.xml
new file mode 100644
index 0000000..179b95e
--- /dev/null
+++ b/app/src/main/res/layout-v21/layout_notification_expanded.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:internal="http://schemas.android.com/apk/prv/res/android"
+    android:id="@+id/status_bar_latest_event_content"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"    
+    android:background="#333333"
+    >
+    <ImageView android:id="@+id/icon"
+        android:layout_width="@dimen/notification_large_icon_width"
+        android:layout_height="@dimen/notification_large_icon_height"
+        android:scaleType="center"
+        />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="fill_vertical"
+        android:layout_marginStart="@dimen/notification_large_icon_width"
+        android:minHeight="@dimen/notification_large_icon_height"
+        android:orientation="vertical"
+        android:paddingEnd="8dp"
+        android:paddingTop="2dp"
+        android:paddingBottom="2dp"
+        android:gravity="top"
+        >
+        <LinearLayout
+            android:id="@+id/line1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="6dp"
+            android:layout_marginStart="8dp"
+            android:orientation="horizontal"
+            >
+            <TextView android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"
+                android:layout_weight="1"
+                android:textStyle="bold"
+ 				android:textAppearance="@style/NotificationTitle"
+                 />
+            
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/line3"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"       
+            android:layout_marginStart="8dp"                
+            >
+            <TextView android:id="@+id/text"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_gravity="center"
+                android:singleLine="true"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"
+				android:textAppearance="@style/NotificationText"                
+                />
+            <TextView android:id="@+id/info"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="0"
+                android:singleLine="true"
+                android:gravity="center"
+                android:paddingStart="8dp"
+				android:textAppearance="@style/NotificationText"
+                />
+            <ImageView android:id="@+id/right_icon"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:layout_gravity="center"
+                android:layout_weight="0"
+                android:layout_marginStart="8dp"
+                android:scaleType="centerInside"
+                android:visibility="gone"
+                />
+            <!-- 
+            <ImageButton
+		    android:id="@+id/_tor_notificationBT"
+		    android:layout_width="24dp"
+		    android:layout_height="24dp"		   
+		    android:src="@drawable/nav_refresh" />
+		     -->
+        </LinearLayout>
+         <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:orientation="horizontal"       
+          	android:background="#999999"         
+          	android:layout_marginTop="3dp"    
+          	android:layout_marginBottom="3dp"    
+          	
+            />
+        <TextView android:id="@+id/text2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="-2dp"
+            android:layout_marginBottom="-2dp"
+            android:layout_marginStart="8dp"            
+            android:fadingEdge="horizontal"        
+            />
+    </LinearLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/layout_about.xml b/app/src/main/res/layout/layout_about.xml
new file mode 100644
index 0000000..82f3079
--- /dev/null
+++ b/app/src/main/res/layout/layout_about.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+	<ScrollView android:id="@+id/aboutscrollview" 
+		android:orientation="vertical"
+		android:layout_width="fill_parent" 
+		android:layout_height="fill_parent">    
+		<LinearLayout
+		    android:orientation="vertical"
+		    android:layout_width="fill_parent"
+		    android:layout_height="fill_parent">
+		    <TextView android:text="@string/wizard_details"
+				android:layout_width="fill_parent" 
+				android:layout_height="wrap_content"		
+				android:paddingTop="15px"
+				android:paddingLeft="15px"
+				android:textStyle="bold"
+				android:textColor="#00ff00" />	
+			<TextView android:text="@string/wizard_details_msg"
+				android:layout_width="fill_parent" 
+				android:layout_height="wrap_content"
+				android:autoLink="web"
+				android:textColorLink="#ffffff"
+				android:paddingLeft="15px"		
+				android:textColor="#ffffff" />
+				
+			<TextView android:text="Version: "
+				android:layout_width="fill_parent" 
+				android:layout_height="wrap_content"
+				android:paddingTop="15px"
+				android:paddingLeft="15px"
+				android:textStyle="bold"
+				android:textColor="#00ff00" />
+			<TextView android:text="- Unknown -"
+				android:id="@+id/versionName"
+				android:layout_width="fill_parent" 
+				android:layout_height="wrap_content"
+				android:paddingLeft="15px"		
+				android:layout_gravity="center_vertical"
+				android:textColor="#ffffff" />	
+			<TextView android:text="@string/project_home"
+				android:layout_width="fill_parent" 
+				android:layout_height="wrap_content"		
+				android:paddingTop="15px"
+				android:paddingLeft="15px"
+				android:textStyle="bold"
+				android:textColor="#00ff00" />
+			<TextView android:text="@string/project_urls"
+				android:layout_width="fill_parent" 
+				android:layout_height="wrap_content"
+				android:autoLink="web"
+				android:textColorLink="#ffffff"
+				android:paddingLeft="15px"		
+				android:textColor="#ffffff" />
+			<TextView android:text="License: "
+				android:layout_width="fill_parent" 
+				android:layout_height="wrap_content"
+				android:paddingTop="15px"
+				android:paddingLeft="15px"
+				android:textStyle="bold"
+				android:textColor="#00ff00" />	
+			<TextView android:text="@string/the_tor_license"
+				android:layout_width="fill_parent" 
+				android:layout_height="wrap_content"
+				android:paddingLeft="15px"								
+				android:textColor="#ffffff" />	
+			<TextView android:text="@string/https_torproject_org"
+				android:layout_width="fill_parent" 
+				android:layout_height="wrap_content"
+				android:autoLink="web"
+				android:textColorLink="#ffffff"
+				android:paddingLeft="15px"		
+				android:textColor="#ffffff" />				
+			<TextView android:text="@string/third_party_software"
+				android:layout_width="fill_parent" 
+				android:layout_height="wrap_content"		
+				android:paddingTop="15px"
+				android:paddingLeft="15px"
+				android:textStyle="bold"
+				android:textColor="#00ff00" />	
+			<TextView android:text="@string/tor_version"
+				android:layout_width="fill_parent" 
+				android:layout_height="wrap_content"
+				android:autoLink="web"
+				android:textColorLink="#ffffff"
+				android:paddingLeft="15px"
+				android:textColor="#ffffff" />				
+			<TextView android:text="@string/libevent_version"
+				android:layout_width="fill_parent" 
+				android:layout_height="wrap_content"
+				android:autoLink="web"
+				android:textColorLink="#ffffff"
+				android:paddingLeft="15px"	
+				android:textColor="#ffffff" />	
+			<TextView android:text="@string/polipo_version"
+				android:layout_width="fill_parent" 
+				android:layout_height="wrap_content"
+				android:autoLink="web"
+				android:textColorLink="#ffffff"
+				android:paddingLeft="15px"	
+				android:textColor="#ffffff" />	
+			<TextView android:text="@string/iptables_version"
+				android:layout_width="fill_parent" 
+				android:layout_height="wrap_content"
+				android:autoLink="web"
+				android:textColorLink="#ffffff"
+				android:paddingLeft="15px"
+				android:textColor="#ffffff"/>
+			<TextView android:text="@string/openssl_version"
+				android:layout_width="fill_parent" 
+				android:layout_height="wrap_content"
+				android:autoLink="web"
+				android:textColorLink="#ffffff"
+				android:paddingLeft="15px"	
+				android:textColor="#ffffff" />						
+			</LinearLayout>
+		</ScrollView>			
+</LinearLayout>
diff --git a/app/src/main/res/layout/layout_apps.xml b/app/src/main/res/layout/layout_apps.xml
new file mode 100644
index 0000000..d3633a0
--- /dev/null
+++ b/app/src/main/res/layout/layout_apps.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:duplicateParentState="true">
+
+    <!-- 
+      <TextView android:text="Select apps to use with Tor:"
+              android:layout_width="fill_parent" 
+              android:layout_height="wrap_content"
+              android:textSize="16sp"		
+              android:padding="3px" 
+              android:layout_above="@+id/applistview"
+          />
+  -->
+
+    <ListView
+        android:id="@+id/applistview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/layout_button_filters"
+        android:layout_alignParentTop="true" >
+
+    </ListView>
+
+    <Button
+        android:id="@+id/btnsave"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
+        android:text="@string/button_close" />
+
+    <RelativeLayout
+        android:id="@+id/layout_button_filters"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/btnsave"
+        android:orientation="horizontal" >
+
+        <Button
+            android:id="@+id/button_proxy_all"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_toLeftOf="@+id/button_proxy_none"
+            android:layout_toStartOf="@+id/button_proxy_none"
+            android:text="@string/button_proxy_all" />
+
+        <Button
+            android:id="@+id/button_invert_selection"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentTop="true"
+            android:text="@string/button_invert_selection" />
+
+        <Button
+            android:id="@+id/button_proxy_none"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_toLeftOf="@+id/button_invert_selection"
+            android:layout_toStartOf="@+id/button_invert_selection"
+            android:text="@string/button_proxy_none" />
+
+    </RelativeLayout>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/layout_apps_item.xml b/app/src/main/res/layout/layout_apps_item.xml
new file mode 100644
index 0000000..9d16efd
--- /dev/null
+++ b/app/src/main/res/layout/layout_apps_item.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:stretchColumns="1">
+    <TableRow>
+    <ImageView android:id="@+id/itemicon" android:layout_width="50dip" android:layout_height="50dip"  android:padding="3dip"></ImageView>
+
+<TextView android:layout_height="wrap_content" android:id="@+id/itemtext" android:text="uid:packages"  android:textSize="18sp"  android:padding="3dip"></TextView>
+
+<CheckBox  android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/itemcheck" ></CheckBox>
+       
+    </TableRow>
+    
+</TableLayout>
+
diff --git a/app/src/main/res/layout/layout_diag.xml b/app/src/main/res/layout/layout_diag.xml
new file mode 100644
index 0000000..c19a5b1
--- /dev/null
+++ b/app/src/main/res/layout/layout_diag.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView android:id="@+id/aboutscrollview" 
+    xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent" 
+	android:layout_height="match_parent">    
+    <TextView 
+        android:id="@+id/diaglog"
+		android:layout_width="fill_parent" 
+		android:layout_height="wrap_content"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:layout_margin="9dp"
+		/>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_help.xml b/app/src/main/res/layout/layout_help.xml
new file mode 100644
index 0000000..da29a52
--- /dev/null
+++ b/app/src/main/res/layout/layout_help.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
+	<ScrollView android:id="@+id/helpscrollview" 
+		android:orientation="vertical"
+		android:layout_width="fill_parent" 
+		android:layout_height="fill_parent">    
+		<LinearLayout
+		    android:orientation="vertical"
+		    android:layout_width="fill_parent"
+		    android:layout_height="fill_parent">
+			<TextView android:text=""
+				android:layout_width="fill_parent" 
+				android:layout_height="wrap_content"
+				android:textColor="#ffffff" />				
+			</LinearLayout>
+		</ScrollView>			
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_log.xml b/app/src/main/res/layout/layout_log.xml
new file mode 100644
index 0000000..b9c7623
--- /dev/null
+++ b/app/src/main/res/layout/layout_log.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+    
+    	<RelativeLayout android:id="@+id/layoutHeaderMain"
+		android:layout_width="fill_parent"
+		android:layout_height="30dp"
+		android:layout_gravity="center_horizontal"
+		android:background="#A0909090">
+        <ImageView android:id="@+id/radioModeImage"
+ 		    android:layout_width="wrap_content"
+		    android:layout_height="wrap_content"
+			android:layout_marginTop="0px"
+			android:layout_marginRight="3px"
+			android:gravity="right"
+			android:layout_toRightOf="@+id/radioModeLabel"
+			android:layout_alignParentRight="true"
+			android:layout_alignParentTop="true"
+			android:src="@drawable/tor25"
+			/>
+		<TextView android:id="@+id/radioModeText"
+ 		    android:layout_width="wrap_content"
+		    android:layout_height="wrap_content"           
+            android:text="@string/powered_by"
+			android:layout_marginTop="9px"
+			android:layout_marginRight="0px"
+			android:gravity="right"
+			android:layout_toLeftOf="@+id/radioModeImage"
+            android:textColor="#333333" />
+	</RelativeLayout>
+	
+     <ScrollView  android:orientation="vertical"
+      android:layout_height="wrap_content"
+         android:layout_width="fill_parent"  android:id="@+id/logScrollView"
+        >
+         
+         <TextView android:id="@+id/messageLog"
+         android:layout_height="wrap_content"
+         android:layout_width="fill_parent"
+         android:layout_x="2px"
+		 android:layout_y="2px"
+         android:textSize="14px"
+         android:background="#A0222222"
+         />	
+        
+	</ScrollView>
+     	
+     </LinearLayout>
+            
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml
new file mode 100644
index 0000000..4a041c3
--- /dev/null
+++ b/app/src/main/res/layout/layout_main.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout android:gravity="center_vertical|center_horizontal"
+     xmlns:android="http://schemas.android.com/apk/res/android"
+     android:orientation="vertical" android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      
+      >
+    
+     <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/actionBarSize" />
+    <android.support.v4.widget.DrawerLayout
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+    
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:id="@+id/content_frame"
+     >
+        
+    <LinearLayout android:gravity="center_vertical|center_horizontal"
+     android:orientation="vertical" android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      
+      >
+      
+        <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    
+     >
+        
+    		
+    <!-- 
+	<TextView android:id="@+id/lblStatus"
+		android:text="status status status"
+		android:gravity="center_horizontal"
+		android:textSize="20sp"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginBottom="10dp"
+		android:layout_marginTop="10dp"
+		android:layout_marginLeft="40dp"
+		android:layout_marginRight="40dp"
+		android:textColor="#ffffff"
+		android:maxLines="1"
+		android:fontFamily="sans-serif-light"	
+		 />
+		     -->
+		     
+	    <RelativeLayout 
+		     android:id="@+id/rowTrafficDown" 
+		     android:layout_width="match_parent"
+		      android:layout_height="wrap_content"
+		       android:orientation="horizontal"
+		       android:paddingLeft="3sp"
+		       android:paddingRight="3sp"
+		       
+		      >
+	    <TextView
+	    	android:id="@+id/trafficLabelDown"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			 android:layout_alignParentLeft="true"
+			android:textSize="15sp"
+			android:text="@string/main_layout_download"
+			android:gravity="center_vertical"
+			android:fontFamily="sans-serif-light" />
+	    <TextView
+			android:id="@+id/trafficLabelUp"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			 android:layout_alignParentRight="true"
+			android:text="@string/main_layout_upload"
+			android:textSize="15sp"
+			android:gravity="center_vertical"
+			android:fontFamily="sans-serif-light" />
+		
+		</RelativeLayout>
+		 <RelativeLayout 
+		     android:id="@+id/rowTrafficUp"
+		     android:layout_width="fill_parent"
+		      android:layout_height="wrap_content"
+		     	  android:paddingLeft="3sp"
+		       android:paddingRight="3sp"
+		       android:paddingBottom="3sp"
+		     
+		      >
+		<TextView
+			android:id="@+id/trafficDown"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			 android:layout_alignParentLeft="true"
+			android:textSize="15sp"
+			android:gravity="center_vertical"
+			android:fontFamily="sans-serif-light"
+			 />
+		
+		<TextView
+			android:id="@+id/trafficUp"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			 android:layout_alignParentRight="true"
+			android:textSize="15sp"
+			android:gravity="center_vertical"
+			android:fontFamily="sans-serif-light"
+			 />
+		</RelativeLayout>
+		    </LinearLayout>
+		 
+        
+       <ProgressBar
+   android:id="@+id/pbConnecting"
+   style="?android:attr/progressBarStyleLarge"
+   android:layout_width="wrap_content"
+   android:layout_height="wrap_content"
+   		android:layout_marginTop="60dp"
+   			android:visibility="gone"	  
+   		
+android:layout_gravity="center_horizontal|center_vertical"/>
+       
+	<LinearLayout
+	    	android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/frameMain"
+		android:visibility="visible"	
+		 android:orientation="vertical"   
+		android:layout_gravity="center_horizontal|center_vertical"
+		 >
+		       <org.torproject.android.ui.ImageProgressView
+				android:id="@+id/imgStatus"
+				android:layout_width="match_parent"
+				android:layout_height="0dp"		
+						android:layout_weight=".8"
+				
+				android:padding="0dp"
+				android:layout_margin="0dp"
+				android:src="@drawable/toroff" />
+		       
+		       	<TextView
+					android:id="@+id/lblStatus"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:textSize="14sp"
+					android:gravity="center_horizontal"
+					android:fontFamily="sans-serif-light"
+					android:text=""
+					android:lines="2"
+					android:maxLines="2"				
+					android:layout_gravity="center_horizontal"
+					android:layout_margin="0dp"
+					android:layout_marginLeft="5dp"			
+					android:layout_marginRight="5dp"
+					 />
+		
+		<LinearLayout android:gravity="center_horizontal"
+	     android:orientation="horizontal" android:layout_width="match_parent"
+	      android:layout_height="wrap_content"
+	      
+			android:layout_gravity="bottom"
+	      >
+	
+			<Button
+			    android:id="@+id/btnBrowser"
+			    android:layout_width="wrap_content"
+			    android:layout_height="wrap_content"
+			    android:text="@string/menu_verify_browser"			    
+          		android:layout_marginTop="3dp"
+          		android:layout_marginBottom="3dp"
+          		 android:ellipsize="end"
+          android:singleLine="true"
+			     />
+	
+			
+			<ToggleButton
+			    android:id="@+id/btnVPN"
+			    android:layout_width="wrap_content"
+			    android:layout_height="wrap_content"
+			    android:textOff="@string/menu_vpn"
+			    android:textOn="@string/menu_vpn"	
+          android:layout_margin="3dp"
+          android:ellipsize="end"
+          android:singleLine="true"
+			    />
+			
+			
+			<ToggleButton
+			    android:id="@+id/btnBridges"
+			    android:layout_width="wrap_content"
+			    android:layout_height="wrap_content"
+			    android:textOff="@string/bridges"
+			    android:textOn="@string/bridges"	
+          		    android:layout_marginTop="3dp"
+          		android:layout_marginBottom="3dp"
+          		     android:ellipsize="end"
+          android:singleLine="true"
+			    />
+
+			<Spinner
+			    android:id="@+id/spinnerCountry"
+			    android:layout_width="wrap_content"
+			    android:layout_height="wrap_content"
+			    android:layout_weight="1" />
+			 
+		    </LinearLayout>
+		     </LinearLayout>
+	
+	    </LinearLayout>
+	    </LinearLayout>
+	    
+	 <LinearLayout
+    android:layout_width="320dp"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:id="@+id/left_drawer"
+    android:layout_gravity="start"            
+    android:background="#333333"
+     >
+    	<TextView
+			android:id="@+id/orbotLog"
+			android:textSize="12sp"
+			android:gravity="left"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_alignParentLeft="true"
+			android:layout_marginTop="10dp"
+			android:textIsSelectable="true"
+			android:fontFamily="monospace"
+			 />
+    </LinearLayout>
+	
+	</android.support.v4.widget.DrawerLayout>
+	
+</LinearLayout>
+
+
diff --git a/app/src/main/res/layout/layout_notification_expanded.xml b/app/src/main/res/layout/layout_notification_expanded.xml
new file mode 100644
index 0000000..c2a9c9e
--- /dev/null
+++ b/app/src/main/res/layout/layout_notification_expanded.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:internal="http://schemas.android.com/apk/prv/res/android"
+    android:id="@+id/status_bar_latest_event_content"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"    
+    >
+    <ImageView android:id="@+id/icon"
+        android:layout_width="@dimen/notification_large_icon_width"
+        android:layout_height="@dimen/notification_large_icon_height"
+        android:scaleType="center"
+        />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="fill_vertical"
+        android:layout_marginStart="@dimen/notification_large_icon_width"
+        android:minHeight="@dimen/notification_large_icon_height"
+        android:orientation="vertical"
+        android:paddingEnd="8dp"
+        android:paddingTop="2dp"
+        android:paddingBottom="2dp"
+        android:gravity="top"
+        >
+        <LinearLayout
+            android:id="@+id/line1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="6dp"
+            android:layout_marginStart="8dp"
+            android:orientation="horizontal"
+            >
+            <TextView android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"
+                android:layout_weight="1"
+                android:textStyle="bold"
+ 				android:textAppearance="@style/NotificationTitle"
+                 />
+            
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/line3"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"       
+            android:layout_marginStart="8dp"                
+            >
+            <TextView android:id="@+id/text"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_gravity="center"
+                android:singleLine="true"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"
+				android:textAppearance="@style/NotificationText"                
+                />
+            <TextView android:id="@+id/info"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="0"
+                android:singleLine="true"
+                android:gravity="center"
+                android:paddingStart="8dp"
+				android:textAppearance="@style/NotificationText"
+                />
+            <ImageView android:id="@+id/right_icon"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:layout_gravity="center"
+                android:layout_weight="0"
+                android:layout_marginStart="8dp"
+                android:scaleType="centerInside"
+                android:visibility="gone"
+                />
+            <!-- 
+            <ImageButton
+		    android:id="@+id/_tor_notificationBT"
+		    android:layout_width="24dp"
+		    android:layout_height="24dp"		   
+		    android:src="@drawable/nav_refresh" />
+		     -->
+        </LinearLayout>
+         <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:orientation="horizontal"       
+          	android:background="#999999"         
+          	android:layout_marginTop="3dp"    
+          	android:layout_marginBottom="3dp"    
+          	
+            />
+        <TextView android:id="@+id/text2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="-2dp"
+            android:layout_marginBottom="-2dp"
+            android:layout_marginStart="8dp"            
+            android:fadingEdge="horizontal"        
+            />
+    </LinearLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/layout_promo_apps.xml b/app/src/main/res/layout/layout_promo_apps.xml
new file mode 100644
index 0000000..00c1f6f
--- /dev/null
+++ b/app/src/main/res/layout/layout_promo_apps.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+            
+   
+<TableLayout  android:id="@+id/TableLayout01" android:stretchColumns="*" android:layout_height="fill_parent" android:layout_width="wrap_content">
+
+<TableRow android:layout_margin="10dip"   android:id="@+id/TableRow01" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent">
+
+
+	<ScrollView android:id="@+id/helpscrollview" 
+		android:orientation="vertical"
+		android:layout_width="fill_parent" 
+		android:layout_height="fill_parent"
+		 android:layout_span="3">    
+
+<LinearLayout
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="#575757"
+    android:orientation="vertical"
+    android:paddingRight="20dip" >
+
+    <TextView
+        android:id="@+id/WizardTextBody1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.31"
+        android:padding="20dip"
+        android:text="@string/wizard_tips_msg"
+        android:textColor="#ffffff"
+        android:textSize="8pt" >
+    </TextView>
+    
+    <Button
+        android:id="@+id/WizardRootButtonInstallOrweb"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left"
+        android:layout_marginTop="10px"
+        android:drawableLeft="@drawable/icon_orfox"
+        android:text="@string/wizard_tips_orweb" />
+
+    <Button
+        android:id="@+id/WizardRootButtonInstallGibberbot"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left"
+        android:layout_marginTop="10px"
+        android:drawableLeft="@drawable/ic_chatsecure"
+        android:text="@string/wizard_tips_gibberbot" />
+
+    
+    <Button
+        android:id="@+id/WizardRootButtonInstallDuckgo"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left"
+        android:layout_marginTop="10px"
+        android:drawableLeft="@drawable/ic_duckduckgo"
+        android:text="@string/wizard_tips_duckgo" />
+    
+    <Button
+        android:id="@+id/WizardRootButtonInstallTwitter"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left"
+        android:layout_marginTop="10px"
+        android:drawableLeft="@drawable/ic_twitter"
+        android:text="@string/wizard_tips_twitter" />
+    
+    <Button
+        android:id="@+id/WizardRootButtonInstallStoryMaker"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left"
+        android:layout_marginTop="10px"
+        android:drawableLeft="@drawable/icon_story_maker"
+        android:text="@string/wizard_tips_story_maker" />
+    
+         <Button
+        android:id="@+id/WizardRootButtonInstallMartus"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left"
+        android:layout_marginTop="10px"
+        android:drawableLeft="@drawable/icon_martus"
+        android:text="@string/wizard_tips_martus" />
+         
+     <Button
+        android:id="@+id/WizardRootButtonGooglePlay"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left"
+        android:layout_marginTop="10px"
+        android:drawableLeft="@drawable/ic_play"
+        android:text="@string/wizard_tips_fdroid_org" />
+    
+
+</LinearLayout>
+
+		</ScrollView>
+		
+</TableRow>
+<TableRow android:background="#000000" android:layout_marginTop="10dip" android:paddingTop="10dip" android:id="@+id/TableRow02" android:textColor="#00ff00" android:layout_width="fill_parent" android:layout_height="30px">
+	   <!-- 	<Button android:text="@string/btn_back" android:id="@+id/btnWizard1" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button> -->
+    	<Button android:text="@string/btn_okay" android:id="@+id/btnWizard2"  android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button>	    
+</TableRow>			
+</TableLayout>
+</LinearLayout>
+
+
diff --git a/app/src/main/res/layout/layout_settings.xml b/app/src/main/res/layout/layout_settings.xml
new file mode 100644
index 0000000..f9b6971
--- /dev/null
+++ b/app/src/main/res/layout/layout_settings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+    
+     
+        <ScrollView  android:layout_height="380px"
+            android:layout_width="fill_parent">
+            
+            <EditText android:id="@+id/textSettings"
+            android:layout_height="fill_parent"
+            android:layout_width="fill_parent"
+            android:layout_weight="1.0"
+            android:singleLine="false"
+            android:textSize="11px"
+            />	
+            
+        </ScrollView>
+            
+          <Button android:id="@+id/btnSettingsSave" 
+            android:layout_width="fill_parent" 
+            android:layout_height="40px" 
+             android:text="@string/btn_save_settings"        
+             android:layout_margin="0sp"
+      
+             
+            />
+</LinearLayout>
diff --git a/app/src/main/res/layout/layout_vpn_setup.xml b/app/src/main/res/layout/layout_vpn_setup.xml
new file mode 100644
index 0000000..5d2c6dc
--- /dev/null
+++ b/app/src/main/res/layout/layout_vpn_setup.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ScrollView android:id="@+id/aboutscrollview" 
+    xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent" 
+	android:layout_height="fill_parent">    
+	<LinearLayout
+	    android:orientation="vertical"
+	    android:layout_width="fill_parent"
+	    android:layout_height="fill_parent">
+	    <TextView android:text="Apps Mode"
+			android:layout_width="fill_parent" 
+			android:layout_height="wrap_content"		
+			android:paddingTop="15px"
+			android:paddingLeft="15px"
+			android:textStyle="bold"
+			android:textColor="#00ff00" />	
+			<TextView android:text=""
+			android:layout_width="fill_parent" 
+			android:layout_height="wrap_content"
+			android:autoLink="web"
+			android:textColorLink="#ffffff"
+			android:paddingLeft="15px"		
+			android:textColor="#ffffff" />
+			
+			 <Button android:id="@+id/btnActivateVPN" 
+           android:layout_width="wrap_content" 
+           android:layout_height="wrap_content" 
+            android:text="Activate"        
+            android:layout_margin="0sp"/>
+			
+		</LinearLayout>
+	</ScrollView>
diff --git a/app/src/main/res/layout/scrollingtext_buttons_view.xml b/app/src/main/res/layout/scrollingtext_buttons_view.xml
new file mode 100644
index 0000000..beea00a
--- /dev/null
+++ b/app/src/main/res/layout/scrollingtext_buttons_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+   >
+            
+
+       
+<TableLayout  android:id="@+id/TableLayout01" android:stretchColumns="*" android:layout_height="fill_parent" android:layout_width="wrap_content" >
+
+<TableRow android:id="@+id/TableRow01"  android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_margin="10dip">
+
+
+	<ScrollView android:id="@+id/helpscrollview" 
+		android:orientation="vertical"
+		android:layout_width="fill_parent" 
+		android:layout_height="fill_parent"
+		 android:layout_span="3">    
+
+			<TextView  android:background="#575757" android:text="this is sample text this is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample text"  android:textColor="#ffffff"  android:id="@+id/WizardTextBody" android:textSize="8pt" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="20dip"></TextView>
+
+		</ScrollView>
+		
+</TableRow>
+<TableRow  android:background="#000000" android:id="@+id/TableRow01" android:textColor="#00ff00" android:layout_width="fill_parent" android:layout_height="30px" android:layout_marginTop="10dip" android:paddingTop="10dip">
+	   	<Button android:text="@string/btn_back" android:id="@+id/btnWizard1" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button>
+    	<Button android:text="@string/btn_next" android:id="@+id/btnWizard2"  android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button>	    
+</TableRow>			
+</TableLayout>
+</LinearLayout>
+
+
diff --git a/app/src/main/res/menu/orbot_main.xml b/app/src/main/res/menu/orbot_main.xml
new file mode 100644
index 0000000..9f97a81
--- /dev/null
+++ b/app/src/main/res/menu/orbot_main.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2008 Esmertec AG.
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:yourapp="http://schemas.android.com/apk/res-auto"
+    >
+
+ <item android:id="@+id/menu_settings"
+        android:title="@string/menu_settings"
+         android:icon="@drawable/ic_action_settings"
+         yourapp:showAsAction="always"
+         />
+
+ <item
+        android:title="@string/menu_qr"
+         android:showAsAction="never"
+         >
+  <menu>
+  <item android:id="@+id/menu_scan"
+        android:title="@string/menu_scan"
+         android:showAsAction="never"
+         />
+  
+  <item android:id="@+id/menu_share_bridge"
+        android:title="@string/menu_share_bridge"
+         android:showAsAction="never"
+         />
+  </menu>
+ </item>
+ 
+        
+ 
+  <item android:id="@+id/menu_promo_apps"
+        android:title="@string/menu_promo_apps"
+         android:icon="@drawable/ic_menu_goto"
+                  android:showAsAction="never"
+         
+         />
+ 
+  <item android:id="@+id/menu_about"
+        android:title="@string/menu_about"
+         android:icon="@drawable/ic_menu_about"
+                  android:showAsAction="never"
+         
+         />
+ 
+  <item android:id="@+id/menu_exit"
+        android:title="@string/menu_exit"
+         android:icon="@drawable/ic_menu_exit"
+                  android:showAsAction="never"
+         
+         />
+ 
+</menu>
diff --git a/app/src/main/res/menu/share_menu.xml b/app/src/main/res/menu/share_menu.xml
new file mode 100644
index 0000000..2352da0
--- /dev/null
+++ b/app/src/main/res/menu/share_menu.xml
@@ -0,0 +1,7 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+            android:id="@+id/menu_item_share"
+            android:showAsAction="always"
+            android:title="Share Log" />
+   
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-ach/strings.xml b/app/src/main/res/values-ach/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/app/src/main/res/values-ach/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
new file mode 100644
index 0000000..0b2a1f6
--- /dev/null
+++ b/app/src/main/res/values-ar/strings.xml
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">اوربوت</string>
+  <string name="app_description">اوربوت هو تطبيق الوكيل-البروكسي الحر الذي يمكّن تطبيقات أخرى لاستخدام الإنترنت بأمان أكثر . يُستخدم اوربوت تور لتشفير تحركات مرورك على الإنترنت ، ثم يخفيك ويجعلك وهمي من خلال سلسلة من أجهزة الكمبيوتر في جميع أنحاء العالم . تور هو تطبيق حر وشبكة مفتوحة والتي تساعدك على حماية نفسك من مراقبة الشبكات التي تهدد الحرية الشخصية والخصوصية ، والأنشطة التجارية السرية والعلاقات ، وأمن الدولة والحكومات القمعيّة والتي تستخدم مايعرف باسم تحليل حركة مرور البيانات .</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">فعل و اوقف تور</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">جاري تشغيل اوربوت...</string>
+  <string name="status_activated">متصل بشبكة تور</string>
+  <string name="status_disabled">تم إيقاف اوربوت</string>
+  <string name="status_shutting_down">جاري ايقاف خدمة تور</string>
+  <string name="tor_process_starting">جاري تشغيل تور...</string>
+  <string name="tor_process_complete">كامل.</string>
+  <string name="tor_process_waiting">انتظار.</string>
+  <string name="not_anonymous_yet">تحذير: حركة مرورك ليست خفية حتي الآن! من فضلك قم بتكوين التطبيقات الخاصة بك لإستخدام بروكسي HTTP 127.0.0.1:8118 أو SOCK4A أو SOKS5 127.0.0.1:9050</string>
+  <string name="menu_home">القائمة الرئيسية</string>
+  <string name="menu_browse">تصفّح</string>
+  <string name="menu_settings">إعدادات</string>
+  <string name="menu_log">السجل</string>
+  <string name="menu_info">مساعدة</string>
+  <string name="menu_apps">في بي ان شبكة وهمية خاصة</string>
+  <string name="menu_start">بدء</string>
+  <string name="menu_stop">توقف</string>
+  <string name="menu_about">حول</string>
+  <string name="menu_promo_apps">حمل التطبيق ...</string>
+  <string name="main_layout_download">تحميل</string>
+  <string name="main_layout_upload">رفع</string>
+  <string name="button_help">مساعدة</string>
+  <string name="button_close">إغلاق</string>
+  <string name="button_about">حول</string>
+  <string name="button_clear_log">مسح السجل</string>
+  <string name="menu_verify">تحقق</string>
+  <string name="menu_exit">خروج</string>
+  <string name="menu_scan">فحص QR الجسر</string>
+  <string name="menu_share_bridge">مشاركة QR الجسر</string>
+  <string name="press_to_start">- اضغط لفترة طويلة للبدء -</string>
+  <string name="pref_trans_proxy_group">بروكسي ضمني (يتطلب اذن حساب رووت)</string>
+  <string name="pref_trans_proxy_title">بروكسي ضمني</string>
+  <string name="pref_trans_proxy_summary">عملية توريفاي أوتوماتيكية للتطبيقات</string>
+  <string name="pref_transparent_all_title">استخدم تور مع جميع التطبيقات</string>
+  <string name="pref_transparent_all_summary">مرر كل بيانات المرور الخاصة بالتطبيقات عبر تور</string>
+  <string name="pref_transparent_port_fallback_title">تراجع منفذ البروكسي</string>
+  <string name="pref_transparent_port_fallback_summary">تحذير: تتحايل علي المنافذ الشائعة  (80, 443, إلى آخره) *استخدم فقط* إذا كان وضع \'كل\' أو \'التطبيق\' لا يعمل.</string>
+  <string name="pref_transparent_port_title">قائمة المنافذ</string>
+  <string name="pref_transparent_port_summary">قائمة بجميع المنافذ إلي البروكسي. *استخدم فقط* إذا كان وضع \'كل\' أو \'التطبيق\' لا يعمل.</string>
+  <string name="pref_transparent_port_dialog">ادخل المناقذ للبروكسي</string>
+  <string name="pref_has_root">اطلب إذن رووت</string>
+  <string name="pref_has_root_summary">اطلب إذن رووت لتفعيل البروكسي الضمني</string>
+  <string name="status_install_success">تم تثبيت تور بنجاح!</string>
+  <string name="status_install_fail">غير قادر على تثبيت ملفات تور. يرجى مراجعة السجل وإعلامنا على البريد الإلكتروني tor-assistants at torproject.org</string>
+  <string name="title_error">خطأ في التطبيق</string>
+  <string name="wizard_title">اوربوت</string>
+  <string name="wizard_btn_tell_me_more">عن اوربوت</string>
+  <string name="btn_next">التالي</string>
+  <string name="btn_back">رجوع</string>
+  <string name="btn_finish">إنهاء</string>
+  <string name="btn_okay">موافق</string>
+  <string name="btn_cancel">إلغاء</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">بعض التفاصيل عن اوربوت</string>
+  <string name="wizard_details_msg">اوربوت تطبيق مفتوح المصدر يحتويه تور، \"ليب افنت\" و \"بوليبو\". 
+وهو يوفر الوكيل-البروكسي المحلي HTTP (8118) ووكيل SOCKS (9050) في شبكة تور. 
+ اوربوت أيضا قادر على الوصول لجذور الجهاز ، لإرسال كل تحركات الإنترنت من خلاله.</string>
+  <string name="wizard_permissions_root">تم منح الإذن</string>
+  <string name="wizard_permissions_stock">أذونات اوربوت</string>
+  <string name="wizard_premissions_msg_root">ممتاز! لقد وجدنا بأنه لديك صلاحية حساب رووت لتمكين اوربوت. سوف نستخدم هذه السلطة بحكمة.</string>
+  <string name="wizard_permissions_msg_stock">رغم أنه ليس ضروريا، يمكن ان يصبح أوربوت أداة قوية إذا كان لدى جهازك صلاحية حساب رووت. استخدم الزر بالأسفل لمنح اوربوت قوة أكبر!</string>
+  <string name="wizard_permissions_no_root">إذا لم يكن لديك صلاحية حساب رووت أو ليست لديك أدنى فكرة عما نتحدث عنه، تأكد فقط من استخدام تطبيقات تعمل مع اوربوت.</string>
+  <string name="wizard_permissions_consent">أفهم ذلك وأود أن أستمر بدون صلاحيات حساب رووت</string>
+  <string name="wizard_permission_enable_root">امنح اوربوت صلاحية حساب رووت</string>
+  <string name="wizard_configure">تكوين توريفاي</string>
+  <string name="wizard_configure_msg">اوربوت يعطيك الخيار لتوجيه جميع حركات مرور التطبيقات عبر تور او لإختيار التطبيقات بشكل فردي.</string>
+  <string name="wizard_configure_all">مرر جميع التطبيقات عبر تور</string>
+  <string name="wizard_configure_select_apps">اختر التطبيقات الفردية لتور</string>
+  <string name="wizard_tips_tricks">تطبيقات مهيئة لاوربوت</string>
+  <string name="wizard_tips_msg">التطبيقات التالية تم تطويرها حتي تعمل مع اوربوت. اضغط علي ما تريد تثبيتة علي جهازك الأن, أو يمكنك ان تجدهم لاحقاً علي جوجل بلاي, أو علي موقعنا GuardianProject.info أو من خلال F-Droid.org.</string>
+  <string name="wizard_tips_otrchat">الدردشة الآمنة - تأمين الرسائل الفورية لمستخدمي الاندرويد</string>
+  <string name="wizard_tips_proxy">إعدادات البروكسي - تعلم كيفية تكوين التطبيقات لتعمل مع اوربوت</string>
+  <string name="wizard_tips_duckgo">تطبيق محرك البحث DuckDuckGo</string>
+  <string name="wizard_tips_twitter">اضبط البروكسي الخاص بتويتر إلي مستضيف \"localhost\" و المنفذ إلي 8118</string>
+  <string name="wizard_tips_story_maker">صانع القصة - اصنع قصة واتركها لأمان تور !</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_proxy_help_msg">إذا كان تطبيق الاندرويد الذي تستخدمه يدعم استخدام وكيل - بروكسيHTTP أو SOCKS  إذاً يمكنك تكوينه للاتصال باوربوت واستخدام تور.  إعدادات المضيف 127.0.0.1 أو \"مضيف\". ل HTTP، إعداد المنفذ هو 8118. لSOCKS، الوكيل هو 9050. يجب عليك استخدام SOCKS4A أو SOCKS5 إذا أمكن \ N \ N \ N \ N يمكنك معرفة المزيد حول إنشاء الوكلاء على الروبوت من خلال التعليمات على: 
+HTTP: / /tinyurl.com/proxyandroid\n</string>
+  <string name="wizard_final">اوربوت جاهز للاستخدام!</string>
+  <string name="wizard_final_msg">الملايين من الناس في جميع أنحاء العالم تستخدم تور لمجموعة واسعة من الأسباب . الصحفيين والمدونين , المدافعين عن حقوق الإنسان ، وضباط تنفيذ القانون ، والجنود ، والشركات والمواطنين من الأنظمة القمعية ، وايضاً المواطنين العاديين ... والآن هل أنت جاهز ، هيا بنا !</string>
+  <string name="wizard_exit_at_first_screen_toast">يرجى تكوين اوربوت واعداده لتستطيع البدء بإستخدامه !</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">لديك اتصال ناجح بشبكة تور - ولكن هذا لا يعني أن جهازك آمن . يمكنك استخدام زر \"متصفح\" لاختبار اتصالك .
+  زرنا على https://guardianproject.info/apps/orbot أو ارسل بريد الكتروني الى help at guardianproject.info  لمعرفة المزيد.</string>
+  <string name="tor_check">سيؤدي هذا إلى فتح المتصفح الخاص بك لزيارة عنوان https://check.torproject.org من اجل التحقق إذا كان تكوين اوربوت يعمل بشكل صحيح ام لا وبأنك متصل بتور.</string>
+  <string name="pref_hs_group">استضافة الخدمة المخفية</string>
+  <string name="pref_general_group">عام</string>
+  <string name="pref_start_boot_title">شغل اوربوت عند فتح الجهاز</string>
+  <string name="pref_start_boot_summary">فعل اوربوت و اتصل بتور تلقائياً عندما يبدء جهاز الأندرويد الخاص بك بالعمل</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">اوربت يجعل تور ممكناً على نظام الأندرويد. يساعدك تور في الدفاع ضد عملية ترشيح المحتويات, تحليل مسارات المرور, ومراقبة الشبكة والتي تهدد خصوصيتك, المعلومات السرية والعلاقات الشخصية. هذه الأداة ستساعدك من تهيئة اوربت مع تور على جهازك</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">تحذير</string>
+  <string name="wizard_warning_msg">لن يقوم اوربت بأخفاء هوية مسارك بشكل اوتوماتيكي او آلي بمجرد تنصيبه. بل يجب عليك ان تقوم بتهيئته مع جهازك بالأضافة الى تهيئة تطبيقات اخرى لتستطيع استخدام تور بنجاح.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">الصلاحيات</string>
+  <string name="wizard_permissions_root_msg1">يمكنك اعطاء اوربوت صلاحيات حساب رووت لتشغيل المميزات المتقدمة مثل البروكسي الضمني.</string>
+  <string name="wizard_permissions_root_msg2">إذا كنت لا تريد أن تفعل هذا, الرجاء إستخدام برامج معدة للعمل مع اوربوت</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title"> برامج معدة للعمل مع اوربوت</string>
+  <string name="wizard_tips_gibberbot">جات سكيور: هو تطبيق للدردشة بشكل آمن مع تشفير عالي جداً</string>
+  <string name="wizard_tips_orweb">اورفوكس: متصفح ذو خصوصية متقدمة يعمل ظمن او من خلال تور</string>
+  <string name="wizard_tips_play">يمكنك الحصول علي جميع تطبيقات مشروع الجاردين على جوجل بلاي</string>
+  <string name="wizard_tips_fdroid">اكتشف كل تطبيقات مشروع الجارديان على اف-درويد</string>
+  <string name="wizard_tips_fdroid_org">اكتشف كل تطبيقات مشروع الجارديان على https://f-droid.org </string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">بروكسي ضمني</string>
+  <string name="wizard_transproxy_msg">هذه ستسمح للبرامج بالاتصال بشبكة تور تلقائياً دون اعداد مسبق.</string>
+  <string name="wizard_transproxy_hint">(اختر هذا المربع إذا كنت لا تعلم عما نتحدث)</string>
+  <string name="wizard_transproxy_none">لا شيء</string>
+  <string name="pref_transparent_tethering_title">الربط بتور</string>
+  <string name="pref_transparent_tethering_summary">اسمح بالبروكسي الضمني للواي فاي و اجهزة اليو اس بي  (تحتاج لإعادة تشغيل الجهاز)</string>
+  <string name="button_grant_superuser">اطلب صلاحيات حساب رووت</string>
+  <string name="pref_select_apps">حدد البرامج</string>
+  <string name="pref_select_apps_summary">اختر البرامح التي تريد تمريرها إلي شبكة تور</string>
+  <string name="pref_node_configuration">تكوين نقطة الاتصال</string>
+  <string name="pref_node_configuration_summary">هذه الإعدادات متقدمة و قد تقلل من حماية هويتك</string>
+  <string name="pref_entrance_node">نقاط الدخول</string>
+  <string name="pref_entrance_node_summary">بصمات، اسماء مستعارة، البلدان و العناوين لأول نقطة اتصال</string>
+  <string name="pref_entrance_node_dialog">أدخل نقاط الدخول</string>
+  <string name="pref_allow_background_starts_title">إسمح للخلفية بألبدأ</string>
+  <string name="pref_allow_background_starts_summary">إسمح لأي تطبيق بأن يُخبِر اوربت بأن يفعل تور مع الخدمات المرتبطة به</string>
+  <string name="button_proxy_all">اُخوِّل الكل</string>
+  <string name="button_proxy_none">بدون تخويل</string>
+  <string name="button_invert_selection">اعكس المُحدد</string>
+  <string name="pref_proxy_title">بروكسي الشبكة الصادرة (اختياري)</string>
+  <string name="pref_proxy_type_title">نوع البروكسي الصادر</string>
+  <string name="pref_proxy_type_summary">البروتوكول المستخدم لخادم البروكسي: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">أدخل نوع البروكسي</string>
+  <string name="pref_proxy_host_title">عنوان البروكسي الصادر</string>
+  <string name="pref_proxy_host_summary">اسم مضيف خادم البروكسي</string>
+  <string name="pref_proxy_host_dialog">أدخل مضيف البروكسي</string>
+  <string name="pref_proxy_port_title">منفذ البروكسي الصادر</string>
+  <string name="pref_proxy_port_summary">منفذ خادم البروكسي</string>
+  <string name="pref_proxy_port_dialog">أدخل منفذ البروكسي</string>
+  <string name="pref_proxy_username_title">اسم مستخدم البروكسي الصادر</string>
+  <string name="pref_proxy_username_summary">اسم مستخدم البروكسي (اختياري)</string>
+  <string name="pref_proxy_username_dialog">ادخل اسم مستخدم البروكسي</string>
+  <string name="pref_proxy_password_title">كلمة مرور بروكسي الشبكة الصادرة</string>
+  <string name="pref_proxy_password_summary">كلمة مرور البروكسي (اختياري)</string>
+  <string name="pref_proxy_password_dialog">ادخل كلمة مرور البروكسي</string>
+  <string name="status">الحالة</string>
+  <string name="setting_up_full_transparent_proxying_">يتم إعداد بروكسي ضمني كامل...</string>
+  <string name="setting_up_app_based_transparent_proxying_">يتم إعداد البروكسي الضمني حسب البرامج...</string>
+  <string name="transparent_proxying_enabled">البروكسي الضمني مُفعل</string>
+  <string name="transproxy_enabled_for_tethering_">البروكسي الضمني جاهز للربط!</string>
+  <string name="warning_error_starting_transparent_proxying_">تحذير: حصل خطأ بتشغيل البروكسي الضمني!</string>
+  <string name="transproxy_rules_cleared">تم مسح قواعد البروكسي الضمني</string>
+  <string name="couldn_t_start_tor_process_">لقد تعذر بدء تشغيل تور:</string>
+  <string name="privoxy_is_running_on_port_">بوليبو يعمل على  المحمول </string>
+  <string name="setting_up_port_based_transparent_proxying_">يتم إعداد البروكسي الضمني حسب المنفذ...</string>
+  <string name="bridge_error">خطأ بالجسر</string>
+  <string name="bridge_requires_ip">حتي تستطيع إستخدم ميزة الجسور، يجب عليك ادخال عنوان انترنت لجسر واحد علي الأقل.</string>
+  <string name="send_email_for_bridges">أرسل بريد إلكتروني إلى bridges at torproject.org مع عبارة \"get bridges\" بداخل الرسالة من حساب بريد gmail.</string>
+  <string name="error">خطأ</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">إعدادات العنوان القابل للاتصال لديك تسببت بخطأ!</string>
+  <string name="your_relay_settings_caused_an_exception_">إعدادات المرحلات لديك تسببت بخطأ!</string>
+  <string name="exit_nodes">نقاط الخروج</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">البصمات، الاسماء المستعارة، البلدان و العناوين لآخر نقطة اتصال</string>
+  <string name="enter_exit_nodes">أدخل نقاط الخروج</string>
+  <string name="exclude_nodes">استثني النقاط</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">بصمات، الأسماء المستعارة، البلدان و العناوين ليتم استثنائها</string>
+  <string name="enter_exclude_nodes">أدخل النقاط المستثناه</string>
+  <string name="strict_nodes">النقاط المشددة</string>
+  <string name="use_only_these_specified_nodes">استخدم فقط تلك النقاط المحددة</string>
+  <string name="bridges">الجسور</string>
+  <string name="use_bridges">استخدم الجسور</string>
+  <string name="bridges_obfuscated">الجسور الغامضة</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">اسمح باستخدام نقاط دخول بديلة إلي شبكة تور</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">فعل هذا الخيار إذا كانت الجسور المحددة جسور غامضة</string>
+  <string name="ip_address_and_port_of_bridges">عنوان الانترنت و المنفذ للجسور</string>
+  <string name="enter_bridge_addresses">أدخل عناوين الجسور</string>
+  <string name="relays">المرحلات</string>
+  <string name="relaying">يرحل</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">اسمح لجهازك ليكون مرحل غير نهائي</string>
+  <string name="relay_port">منفذ المرحل</string>
+  <string name="listening_port_for_your_tor_relay">المنفذ المصغي لمُرحل تور الخاص بك</string>
+  <string name="enter_or_port">أدخل منفذ OR</string>
+  <string name="relay_nickname">الاسم المستعار للمُرحل</string>
+  <string name="the_nickname_for_your_tor_relay">الاسم المستعار لمُرحل تور الخاص بك</string>
+  <string name="enter_a_custom_relay_nickname">أدخل اسم مستعار للمُرحل</string>
+  <string name="reachable_addresses">العناوين التي يمكن الوصول إليها</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">العمل كخدمة من وراء جدار ناري بسياسات تقيدية</string>
+  <string name="reachable_ports">المنافذ التي يمكن الوصول إليها</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">منافذ مفتوحة عبر جدار ناري تقيدي</string>
+  <string name="enter_ports">أدخل المنافذ</string>
+  <string name="enable_hidden_services">استضافة الخدمة المخفية</string>
+  <string name="run_servers_accessible_via_the_tor_network">السماح للخادم الذي علي جهازك بأمكانية الوصول إليه من خلال شبكة تور</string>
+  <string name="enter_localhost_ports_for_hidden_services">أدخل المنافذ المحلية للخدمات المخفية</string>
+  <string name="hidden_service_ports">منافذ الخدمات المخفية</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">اسم العنوان لخدمتك المخفية (يتم انشائه تلقائياً)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">شغل سجل الـdebug ( للمراجعة يجب استخدام adb أو LogCat)</string>
+  <string name="project_home">الموقع الرسمي للمشروع (المشاريع):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">رخصة استخدام تور</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">برامج من الطرف الثالث:</string>
+  <string name="tor_version">تور: https://www.torproject.org</string>
+  <string name="libevent_version">لب إيفينت النسخة http://www.monkey.org/~provos/libevent/ :v2.0.21</string>
+  <string name="polipo_version">بوليبو النسخة 1.1.9 : https://github.com/jech/polipo</string>
+  <string name="iptables_version">آي بي تايبلز النسخة 1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">اوبن اس اس ال النسخة: http://www.openssl.org 1.0.1q</string>
+  <string name="hidden_service_request">هناك برنامج يحاول فتح منفذ لخادم مخفي %S إلي شبكة تور. هذا السلوك آمن إذا كنت تثق بهذا البرنامج.</string>
+  <string name="found_existing_tor_process">عُثر علي عملية تور سابقة تعمل...</string>
+  <string name="something_bad_happened">حصل خطأ ما. افحص السجل</string>
+  <string name="hidden_service_on">الخدمات المخفية التي تعمل حالياً:</string>
+  <string name="unable_to_read_hidden_service_name">غير قادر على قراءة اسم الخدمة المخفية</string>
+  <string name="unable_to_start_tor">غير قادر على بدء تور:</string>
+  <string name="unable_to_reset_tor">أعِد تشغيل جهازك, غير قادر على اعادة تشغيل تور</string>
+  <string name="pref_use_sys_iptables_title">استخدم الـiptables التلقائية</string>
+  <string name="pref_use_sys_iptables_summary">استخدم مكونات الـiptables الموجودة ضمناً بالجهاز بدل النسخة المرفقة مع اوربوت</string>
+  <string name="error_installing_binares">غير قادرة على تثبيت أو تحديث تور</string>
+  <string name="pref_use_persistent_notifications">دائما ضع الأيقونة في شريط الأدوات عندما يكون اوربوت متصلاً</string>
+  <string name="pref_use_persistent_notifications_title">تنبيهات دائمة</string>
+  <string name="pref_use_expanded_notifications">قم بأظهار التنبيه بشكل موسع بأستخدام تور. أخرج من البلد ورقم الآي بي رقم العنوان على الشبكة</string>
+  <string name="pref_use_expanded_notifications_title">تنبيه موسّع</string>
+  <string name="notification_using_bridges">تم تفعيل الجسور!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">اللغة</string>
+  <string name="set_locale_summary">اختار  الإعدادات المحلية و اللغة لاوربوت</string>
+  <string name="wizard_locale_title">اختار اللغة</string>
+  <string name="wizard_locale_msg">إما ان تترك اللغة الافتراضية او إما ان تغير اللغة</string>
+  <string name="powered_by">مدعومة من قبل تور</string>
+  <string name="btn_save_settings">حفظ الإعدادات</string>
+  <string name="no_internet_connection_tor">لا يوجد ارتباط بألانترنيت: تور في وضع الوقف المؤقت</string>
+  <string name="bandwidth_">عرض النطاق</string>
+  <string name="down">اسفل</string>
+  <string name="up">أعلى</string>
+  <string name="pref_disable_network_title">لاتوجد شبكة نوم-آلي</string>
+  <string name="pref_disable_network_summary">ضع تور في وضع النوم عند عدم وجود الأنترنيت</string>
+  <string name="newnym">لقد تحولت الى هوية تور جديدة</string>
+  <string name="menu_verify_browser">متصفح</string>
+  <string name="menu_use_chatsecure">استخدم جات سكيور </string>
+  <string name="permission_manage_tor_label">أدارة تور</string>
+  <string name="permission_manage_tor_description">قم بتمكين هذا التطبيق من التحكم بخدمات تور</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">لا يبدو بأن لديك اورفوكس منصباً. هل تريد مساعدتاً في ذلك او لنقم فقط بتشغيل المتصفح؟</string>
+  <string name="install_apps_">هل ترغب بتنصيب التطبيقات؟</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">لا يوجد اتصال بألشبكة. سيدخل تور الى وضع النوم</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">الاتصال بألشبكة جيد. تنبيه تور من النوم</string>
+  <string name="updating_settings_in_tor_service">تحديث الاعدادات في خدمات تور</string>
+  <string name="pref_socks_title">تور  سوكس</string>
+  <string name="pref_socks_summary">منفذ الشبكات الحاسوبية او بورت الذي يقدمه تور الى وحدة الخدمة النائبة البروكسي في سوكس. (التقصير 9050 او 0 عدم القدرة)</string>
+  <string name="pref_socks_dialog">تهيئة منفذ الشبكات الحاسوبية  بورت في سوكس</string>
+  <string name="pref_transport_title">منفذ الشبكات الحاسوبية في وحدة الخدمة النائبة البروكسي في تور</string>
+  <string name="pref_transport_summary">منفذ الشبكات الحاسوبية او بورت الذي يقدمه تور الى البروكسي الشفاف (التقصير 9040 او 0 عدم القدرة)</string>
+  <string name="pref_transport_dialog">تهيئة بورت البروكسي الشفاف</string>
+  <string name="pref_dnsport_title">تور, نظام اسماء النطاقات, بورت</string>
+  <string name="pref_dnsport_summary">منفذ الشبكات الحاسوبية او بورت الذي يقدمه تور الى خدمة اسماء النطاق دي ان اس. (التقصير 5400 او 0 لعدم القدرة)</string>
+  <string name="pref_dnsport_dialog">إعدادات بورت خادم اسماء النطاق</string>
+  <string name="menu_vpn">في بي ان شبكة وهمية خاصة</string>
+</resources>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
new file mode 100644
index 0000000..0a84a25
--- /dev/null
+++ b/app/src/main/res/values-az/strings.xml
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Pulsuz proksi tətbiqetməsi olan Orbot başqa tətbiqetmələrə internetdən daha təhlükəsiz istifadə etmək imkanı verir. Orbot sizin internet trafikinizi şifrələmək üçün Tordan istifadə edir və dünyanın hər yerində kompüterlərin birindən o birinə sıçramaqla bunu gizlədir. Tor pulsuz proqram təminatıdır, eyni zamanda sizin şəxsi azadlığınız və təhlükəsizliyinizə, gizli biznes fəaliyyəti və əlaqələrə, o cümlədən trafik analiz adlanan dövlət təhlükəsizliyinə xələl gətirə biləcək şəbəkə nəzarəti formalarından müdafiə olunmağa yardım edən açıq şəbəkədir.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">Toru başlat və dayandır
+</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot başlayır...</string>
+  <string name="status_activated">Tor şəbəkəsinə bağlandı</string>
+  <string name="status_disabled">Orbot deaktivasiya edildi</string>
+  <string name="status_shutting_down">Tor xidməti işini başa vurur</string>
+  <string name="tor_process_starting">Tor xidməti başlayır...</string>
+  <string name="tor_process_complete">tamamla.</string>
+  <string name="tor_process_waiting">gözləyirik.</string>
+  <string name="not_anonymous_yet">TƏHLÜKƏ: Sənin trafikin hələ anonim deyil! Lütfən, aplikasiyanı ya HTTP proksi 127.0.0.1:8118, ya SOCKS4A, ya da SOCKS5 proksi 127.0.0.1:9050 istifadə etmək üçün quraşdır.</string>
+  <string name="menu_home">Ev</string>
+  <string name="menu_browse">Bax</string>
+  <string name="menu_settings">Quraşdırmalar</string>
+  <string name="menu_log">Jurnal</string>
+  <string name="menu_info">Kömək</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Başla</string>
+  <string name="menu_stop">Dur</string>
+  <string name="menu_about">Haqqında</string>
+  <string name="menu_promo_apps">Tətbiqetmələri əldə edin...</string>
+  <string name="main_layout_download">Endir</string>
+  <string name="main_layout_upload">Yüklə</string>
+  <string name="button_help">Kömək</string>
+  <string name="button_close">Bağla</string>
+  <string name="button_about">Haqqında</string>
+  <string name="button_clear_log">Jurnalı Təmizlə</string>
+  <string name="menu_verify">Yoxla</string>
+  <string name="menu_exit">Çıx</string>
+  <string name="menu_scan">KörpüQR kodu skan edin</string>
+  <string name="menu_share_bridge">KörpüQR kodu paylaşın</string>
+  <string name="press_to_start">- başlamaq üçün uzun klik -</string>
+  <string name="pref_trans_proxy_group">Şəffaf Proksiləmə (Root Tələb Edir)</string>
+  <string name="pref_trans_proxy_title">Şəffaf Proksiləmə</string>
+  <string name="pref_trans_proxy_summary">Aplikasiyaların Avtomatik Torlanması</string>
+  <string name="pref_transparent_all_title">Hər şeyi Torla</string>
+  <string name="pref_transparent_all_summary">Tor vasitəsilə bütün aplikasiyaların proksi trafiki</string>
+  <string name="pref_transparent_port_fallback_title">Port Proksi Ehtiyatı</string>
+  <string name="pref_transparent_port_fallback_summary">TƏHLÜKƏ: Ümumi alt portlar (80, 443 və s.). \'Hamısı\' və ya \'Tətbiqetmə\' işləmirsə, *YALNIZ İSTİFADƏ ET*.</string>
+  <string name="pref_transparent_port_title">Port Siyahısı</string>
+  <string name="pref_transparent_port_summary">Proksiyə port siyahısı. \'Hamısı\' və ya \'Tətbiqetmə\' işləmirsə, *YALNIZ İSTİFADƏ ET*.</string>
+  <string name="pref_transparent_port_dialog">Proksiyə port daxil et</string>
+  <string name="pref_has_root">Root Giriş Tələb Et</string>
+  <string name="pref_has_root_summary">Şəffaf proksiləmə üçün mənbə tələb et</string>
+  <string name="status_install_success">Tor ikilisi müvəffəqiyyətlə yükləndi!</string>
+  <string name="status_install_fail">Tor ikili fayllarının quraşdırılması mümkün olmadı. Lütfən girişi yoxla və assistants at torproject.org-a xəbər ver.</string>
+  <string name="title_error">Tətbiq Səhvi</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Orbot Haqqında</string>
+  <string name="btn_next">Sonrakı</string>
+  <string name="btn_back">Geri</string>
+  <string name="btn_finish">Bitir</string>
+  <string name="btn_okay">Okey</string>
+  <string name="btn_cancel">Ləğv et</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Bəzi Orbot Detalları</string>
+  <string name="wizard_details_msg">Orbot Tor, LibEvent və Polipodan ibarət olan açıq mənbəli tətbiqetmədir. O, Tor şəbəkəsini yerli HTTP proksi (8118) və SOCKS proksi (9050) ilə təmin edir. Orbot həm də bütün internet trafikləri köklü mexanizm əsasında Tor vasitəsiylə göndərmək qabiliyyətinə malikdir. </string>
+  <string name="wizard_permissions_root">İcazə Verilir</string>
+  <string name="wizard_permissions_stock">Orbot İcazələri</string>
+  <string name="wizard_premissions_msg_root">Əla! Sənin Orbot üçün mənbə icazələrinə malik olmanı müəyyən etmişik. Biz bu gücü ağılla istifadə edəcəyik.</string>
+  <string name="wizard_permissions_msg_stock">Bu tələb edilmədiyi halda sənin qurğunun mənbə girişi varsa, Orbot daha güclü işləyəcək. Orbota super gücü vermək üçün aşağıdakı düyməni istifadə et!</string>
+  <string name="wizard_permissions_no_root">Əgər sənin mənbə girişinə icazən yoxdursa, ya da nə haqqında danışdığımızı anlamırsansa, əmin ol ki, istifadə etdiyin aplikasiyalar Orbotla işləyə biləndirlər.</string>
+  <string name="wizard_permissions_consent">Superistifadəçisiz davam etməyi anlayır və istəyirəm</string>
+  <string name="wizard_permission_enable_root">Orbot üçün Mənbə Ver</string>
+  <string name="wizard_configure">Torifikasiyanı Quraşdır</string>
+  <string name="wizard_configure_msg">Orbot sənə bütün və ya seçilmiş aplikasiyalarını Tor vasitəsilə istifadə etməyə imkan yaradır.</string>
+  <string name="wizard_configure_all">Bütün Aplikasiyaları Tor Vasitəsilə Proksi Et</string>
+  <string name="wizard_configure_select_apps">Tor üçün Müəyyən Aplikasiyaları Seç</string>
+  <string name="wizard_tips_tricks">Orbota-açıq Aplikasiyalar</string>
+  <string name="wizard_tips_msg">Aşağıdakı aplikasiyalar Orbotla işləmək üçün quraşdırılmışdır. İndi quraşdırmaq üçün hər düyməni kliklə, ya da başqa vaxt onları Google Play, GuardianProject.info saytı və ya F-Doid.org-da tap.</string>
+  <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="wizard_tips_twitter">\"Yerlihost\" və 8118 portuna sahiblik üçün Twitter proksini quraşdır</string>
+  <string name="wizard_tips_story_maker">StoryMaker--Yazı yaz, təhlükəsizlik məsələsini torun öhdəsinə burax!</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>
+  <string name="wizard_proxy_help_msg">İstifadə etdiyiniz Android tətbiqetməsi HTTP və SOCKS proksinin istifadəsini dəstəkləyə bilirsə, siz onu Orbotla birləşdirmək üçün tənzimləyə və Tor.\n\n\n-dən istifadə edə bilərsiniz.   Host quraşdırmaları 127.0.0.1-dir, yaxud \"yerlihost\"dur. HTTP üçün port quraşdırması 8118-dir. SOCKS üçün proksi  9050-dir. Siz SOCKS4A, yaxud mümkünsə, SOCKS5-dən istifadə etməlisiniz.\n \n\n\n FAQ vasitəsiylə siz Androiddə proksiləmə haqda daha çox məlumat ala bilərsiniz: http://tinyurl.com/proxyandroid\n</string>
+  <string name="wizard_final">Orbot hazırdır!</string>
+  <string name="wizard_final_msg">Dünyanın müxtəlif yerlərində milyonlarla insan Tordan müxtəlif məqsədlərlə istifadə edir. \n\n Jurnalistlər, blogerlər, insan haqları müdafiəçiləri, hüquq-mühafizə orqanlarının işçiləri, əsgərlər, korporasiyalar, repressiv rejimlərin vətəndaşları, ya da adi vətəndaşlar...İndi buna siz də hazırsınız!</string>
+  <string name="wizard_exit_at_first_screen_toast">Zəhmət olmasa, istifadəyə başlamazdan əvvəl Orbotu tənzimləyin!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Siz Tor şəbəkəsinə uğurla qoşuldunuz. Ancaq bu o demək deyil ki, sizin cihazınız təhlükəsizdir. Əlqəni yoxlamaq üçün  \'Browser\' düyməsindən istifadə edə bilərsiniz. \n\n Bizə https://guardianproject.info/apps/orbot səhifəsində qonaq ola bilərsiniz. Daha çox məlumat əldə etmək üçün help at guardianproject.info ünvanına məktub yazmaq olar. </string>
+  <string name="tor_check">Orbotun konfiqurasiya edilməsini və sənin Tor-a qoşulduğunu dəqiqləşdirmək üçün bu sənin brauzerini https://check.torproject.org saytı ilə açacaq.</string>
+  <string name="pref_hs_group">Gizli Xidmət Hostinqi</string>
+  <string name="pref_general_group">Əsas</string>
+  <string name="pref_start_boot_title">Android Açıldıqda Orbotu Başlat</string>
+  <string name="pref_start_boot_summary">Android cihazın işə başladıqda avtomatik olaraq Orbot başlansın və Tor-a qoşulsun</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot Toru Androidə gətirir!\n\nTor məxfiliyə, gizli informasiya və şəxsi münasibətlərə xələl gətirə biləcək şəbəkə nəzarəti, məzmunun süzgəcdən keçirilməsi və trafik analizindən müdafiə olunmaqda sizə yardım edir.\n\nBu sehrbaz Orbot və Toru sizin cihazınıza quraşdırmağa kömək edəcək.  </string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Xəbərdarlıq</string>
+  <string name="wizard_warning_msg">Sadəcə Orbotun quraşdırılması mobil trafikinizi avtomatik olaraq anonimləşdirə bilməz.\n\nTordan uğurla istifadə etmək üçün siz Orbotu, cihazınızı və başqa tətbiqetmələri bir-birinə uyğunlaşdırmalısınız.  </string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">İcazə</string>
+  <string name="wizard_permissions_root_msg1">Sən istəsən Orbot-un \'Superistifadəçi\' girişini əldə edib Şəffaf Proksiləmə kimi əlavə seçimlər qazana bilərsən.</string>
+  <string name="wizard_permissions_root_msg2">Bunu etmək istəmirsənsə, yalnız Orbot-la işləməsi mümkün aplikasiyalara sahib olduğuna əmin ol</string>
+  <string name="wizard_permissions_no_root_msg">Sizin cihazınız yəqin ki, rout olunmayıb, ya da rout və ya \"Superistifadəçi\" keçidi ilə təmin etmir.\n\nXahiş edirik, bunun əvəzinə əsas ekranda \'Tətbiqetmələr\' rejimindən istifadə etməyə çalışın. </string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox: Tor vasitəsiylə işləyən və məxfiliyi artıran brauzer</string>
+  <string name="wizard_tips_play">Google Play-də bütün Guardian Layihə aplikasiyaları tap</string>
+  <string name="wizard_tips_fdroid">F-Droiddəki bütün Guardian Project tətbiqetmələrini tapın </string>
+  <string name="wizard_tips_fdroid_org">https://f-droid.org-də bütün Guardian Project tətbiqetmələrini tapın</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Şəffaf Proksiləmə</string>
+  <string name="wizard_transproxy_msg">Bu heç bir konfiqurasiyaya ehtiyac olmadan aplikasiyalarının avtomatik olaraq Tor şəbəkəsi vasitəsilə işləməsini təmin edir.</string>
+  <string name="wizard_transproxy_hint">(Dediklərimizdən heç biri haqqında xəbərin yoxdursa, qutunu işarələ)</string>
+  <string name="wizard_transproxy_none">Heç biri</string>
+  <string name="pref_transparent_tethering_title">Tor-un Son Həddi</string>
+  <string name="pref_transparent_tethering_summary">Wifi və USB ilə Bağlanan Cihazlar üçün Tor Şəffaf Proksiləməni Aktivləşdir (cihazın yenidən yüklənməsini tələb edir)</string>
+  <string name="button_grant_superuser">Superistifadəçi Giriş Tələbi</string>
+  <string name="pref_select_apps">Aplikasiya Seç</string>
+  <string name="pref_select_apps_summary">Tor vasitəsilə açılması üçün Aplikasiya seç</string>
+  <string name="pref_node_configuration">Kəsişmə Konfiqurasiyası</string>
+  <string name="pref_node_configuration_summary">Bunlar sənin anonimliyini azalda biləcək ətraflı seçimlərdir</string>
+  <string name="pref_entrance_node">Giriş Kəsişmələri</string>
+  <string name="pref_entrance_node_summary">Birinci sıçrayış üçün barmaq izləri, nişanlar, ölkələr və ünvanlar</string>
+  <string name="pref_entrance_node_dialog">Giriş Kəsişmələrini Əlavə et</string>
+  <string name="pref_allow_background_starts_title">Arxa fonun işə başlamasına icazə verin</string>
+  <string name="pref_allow_background_starts_summary">Qoy hər-hansı tətbiqetmə Orbota Tor və əlaqəli xidmətləri işə salmalı olduğunu desin</string>
+  <string name="button_proxy_all">Hər şeyi proksilə
+</string>
+  <string name="button_proxy_none">Heç nəyi proksiləmə</string>
+  <string name="button_invert_selection">Seçiminin yerini dəyiş</string>
+  <string name="pref_proxy_title">İxrac Edilən Şəbəkə Proksisi (istəyə bağlı)</string>
+  <string name="pref_proxy_type_title">İxrac Edilən Proksi Növü</string>
+  <string name="pref_proxy_type_summary">Proksi serveri istifadə etmək üçün protokol: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Proksi Növünü Daxil Et</string>
+  <string name="pref_proxy_host_title">İxrac Edilən Proksi Hostu</string>
+  <string name="pref_proxy_host_summary">Proksi Server host adı</string>
+  <string name="pref_proxy_host_dialog">Proksi Hostu Daxil Et</string>
+  <string name="pref_proxy_port_title">İxrac Edilən Proksi Port</string>
+  <string name="pref_proxy_port_summary">Proksi Server portu</string>
+  <string name="pref_proxy_port_dialog">Proksi portu daxil et</string>
+  <string name="pref_proxy_username_title">İxrac Edilən Proxy İstifadəçi Adı</string>
+  <string name="pref_proxy_username_summary">Proksi İstifadəçi Adı (istəyə bağlı)</string>
+  <string name="pref_proxy_username_dialog">Proksi İstifadəçi Adı Daxil Et</string>
+  <string name="pref_proxy_password_title">İxrac Edilən Proksi Şifrə</string>
+  <string name="pref_proxy_password_summary">Proksi Şifrə (istəyə bağlı)</string>
+  <string name="pref_proxy_password_dialog">Proksi Şifrə Daxil et</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Tam şəffaf proksiləmənin quraşdırılması...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Aplikasiya əsaslı şəffaf proksiləmənin quraşdırılması...</string>
+  <string name="transparent_proxying_enabled">Şəffaf proksiləmə AKTİVLƏŞDİRİLDİ</string>
+  <string name="transproxy_enabled_for_tethering_">Bağlanma üçün TransProksi aktivləşdirildi!</string>
+  <string name="warning_error_starting_transparent_proxying_">TƏHLÜKƏ: şəffaf proksiləmənin başlanmasında xəta!</string>
+  <string name="transproxy_rules_cleared">TransProksi qaydalar təmizləndi</string>
+  <string name="couldn_t_start_tor_process_">Tor prosesi başlana bilmədi:</string>
+  <string name="privoxy_is_running_on_port_">Polipo portda işləyir</string>
+  <string name="setting_up_port_based_transparent_proxying_">Porta əsaslanmış proksiləmənin quraşdırılması...</string>
+  <string name="bridge_error">Körpü Xətası</string>
+  <string name="bridge_requires_ip">Körpü funksiyasını istifadə etmək üçün ən azı bir körpü IP ünvanı əlavə etməlisən.</string>
+  <string name="send_email_for_bridges">Gmail hesabından bridges at torproject.org ünvanına mətn hissəsində \"körpü əldə et\" sözləri yazılmaqla məktub göndər.</string>
+  <string name="error">Xəta</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Sənin ƏlçatanÜnvanlar seçimin istisnaya səbəb oldu!</string>
+  <string name="your_relay_settings_caused_an_exception_">Sənin keçid seçimlərin istisnaya səbəb oldu!</string>
+  <string name="exit_nodes">Kəsişmələri Xaric Et</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Son sıçrayış üçün barmaq izləri, nişanlar, ölkələr və ünvanlar</string>
+  <string name="enter_exit_nodes">Çıxış Kəsişmələrini Daxil Et</string>
+  <string name="exclude_nodes">Kəsişmələri Xaric Et</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">İxrac üçün barmaq izləri, nişanlar, ölkələr və ünvanlar</string>
+  <string name="enter_exclude_nodes">İxrac Kəsişmələrini Daxil Et</string>
+  <string name="strict_nodes">Kəskin Kəsişmələr</string>
+  <string name="use_only_these_specified_nodes">*Yalnız* bu xüsusi kəsişmələri istifadə et</string>
+  <string name="bridges">Körpülər</string>
+  <string name="use_bridges">Körpü İstifadə Et</string>
+  <string name="bridges_obfuscated">Çaşdırıcı Körpülər</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Tor Şəbəkəsinə alternativ giriş kəsişmələrini aktivləşdir</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Quraşdırılmış körpülər çaşdırıcı körpülər olsa, aktivləşdir</string>
+  <string name="ip_address_and_port_of_bridges">Körpülərin IP ünvanı və portu</string>
+  <string name="enter_bridge_addresses">Körpü Ünvanlarını Daxil et</string>
+  <string name="relays">Keçidlər</string>
+  <string name="relaying">Keçidləmə</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Cihazının son-keçid funksiyasını aktivləşdir</string>
+  <string name="relay_port">Keçid Portu</string>
+  <string name="listening_port_for_your_tor_relay">Tor keçidin üçün portun dinlənməsi</string>
+  <string name="enter_or_port">OR port daxil et</string>
+  <string name="relay_nickname">Keçid adı</string>
+  <string name="the_nickname_for_your_tor_relay">Tor keçidin üçün ad</string>
+  <string name="enter_a_custom_relay_nickname">İlkin keçidə ad daxil et</string>
+  <string name="reachable_addresses">Əlçatan Ünvanlar</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Məhdudlaşmış siyasətlə qoruyucu divar arxasındakı müştəri kimi işlət</string>
+  <string name="reachable_ports">Əlçatan portlar</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Məhdudlaşdırılmış qoruyucu divar arxasında əlçatan portlar</string>
+  <string name="enter_ports">Port daxil et</string>
+  <string name="enable_hidden_services">Gizli Xidmət Hostinqi</string>
+  <string name="run_servers_accessible_via_the_tor_network">cihaz serverinin Tor şəbəkəsi tərəfindənəldə edilən olmasına icazə ver</string>
+  <string name="enter_localhost_ports_for_hidden_services">gizli xidmətlər üçün yerlihost portlarını daxil et</string>
+  <string name="hidden_service_ports">Gizli Xidmət Portları</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">gizli xidmətin üçün ünvanlanan ad (avtomatik hazırlanmış)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">məhsul üçün sazlama girişi daxil et (baxmaq üçün adb və ya aLogCat istifadə etməlisən)</string>
+  <string name="project_home">Layihə Evi(ləri):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor Lisenziyası</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Xidməti Quraşdırma:</string>
+  <string name="tor_version">
+Tor: https://www.torproject.org</string>
+  <string name="libevent_version">
+LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">SSL-i aç v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Aplikasiya Tor şəbəkəsinə %S gizli server portu açmaq istəyir. Aplikasiyaya inandığın halda bu təhlükəsizdir.</string>
+  <string name="found_existing_tor_process">mövcud Tor prosesi tapıldı...</string>
+  <string name="something_bad_happened">Nə isə pis bir şey oldu. Girişi yoxla</string>
+  <string name="hidden_service_on">burada gizli xidməti:</string>
+  <string name="unable_to_read_hidden_service_name">gizli xidmət adını oxumağı deaktivləşdir</string>
+  <string name="unable_to_start_tor">Tor-un başlanmasını dayandır:</string>
+  <string name="unable_to_reset_tor">Cihazınızı yenidən yükləyin, Toru bərpa etmək olmur!</string>
+  <string name="pref_use_sys_iptables_title">Mövcud Ipstol İstifadə Et</string>
+  <string name="pref_use_sys_iptables_summary">Orbotla bağlanmış ipstol əvəzinə daxili cüt ipstol istifadə et</string>
+  <string name="error_installing_binares">Tor cütlükləri quraşdırıla və ya təkmilləşdirilə bilmədi.</string>
+  <string name="pref_use_persistent_notifications">Həmişə Orbot qoşulduğu hallarda nişanı alətlət panelində saxla</string>
+  <string name="pref_use_persistent_notifications_title">Həmişə Açıq Xəbərdarlıqlar</string>
+  <string name="pref_use_expanded_notifications">Torla birlikdə ətraflı bildirişi göstərib ölkə və IP-dən çıxın. </string>
+  <string name="pref_use_expanded_notifications_title">Ətraflı bildirişlər</string>
+  <string name="notification_using_bridges">Körpülər aktivləşdirildi!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Dil</string>
+  <string name="set_locale_summary">Orbot üçün dil standartlarını və dili seç</string>
+  <string name="wizard_locale_title">Dil Seç</string>
+  <string name="wizard_locale_msg">Olduğu kimi saxla, ya da mövcud dilə keç</string>
+  <string name="powered_by">Tor tərəfindən yaradılmış</string>
+  <string name="btn_save_settings">Seçimləri Saxla</string>
+  <string name="no_internet_connection_tor">İnternet yoxdur; Tor gözləyir</string>
+  <string name="bandwidth_">Ötürmə qabiliyyəti:</string>
+  <string name="down">aşağı</string>
+  <string name="up">yuxarı</string>
+  <string name="pref_disable_network_title">Avto-Yuxu Şəbəkəsi Yoxdur</string>
+  <string name="pref_disable_network_summary">İnternet olmadıqda icazə ver Tor yatsın</string>
+  <string name="newnym">Yeni Tor oxşarına qoşuldun!</string>
+  <string name="menu_verify_browser">Bax</string>
+  <string name="menu_use_chatsecure">ChatSecure istifadə et</string>
+  <string name="permission_manage_tor_label">Toru İdarə Et</string>
+  <string name="permission_manage_tor_description">Tor xidmətini idarə etməsi üçün aplikasiyanı aktivləşdir</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Deyəsən Orfoxu quraşdırmamısınız. Yardıma ehtiyacınız var, yoxsa yalnız brauzeri açmalıyıq?</string>
+  <string name="install_apps_">Aplikasiya quraşdırılsın?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">İnternetlə əlaqə yoxdur. Tor gözləmə rejiminə keçir...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">İnternetlə əlaqə yaxşıdır. Tor iş rejiminə keçir...</string>
+  <string name="updating_settings_in_tor_service">Tor xidmətində quraşdırmalar yüklənir</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Torun təklif etdiyi Port SOCKS proksi işləyir (standart: 9050, yaxud söndürmək üçün 0) </string>
+  <string name="pref_socks_dialog">SOCKS Port Config</string>
+  <string name="pref_transport_title">Tor TransProxy Port</string>
+  <string name="pref_transport_summary">Torun təklif etdiyi Port Transparent proksi işləyir (standart: 9040, yaxud söndürmək üçün 0) </string>
+  <string name="pref_transport_dialog">TransProxy Port Config</string>
+  <string name="pref_dnsport_title">Tor DNS Port</string>
+  <string name="pref_dnsport_summary">Torun təklif etdiyi Port DNS işləyir (standart: 5400, yaxud söndürmək üçün 0)</string>
+  <string name="pref_dnsport_dialog">DNS Port Config</string>
+  <string name="pref_torrc_title">Torrc Custom Config</string>
+  <string name="pref_torrc_summary">YALNIZ EKSPERTLƏR: birbaşa torrc config xətlərini daxil edin</string>
+  <string name="pref_torrc_dialog">Custom Torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus - Benetech İnsan haqları Sənədləri tətbiqetməsi</string>
+  <string name="your_tor_public_ips_">Sizin ictimai Tor İP-ləriniz</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Orbotla bağlı probleminiz varsa, lütfən, Android->Settings->Apps-də bu tətbiqetməni söndürün;</string>
+  <string name="app_conflict">Tətbiqetmə konflikti</string>
+  <string name="pref_transproxy_refresh_title">Transproxy avtomatik yeniləmə</string>
+  <string name="pref_transproxy_refresh_summary">Şəbəkə vəziyyəti dəyişəndə Transproxy qaydalarını yenidən tətbiq edin</string>
+  <string name="pref_transproxy_flush_title">Transproxy MƏCBURİ POZMA</string>
+  <string name="pref_transproxy_flush_summary">Bütün transproxy şəbəkə qaydalarını elə İNDİ ləğv etmək üçün bura klikləyin</string>
+  <string name="transparent_proxy_rules_flushed_">Transparent proksi qaydaları ləğv edildi</string>
+  <string name="you_do_not_have_root_access_enabled">Root girişiniz yoxdur</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Quraşdırma dəyişikliklərinin tətbiq edilməsi üçün Orbota başlamağa və ya onu dayandırmağa ehtiyacınız ola bilər. </string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Körpülər yeniləndi</string>
+  <string name="restart_orbot_to_use_this_bridge_">Lütfən, Orbotu söndürün və yenidən yandırın ki, dəyişikliklər tətbiq edilsin.</string>
+  <string name="menu_qr">QR kodlar</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Sənin mobil şəbəkən Toru aktiv şəkildə əngəlləyirsə,  şəbəkəyə daxil olmaq üçün Körpüdən istifadə edə bilərsən. Körpüləri aktivləşdirmək üçün yuxarıdakı körpü növlərindən birini SEÇ.</string>
+  <string name="bridge_mode">Körpü rejimi</string>
+  <string name="get_bridges_email">Emeyl</string>
+  <string name="get_bridges_web">Veb</string>
+  <string name="activate">Aktivləşdir</string>
+  <string name="apps_mode">Tətbiqetmələr VPN Rejimi</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Tor şəbəkəsi vasitəsiylə qoşulmaq üçün Android.\n\n*WARNING*-in VPN funksiyasından istifadə edərək öz qurğunda bütün tətbiqetmələri aktivləşdirə bilərsən. Bu, yeni, eksperimental funksiyadır və bəzən avtomatik olaraq başlamaya, yaxud dayana bilər. Bundan anonimlik məqsədiylə istifadə etmək OLMAZ, bundan YALNIZ  süzgəc və qoruma divarlarından keçmək üçün istifadə etmək lazımdır. </string>
+  <string name="send_email">Emeyl göndərin</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Körpü ünvanını siz emeyl və veb vasitəsiylə, ya da körpünün QR kodunu skan etməklə əldə edə bilərsiniz. Körpü ünvanı haqda sorğunun altında  \'Email\'i, yaxud \'Web\'i seçin.\n\nÜnvanı əldə edəndən sonra  &amp-i nüsxələyin və onu Orbot quraşdırmasındakı \"Bridges\" parametrinə qoyun və cihazı yenidən yükləyin.</string>
+  <string name="install_orweb">Orfoxu quraşdırın</string>
+  <string name="standard_browser">Standart Brauzer</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">QEYD: Intel X86/ATOM cihazlarında yalnız standart Tor körpülər işləyir.</string>
+  <string name="vpn_default_world">Dünya</string>
+</resources>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
new file mode 100644
index 0000000..22aff36
--- /dev/null
+++ b/app/src/main/res/values-bg/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Орбот</string>
+  <string name="app_description">Orbot е безплатна прокси програма, която дава възможноста на други програми да използват интерент по-сигурно. Orbot използва Tor, за да криптира Интернет трафика и след това го скрива като препраща през няколко компютъра по целия свят. Tor е безплатен софтуер и отворена мрежа, която ти помага да се предпазиш от шпиониране по мрежата, което заплашва твоята свобода и лично пространство, конфиденциални бизнес отношение и връзки, и от вид правителствено следене наречено трафик анализ.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">стартирай и стопирай Тор</string>
+  <string name="tor_proxy_service_process">Tor прокси</string>
+  <string name="status_starting_up">Орбот стартира...</string>
+  <string name="status_activated">Свързан към Тор мрежата</string>
+  <string name="status_disabled">Орбот е деактивиран</string>
+  <string name="status_shutting_down">TorService спира</string>
+  <string name="tor_process_starting">Стартиране на Тор клиент...</string>
+  <string name="tor_process_complete">завършено.</string>
+  <string name="tor_process_waiting">изчакване.</string>
+  <string name="not_anonymous_yet">ВНИМАНИЕ: Трафикът Ви не е анонимен! Моля конфигурирайте приложенията си да използват HTTP proxy 127.0.0.1:8118 или SOCKS4A или SOCKS5 proxy 127.0.0.1:9050</string>
+  <string name="menu_home">Начало</string>
+  <string name="menu_browse">Прелисти</string>
+  <string name="menu_settings">Настройки</string>
+  <string name="menu_log">Лог</string>
+  <string name="menu_info">Помощ</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Старт</string>
+  <string name="menu_stop">Стоп</string>
+  <string name="menu_about">Относно</string>
+  <string name="menu_promo_apps">Изтегли приложения...</string>
+  <string name="main_layout_download">Изтегли</string>
+  <string name="main_layout_upload">Качи</string>
+  <string name="button_help">Помощ</string>
+  <string name="button_close">Затвори</string>
+  <string name="button_about">Относно</string>
+  <string name="button_clear_log">Изчисти лог</string>
+  <string name="menu_verify">Check</string>
+  <string name="menu_exit">Изход</string>
+  <string name="menu_scan">Сканирай BridgeQR</string>
+  <string name="menu_share_bridge">Сподели BridgeQR</string>
+  <string name="press_to_start">- за старт натисни и задръж -</string>
+  <string name="pref_trans_proxy_group">Прозрачно прокси (Изисква Root)</string>
+  <string name="pref_trans_proxy_title">Прозрачно прокси</string>
+  <string name="pref_trans_proxy_summary">Автоматично прекарване на приложенията през Тор</string>
+  <string name="pref_transparent_all_title">Всичко през Тор</string>
+  <string name="pref_transparent_all_summary">Прехвърляй през Тор трафика на всички приложения</string>
+  <string name="pref_transparent_port_fallback_title">Тор прокси услугата смени порта</string>
+  <string name="pref_transparent_port_fallback_summary">ВНИМАНИЕ: Заобикаля стандартните портове(80, 443, т.н.). *ИЗПОЛЗВАЙ САМО* ако режимиете \'Всички\' или \'Програма\' не работят.</string>
+  <string name="pref_transparent_port_title">Списък портове</string>
+  <string name="pref_transparent_port_summary">Списък с портовете, на които да се ползва прокси. *ИЗПОЛЗВАЙ САМО* ако режимиете \'Всички\' или \'Програма\' не работят.</string>
+  <string name="pref_transparent_port_dialog">Въведи портове на прокси</string>
+  <string name="pref_has_root">Изисквай Root достъп</string>
+  <string name="pref_has_root_summary">Изисквай root достъп за прозрачно прокси</string>
+  <string name="status_install_success">Тор е успешно инсталиран!</string>
+  <string name="status_install_fail">Двуичните файлове на Тор не са инсталирани. Моля проверете лога и уведомете tor-assistants at torproject.org</string>
+  <string name="title_error">Грешка в приложението</string>
+  <string name="wizard_title">Орбот</string>
+  <string name="wizard_btn_tell_me_more">Относно Орбот</string>
+  <string name="btn_next">Следващ</string>
+  <string name="btn_back">Обратно</string>
+  <string name="btn_finish">Край</string>
+  <string name="btn_okay">ОК</string>
+  <string name="btn_cancel">Откажи</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Някои Орбот детайли</string>
+  <string name="wizard_details_msg">Orbot е приложение с отворен код, което съдържа Tor, LibEvent и Polipo. То предлага локално HTTP прокси (8118) и SOCKS прокси (9050) към Tor мрежата. Orbot също така има възможноста, на усройства с root достъп, да препраща целият интернет трафик през Tor.</string>
+  <string name="wizard_permissions_root">Правата дадени</string>
+  <string name="wizard_permissions_stock">Orbot Permissions</string>
+  <string name="wizard_premissions_msg_root">Отлично! Засякохме, че имате root права достъпни за Орбот. Ще използваме тази сила разумно.</string>
+  <string name="wizard_permissions_msg_stock"> Въпреки че не е задължително, Орбот може да стане по-мощно приложение ако има root достъп. Използвайте бутона долу за да дадете на Орбот суперсили!</string>
+  <string name="wizard_permissions_no_root">Ако нямате root достъп или не знаете за какво става въпрос, просто използвайте приложения направени да работят с Орбот.</string>
+  <string name="wizard_permissions_consent">Разбирам и искам да продължа без Суперпотребител</string>
+  <string name="wizard_permission_enable_root">Разреши Root за Орбот</string>
+  <string name="wizard_configure">Настрой Торификацията</string>
+  <string name="wizard_configure_msg">Орбот Ви дава възможност да прекарате всичкия трафик през Тор или да изберете приложения по отделно.</string>
+  <string name="wizard_configure_all">Прекарай всички приложения през Тор</string>
+  <string name="wizard_configure_select_apps">Избери отделни приложения за Тор</string>
+  <string name="wizard_tips_tricks">Поддържани от Орбот приложения</string>
+  <string name="wizard_tips_msg">Приложенията по-долу са създадени така, че да работят с Орбот. Цъкни на всеки бутон, за да инсталираш сега или може да ги намериш по-късно в Андроид маркет.</string>
+  <string name="wizard_tips_otrchat">ChatSecure - Криптиран чат програма за Андроид</string>
+  <string name="wizard_tips_proxy">Proxy Settings - Научете как да конфигурирате приложения да работят през Орбот</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo Търсачка</string>
+  <string name="wizard_tips_twitter">Нагласете проксито на Twitter на \"localhost\" и порт 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Създай история и остави сигурноста на tor!</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_proxy_help_msg">Ако Андроид приложението, което използваш поддържа HTTP или SOCKS прокси, тогава мжоеш да го конфигурираш да се свързва с Orbot и да използва Tor.\n\n\nНастойките са host 127.0.0.1 или \"localhost\". За HTTP, портът е 8118. За SOCKS проксито е 9050. Най-добре е по възможност да се използва SOCKS4A или SOCKS5.\n\n\n\nМожеш да научиш повече за прокситата в Андроид през странцита с въпроси и отговори: http://tinyurl.com/proxyandroid\n </string>
+  <string name="wizard_final">Орбот е готов!</string>
+  <string name="wizard_final_msg">Милиони хора по света използват Tor по голям брой причини.\n\nЖурналисти и блогъри, защитници на човешките права, органите на реда, войници, корпорации, граждани на държави с репресивни режими, и най-обикновени граждани... а сега и ти!</string>
+  <string name="wizard_exit_at_first_screen_toast">Моля, настрой Orbot преди да почнеш да го използваш!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Успешн се свързахте с Tor мрежата - това НЕ значи, че устройството Ви е предпазено. Може да използвате \'Браузър\' бутона да тествате връзката. \n\nОтидете на https://guardianproject.info/apps/orbot или изпратете имейл на help at guardianproject.info, за да научите повече.</string>
+  <string name="tor_check">Това ще те заведе на https://check.torproject.org, за да провери дали Orbot е правилно настроен и дали си свързан с Tор.</string>
+  <string name="pref_hs_group">Скрити услуги</string>
+  <string name="pref_general_group">Главни</string>
+  <string name="pref_start_boot_title">Стартирай Орбот при стартиране на устройството</string>
+  <string name="pref_start_boot_summary">Автоматично стартирай Орбот и се свържи към Тор когато твоето Андроид устройство стартира</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Орбот дава достъп до Tor през Android!\n\nTor ти помага да се предпазиш от филтриране на интернетът, анализ на трафика и подслушване по интернет всички, от които заплашват личното ти пространство, конфиденциалната ти информация и личните ти връзки.\n\nТози стъпка по стъпка наръчни ще ти помогне да настроиш Orbot и Tor на устройството си.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Внимание</string>
+  <string name="wizard_warning_msg">Самото инсталиране на Orbot няма автоматично да анонимизира мобилния ти трафик.\n\nТрябва да настроиш Orbot, устройството ти и други приложения, за да ползваш Tor успешно.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Права</string>
+  <string name="wizard_permissions_root_msg1">Ако желаеш може да разрешиш на Orbot \'Superuser\' права, за да включиш допълнителни функиции, като Прозрачно Проксифициране.</string>
+  <string name="wizard_permissions_root_msg2">Ако не желаеш това се увери, че програмите, които ще използваш са съвместими с Orbot </string>
+  <string name="wizard_permissions_no_root_msg">Устройството ти не изглежда да има или предлага root или така наречения \'Суперпотребителски\' достъп.\n\nМоля, използвай режидъмът \'Приложения\' на главния екран.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Приложения през Орбот</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: Криптирана чат програма с подръжка на Off-the-Record енкрипция.</string>
+  <string name="wizard_tips_orweb">Orfox: Браузър с насоченост към осигуряване на личното пространство, който работи през Tor</string>
+  <string name="wizard_tips_play">Намери всики Guardin Project програми в Google Play</string>
+  <string name="wizard_tips_fdroid">Намери всички приложения на Guardian Project в F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Намери всички Guardian Project приложения на https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Прозрачно прокси</string>
+  <string name="wizard_transproxy_msg">Това позволява на приложенията Ви автоматично да използват мрежата на Тор без никаква конфигурация.</string>
+  <string name="wizard_transproxy_hint">(Избери тази опция ако нямаш представа за какво става въпрос)</string>
+  <string name="wizard_transproxy_none">Нищо</string>
+  <string name="pref_transparent_tethering_title">Тетъринг през Тор</string>
+  <string name="pref_transparent_tethering_summary">Включи Прозрачно Тор Проксифициране през Wifi и USB (изисква рестартирване)</string>
+  <string name="button_grant_superuser">Изискай достъп на Суперпотребител</string>
+  <string name="pref_select_apps">Избери приложения</string>
+  <string name="pref_select_apps_summary">Избрери приложения за използване през Тор</string>
+  <string name="pref_node_configuration">Настройки на node-а</string>
+  <string name="pref_node_configuration_summary">Това са допълнителни настройки, които могат да намалят Вашата анонимност</string>
+  <string name="pref_entrance_node">Входящи точки</string>
+  <string name="pref_entrance_node_summary">Отпечатъци, никсове, държави и адреси за първия скок</string>
+  <string name="pref_entrance_node_dialog">Въведи входящи точки</string>
+  <string name="pref_allow_background_starts_title">Разреши тихо стартиране</string>
+  <string name="pref_allow_background_starts_summary">Разреши на всяко приложение да иска от Orbot да стартира Tor услуги</string>
+  <string name="button_proxy_all">Прокси за всички</string>
+  <string name="button_proxy_none">Прокси за нито една</string>
+  <string name="button_invert_selection">Обърни селекцията</string>
+  <string name="pref_proxy_title">Изходящо Мрежово Прокси (Незадължително)</string>
+  <string name="pref_proxy_type_title">Тип прокси</string>
+  <string name="pref_proxy_type_summary">Протокол за прокси сървър: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Тип на входящо прокси</string>
+  <string name="pref_proxy_host_title">Прокси хост</string>
+  <string name="pref_proxy_host_summary">Адреса на Прокси Сървърът</string>
+  <string name="pref_proxy_host_dialog">Въведи прокси хост</string>
+  <string name="pref_proxy_port_title">Порт на прокси</string>
+  <string name="pref_proxy_port_summary">Порта на Прокси Сървърът</string>
+  <string name="pref_proxy_port_dialog">Въведи прокси порт</string>
+  <string name="pref_proxy_username_title">Изходящ Прокси Потребителско Име</string>
+  <string name="pref_proxy_username_summary">Прокси Потребителско Име (Незадължително)</string>
+  <string name="pref_proxy_username_dialog">Въведи Прокси Потребителско Име</string>
+  <string name="pref_proxy_password_title">Изходяща Прокси Парола</string>
+  <string name="pref_proxy_password_summary">Прокси Парола (Незадължително)</string>
+  <string name="pref_proxy_password_dialog">Въведи Прокси Парола</string>
+  <string name="status">Статус</string>
+  <string name="setting_up_full_transparent_proxying_">Конфигуриране на напълно прозрачно прокси...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Конфигуриране на прозрачно прокси на база приложение...</string>
+  <string name="transparent_proxying_enabled">Прозрачно прокси АКТИВНО</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy е включен за Тетъринг!</string>
+  <string name="warning_error_starting_transparent_proxying_">ВНИМАНИЕ: грешка при стартиране на прозрачно проски!</string>
+  <string name="transproxy_rules_cleared">TransProxy правила изчистени</string>
+  <string name="couldn_t_start_tor_process_">Неуспешно стартиране на Тор процес: </string>
+  <string name="privoxy_is_running_on_port_">Polipo работи на порт:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Конфигуриране на прозрачно прокси на база порт...</string>
+  <string name="bridge_error">Бридж грешка</string>
+  <string name="bridge_requires_ip">За да използвате бридж функционалността трябва да въведете поне един IP адрес на бридж.</string>
+  <string name="send_email_for_bridges">Изпрати и-мейл до bridges at torproject.org със съдържание \"get bridges\" в  и-мейл от акаунт в gmail.</string>
+  <string name="error">Грешка</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Твоята ReachableAddresses настройка предизвика грешка!</string>
+  <string name="your_relay_settings_caused_an_exception_">Твоите настройки за препращане предизвикаха изключение!</string>
+  <string name="exit_nodes">Изходни точки</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Отпечатъци, никсове, държави и адреси за последния скок</string>
+  <string name="enter_exit_nodes">Въведи изходни точки</string>
+  <string name="exclude_nodes">Не ползвай Node-ве</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Отпечатъци, никсове, държави и адреси, които да не бъдат ползвани</string>
+  <string name="enter_exclude_nodes">Край</string>
+  <string name="strict_nodes">Задължителни Node-we</string>
+  <string name="use_only_these_specified_nodes">Използвай *само* изброените node-ве</string>
+  <string name="bridges">Бриджове</string>
+  <string name="use_bridges">Използвай Бриджове</string>
+  <string name="bridges_obfuscated">Скрити Мостове</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Включи алтернативени входящи node-ве в Tor Мрежата</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Включи ако настроените мостове са скрити мостове</string>
+  <string name="ip_address_and_port_of_bridges">IP адрес и порт на бриджове</string>
+  <string name="enter_bridge_addresses">Въведи адреси на бриджове</string>
+  <string name="relays">Препращачи(Relays)</string>
+  <string name="relaying">Препращане</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Разреши устройството ти да бъде не изходен препращач</string>
+  <string name="relay_port">Порт за Препращане</string>
+  <string name="listening_port_for_your_tor_relay">Порт за слушане на твоя Тор препращач</string>
+  <string name="enter_or_port">Въведи OR порт</string>
+  <string name="relay_nickname">Прякор на препращача</string>
+  <string name="the_nickname_for_your_tor_relay">Прякор за твоя Tor препращач</string>
+  <string name="enter_a_custom_relay_nickname">Въведи прякор за препращача</string>
+  <string name="reachable_addresses">Достижими адреси</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Стартирай като клиент зад firewall с рестриктивни политики</string>
+  <string name="reachable_ports">Достъпни портове</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Портове достъпни зад firewall с рестриктивни политики</string>
+  <string name="enter_ports">Въведи портове</string>
+  <string name="enable_hidden_services">Включи скрити услуги</string>
+  <string name="run_servers_accessible_via_the_tor_network">стартирай сървъри достъпни през Тор мрежата</string>
+  <string name="enter_localhost_ports_for_hidden_services">въведи локални портове за скрити услуги</string>
+  <string name="hidden_service_ports">Портове на скрити услуги</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Автоматично генериран адрес за твоята скрита услуга(hidden service)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">включи запис на дебъг доклади (трябва да ползвате aLogCat или adb, за да ги разглеждаш)</string>
+  <string name="project_home">Начални Станици на Проектите:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Тор лиценз</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Софтуер на трети страни: </string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Приложение иска да отвори порт на скрит сървър %S към Тор мрежата. Безопасно е да се доверите на приложението.</string>
+  <string name="found_existing_tor_process">намерил си съвместим Tor проект...</string>
+  <string name="something_bad_happened">Нещо лошо се случи. Проверете лога</string>
+  <string name="hidden_service_on">Скрита услуга включена:</string>
+  <string name="unable_to_read_hidden_service_name">не може да прочете име на скрита услуга</string>
+  <string name="unable_to_start_tor">Не може да стартира Тор:</string>
+  <string name="unable_to_reset_tor">Рестартирай устройството си, неуспешно рестариване на Tor!</string>
+  <string name="pref_use_sys_iptables_title">Използвай Iptables по подразбиране</string>
+  <string name="pref_use_sys_iptables_summary">използвай вградените двуични iptables вместо тези идващи с Orbot</string>
+  <string name="error_installing_binares">Двуичните файлове на Тор не бяха инсталирани или обновени.</string>
+  <string name="pref_use_persistent_notifications">Винаги показвай икона в тулбара когато Орбот е свързан</string>
+  <string name="pref_use_persistent_notifications_title">Уведомления винаги включени</string>
+  <string name="pref_use_expanded_notifications">Покажи разширена информация за Tor изходната държава и IP в лентата за известия</string>
+  <string name="pref_use_expanded_notifications_title">Разширени известия</string>
+  <string name="notification_using_bridges">Мостове включени!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Език</string>
+  <string name="set_locale_summary">Избери местоположение и език за Орбот</string>
+  <string name="wizard_locale_title">Избери език</string>
+  <string name="wizard_locale_msg">Остави по подразбиране или смени наличния език</string>
+  <string name="powered_by">базиран на Tor</string>
+  <string name="btn_save_settings">Запази настройки</string>
+  <string name="no_internet_connection_tor">Няма интернет връзка; Tor е в режим на изчакване...</string>
+  <string name="bandwidth_">Скорост:</string>
+  <string name="down">теглене</string>
+  <string name="up">изпращане</string>
+  <string name="pref_disable_network_title">Лиспва Автоматичен Режим на Изчакване</string>
+  <string name="pref_disable_network_summary">Сложи Tor в режим на изчакване, когато няма интернет</string>
+  <string name="newnym">Сменихте своята Тор идентичност!</string>
+  <string name="menu_verify_browser">Браузър</string>
+  <string name="menu_use_chatsecure">Използвай ChatSecure</string>
+  <string name="permission_manage_tor_label">Настрой Tor</string>
+  <string name="permission_manage_tor_description">Разреши тази програма да контролира Tor</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Не изглежда да имате Orfox инсталиран. Желаете ли помощ с това, или просто да отворим браузъра?</string>
+  <string name="install_apps_">Инсталирай програми?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Няма интернет връзка. Преминаване в режим на изчкаване...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Добра интернет връзка. Събуждане на Tor...</string>
+  <string name="updating_settings_in_tor_service">обновяване на настройките в Tor услугата</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Порт, на който Tor предлага своето SOCKS прокси(подразбиране: 9050 или 0, за да забраниш)</string>
+  <string name="pref_socks_dialog">SOCKS Port Config</string>
+  <string name="pref_transport_title">Tor TransProxy Port</string>
+  <string name="pref_transport_summary">Порт, на който Tor предлага своето Transparent прокси прокси(подразбиране: 9040 или 0, за да забраниш)</string>
+  <string name="pref_transport_dialog">TransProxy Port Config</string>
+  <string name="pref_dnsport_title">Tor DNS Port</string>
+  <string name="pref_dnsport_summary">Порт, на който Tor предлага своят DNS (подразбиране: 5400 или 0, за да забраниш)</string>
+  <string name="pref_dnsport_dialog">DNS Port Config</string>
+  <string name="pref_torrc_title">Torrc Custom Config</string>
+  <string name="pref_torrc_summary">САМО ЗА ЕКСПЕРТИ: въведи директно torrc конфигурационният код</string>
+  <string name="pref_torrc_dialog">Ръчно настроен Torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</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_">Моля, забрани тази програма в  Android->Настройки->Приложения ако имаш проблеми с Orbot:</string>
+  <string name="app_conflict">Конфликт с друго приложение</string>
+  <string name="pref_transproxy_refresh_title">Транспрокси автоматично освежаване</string>
+  <string name="pref_transproxy_refresh_summary">Приложи повторно транспрокси правилата при промяна на състоянието на мрежата</string>
+  <string name="pref_transproxy_flush_title">Транспроски ПРИНУДИТЕЛНО ПРЕМАХВАНЕ</string>
+  <string name="pref_transproxy_flush_summary">Натисни тук, за да изтриеш всички транспркси мрежови правила ВЕДНАГА</string>
+  <string name="transparent_proxy_rules_flushed_">Транспрокси правилата изтрити!</string>
+  <string name="you_do_not_have_root_access_enabled">Нямаш ROOT достъп до устройството</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Може да се наложи да спреш и стартираш Orbot, за да могат някои настройки да влязат в действие.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Мостове включени!</string>
+  <string name="restart_orbot_to_use_this_bridge_">Моля, рестартирай Orbot, за да влязат в действие промените</string>
+  <string name="menu_qr">QR Кодове</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Ако вашата мрежа целенасочено блирва Tor, може да използвате Мост, за да се свържете. ИЗБЕРЕТЕ един от видовете мостове изброени по-горе, за да включите тази функционалност.</string>
+  <string name="bridge_mode">Режим мост</string>
+  <string name="get_bridges_email">Имейл</string>
+  <string name="get_bridges_web">Уеб</string>
+  <string name="activate">Активирай</string>
+  <string name="apps_mode">Приложения във VPN режим</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Можеш да настроиш всички приложения да минават през Tor мрежата използвайки VPN функцията на Андроид.\n\n*ПРЕДУПРЕЖДЕНИЕ* Това е нова, експериментална функция и в някои случаи може да не стартира автоматично, или да спре. НЕ бива да се използва за анонимност, а САМО за преминаване през файъруоли и филтри.</string>
+  <string name="send_email">Изпрати имейл</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Можеш да получиш адреса на мост по имейл, интернет или като сканираш QR kod. Избери \'Имейл\' или \'Интернет\' по-долу, за да поискаш адрес на мост.\n\nВеднъж щом получиш адреса го копирай в \"Мостове\", в настройките на Orbot и рестартирай приложението.</string>
+  <string name="install_orweb">Инсталирай Orfox</string>
+  <string name="standard_browser">Нормален Браузър</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">БЕЛЕЖКА: Само стандартни Tor мостове работя на Intel X86/ATOM устройства</string>
+  <string name="vpn_default_world">Свят</string>
+</resources>
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
new file mode 100644
index 0000000..d179a61
--- /dev/null
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">অরবট</string>
+  <string name="app_description">Orbot একটি ফ্রি প্রক্সি অ্যাপ্লিকেশন যা অন্যান্য Apps কে আরও নিরাপদভাবে ইন্টারনেট ব্যবহার করার ক্ষমতাপ্রদান করে।  Orbot আপনার ইন্টারনেট ট্রাফিক এনক্রিপ্ট করতে টর ব্যবহার এবং তারপর সারা বিশ্বের কম্পিউটারের সিরিজের moddho diye porichalito kore gopon kore. টর ফ্রি সফটওয়্যার এবং আপনি ট্রাফিক বিশ্লেষণ হিসেবে পরিচিত ব্যক্তিগত স্বাধীনতা ও গোপনীয়তা, গোপনীয় বাণিজ্যিক কার্যক্রম এবং সম্পর্ক, এবং রà¦
 ¾à¦·à§à¦Ÿà§à¦°à§€à¦¯à¦¼ নিরাপত্তা হুমকির মুখে পড়ে নেটওয়ার্ক নজরদারি একটি ফর্ম বিরুদ্ধে রক্ষা করতে সাহায্য করে যে একটি খোলা নেটওয়ার্ক.</string>
+  <string name="tor_proxy_service_process">টর প্রক্সি সার্ভিস</string>
+  <string name="status_starting_up">অরবট চালু হচ্ছে . . . </string>
+  <string name="status_activated">টর নেটওয়ার্কের সাথে সংযুক্ত হয়েছে</string>
+  <string name="status_disabled">অরবট নিষ্ক্রিয় করা হয়েছে</string>
+  <string name="tor_process_starting">টর ক্লায়েন্ট চালু করা হচ্ছে</string>
+  <string name="tor_process_complete">সম্পূর্ণ</string>
+  <string name="tor_process_waiting">অপেক্ষা করা হচ্ছে</string>
+  <string name="menu_home">হোম</string>
+  <string name="menu_settings">নিয়ম বিন্যাস</string>
+  <string name="menu_info">সাহায্য</string>
+  <string name="menu_start">শুরু</string>
+  <string name="menu_stop">শেষ</string>
+  <string name="button_help">সাহায্য</string>
+  <string name="button_close">বন্ধ</string>
+  <string name="press_to_start">চালু করার জন্য ধরে থাকুন</string>
+  <string name="pref_transparent_all_title">সব কিছু টরের মাধ্যমে করুন </string>
+  <string name="wizard_title">অরবট</string>
+  <string name="btn_next">পরবর্তী</string>
+  <string name="btn_back">পেছনে</string>
+  <string name="btn_finish">শেষ</string>
+  <string name="btn_okay">ঠিক আছে</string>
+  <string name="btn_cancel">বাদ</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_permissions_stock">অরবট এর অনুমতিসমূহ </string>
+  <string name="wizard_permissions_consent">আমি বুঝতে পেরেছি এবং এগিয়ে যেতে চাই Superuser ছাড়া।</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">সাধারণ</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">অনুমতিসমূহ</string>
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/app/src/main/res/values-bn-rIN/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/app/src/main/res/values-bn/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-brx/strings.xml b/app/src/main/res/values-brx/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/app/src/main/res/values-brx/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
new file mode 100644
index 0000000..bcef347
--- /dev/null
+++ b/app/src/main/res/values-bs/strings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_info">Pomoć</string>
+  <string name="button_help">Pomoć</string>
+  <string name="button_close">Zatvori</string>
+  <string name="btn_back">Nazad</string>
+  <string name="btn_cancel">Otkaži</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Proksi postavke</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
new file mode 100644
index 0000000..709b1e4
--- /dev/null
+++ b/app/src/main/res/values-ca/strings.xml
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">https://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">Inicia i atura Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">L\'Orbot s\'està iniciant...</string>
+  <string name="status_activated">Esteu connectat a la xarxa Tor</string>
+  <string name="status_disabled">L\'Orbot està desactivat</string>
+  <string name="tor_process_starting">S\'està iniciant el client Tor...</string>
+  <string name="tor_process_complete">fet.</string>
+  <string name="tor_process_waiting">s\'està esperant.</string>
+  <string name="not_anonymous_yet">ATENCIÓ: El trànsit de la vostra connexió encara no és anònim! Heu de configurar les vostres aplicacions per utilitzar un proxy HTTP a 127.0.0.1:8118, o un proxy SOCKS4A o SOCKS5 a 127.0.0.1:9050</string>
+  <string name="menu_home">Inici</string>
+  <string name="menu_browse">Navega</string>
+  <string name="menu_settings">Preferències</string>
+  <string name="menu_log">Registre</string>
+  <string name="menu_info">Ajuda</string>
+  <string name="menu_start">Inicia</string>
+  <string name="menu_stop">Atura</string>
+  <string name="menu_about">Quant a...</string>
+  <string name="main_layout_download">Baixada</string>
+  <string name="main_layout_upload">Pujada</string>
+  <string name="button_help">Ajuda</string>
+  <string name="button_close">Tanca</string>
+  <string name="button_about">Quant a...</string>
+  <string name="button_clear_log">Esborra el registre</string>
+  <string name="menu_verify">Prova</string>
+  <string name="menu_exit">Surt</string>
+  <string name="press_to_start">- mantén-lo premut per iniciar -</string>
+  <string name="pref_trans_proxy_group">Proxy transparent (requereix Root)</string>
+  <string name="pref_trans_proxy_title">Utilitza un proxy transparent</string>
+  <string name="pref_trans_proxy_summary">Torificació automàtica de les apps</string>
+  <string name="pref_transparent_all_title">Tor per a tot</string>
+  <string name="pref_transparent_all_summary">Canalitza el trànsit de totes les aplicacions a través de Tor</string>
+  <string name="pref_transparent_port_fallback_title">Port alternatiu per al proxy </string>
+  <string name="pref_transparent_port_fallback_summary">ATENCIÓ: Això trampeja els ports habituals (80, 443, etc.) *UTILITZEU-HO NOMÉS* si el mode «Totes» o «App» no funcionen.</string>
+  <string name="pref_transparent_port_title">Llista de ports</string>
+  <string name="pref_transparent_port_summary">Llista de ports a canalitzar per proxy. *UTILITZEU-HO NOMÉS* si el mode «Totes» o «App» no funcionen.</string>
+  <string name="pref_transparent_port_dialog">Introduïu els ports a canalitzar per proxy</string>
+  <string name="pref_has_root">Demana l\'accés root</string>
+  <string name="pref_has_root_summary">Demana l\'accés root per a la canalització a través de proxy transparent</string>
+  <string name="status_install_success">Els binaris de Tor s\'han instal·lat correctament.</string>
+  <string name="status_install_fail">Els fitxers binaris de Tor no s\'han pogut instal·lar. Comproveu el registre i notifiqueu-ho a tor-assistants at torproject.org</string>
+  <string name="title_error">Error de l\'aplicació</string>
+  <string name="wizard_title">Us donem la benvinguda a l\'Orbot</string>
+  <string name="wizard_btn_tell_me_more">Quant a Orbot...</string>
+  <string name="btn_next">Següent</string>
+  <string name="btn_back">Enrere</string>
+  <string name="btn_finish">Fi</string>
+  <string name="btn_okay">D\'acord</string>
+  <string name="btn_cancel">Cancel·la</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Alguns detalls de l\'Orbot...</string>
+  <string name="wizard_permissions_root">Permís concedit</string>
+  <string name="wizard_permissions_stock">Permisos de l\'Orbot</string>
+  <string name="wizard_premissions_msg_root">Perfecte! Hem detectat que teniu els permisos root activats per a l\'Orbot. Utilitzarem aquesta capacitat amb sensatesa.</string>
+  <string name="wizard_permissions_msg_stock">Encara que no és imprescindible, l\'Orbot pot esdevenir una eina molt més potent si el vostre terminal té accés root. Utilitzeu el botó d\'aquí sota per concedir superpoders a l\'Orbot!</string>
+  <string name="wizard_permissions_no_root">Si no teniu accés root, o no teniu ni idea del què us estem parlant, simplement assegureu-vos d\'utilitzar aplicacions dissenyades per funcionar amb l\'Orbot.</string>
+  <string name="wizard_permissions_consent">Ho entenc i vull continuar sense accés de superusuari</string>
+  <string name="wizard_permission_enable_root">Concedeix accés root a l\'Orbot</string>
+  <string name="wizard_configure">Configura la connexió a Tor</string>
+  <string name="wizard_configure_msg">L\'Orbot us ofereix l\'opció de canalitzar el trànsit de totes les aplicacions a través de Tor o bé escollir quines aplicacions voleu que utilitzin Tor.</string>
+  <string name="wizard_configure_all">Canalitza totes les aplicacions a través de Tor.</string>
+  <string name="wizard_configure_select_apps">Selecciona les aplicacions individualment</string>
+  <string name="wizard_tips_tricks">Aplicacions per utilitzar amb l\'Orbot</string>
+  <string name="wizard_tips_msg">Les aplicacions d\'aquí sota s\'han dissenyat per funcionar amb l\'Orbot. Feu clic a cada botó per instalar-les ara, o busqueu-les després a Google Play Store, al lloc web de GuardianProject.info o a F-Droid.org.</string>
+  <string name="wizard_tips_otrchat">ChatSecure - Client de missatgeria instantània segura per a Android</string>
+  <string name="wizard_tips_proxy">Proxy Settings - Aprèn a configurar aplicacions per a què funcionin amb l\'Orbot</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo - Aplicació de cerca al web</string>
+  <string name="wizard_tips_twitter">Estableix el proxy de Twitter a l\'amfitrió «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">Ajustaments del proxy</string>
+  <string name="wizard_final">L\'Orbot és a punt!</string>
+  <string name="wizard_exit_at_first_screen_toast">Configureu l\'Orbot abans d\'utilitzar-lo!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">S\'obrirà el vostre navegador web a https://check.torproject.org per tal de comprovar si l\'Orbot està ben configurat i estàs connectat a Tor.</string>
+  <string name="pref_hs_group">Serveis ocults</string>
+  <string name="pref_general_group">General</string>
+  <string name="pref_start_boot_title">Inicia l\'Obot a l\'arrencada</string>
+  <string name="pref_start_boot_summary">Inicia l\'Orbot i connecta a Tor automàticament quan el vostre dispositiu Android arrenca.</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Advertència</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permisos</string>
+  <string name="wizard_permissions_root_msg1">Opcionalment podeu concedir accés «superusuari» a l\'Orbot per activar funcions avançades, com el servidor intermediari transparent.</string>
+  <string name="wizard_permissions_root_msg2">Si no voleu fer això assegureu-vos de fer servir aplicacions dissenyades per funcionar amb l\'Orbot.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Trobareu totes les aplicacions de Guardian Project a Google Play Store</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Servidor intermediari transparent</string>
+  <string name="wizard_transproxy_msg">Això permet que les vostres aplicacions es connectin a través de la xarxa Tor sense haver de configurar res.</string>
+  <string name="wizard_transproxy_hint">(Marqueu aquesta casella si no teniu ni idea del que estem parlant)</string>
+  <string name="wizard_transproxy_none">Cap</string>
+  <string name="pref_transparent_tethering_title">Compartició de xarxa amb Tor</string>
+  <string name="pref_transparent_tethering_summary">Activa el servidor intermediari transparent de Tor pels dispositius connectats a través de la compartició de xarxa via Wifi o USB (cal reiniciar)</string>
+  <string name="button_grant_superuser">Petició d\'accés de superusuari</string>
+  <string name="pref_select_apps">Selecciona les apps</string>
+  <string name="pref_select_apps_summary">Trieu quines apps s\'han de canalitzar a través de Tor</string>
+  <string name="pref_node_configuration">Configuració de node</string>
+  <string name="pref_node_configuration_summary">Aquests són paràmetres avançats que poden reduir el vostre anonimat</string>
+  <string name="pref_entrance_node">Node d\'entrada</string>
+  <string name="pref_entrance_node_summary">Empremtes, àlies, països i adreces pel primer salt</string>
+  <string name="pref_entrance_node_dialog">Introduïu els nodes d\'entrada</string>
+  <string name="button_proxy_all">Totes via proxy</string>
+  <string name="button_proxy_none">Cap via proxy</string>
+  <string name="button_invert_selection">Inverteix selecció</string>
+  <string name="pref_proxy_title">Servidor intermediari de sortida a la xarxa (opcional)</string>
+  <string name="pref_proxy_type_title">Tipus de servidor intermediari de sortida</string>
+  <string name="pref_proxy_type_summary">Protocol a utilitzar pel servidor intermediari: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Introduïu el tipus de servidor intermediari</string>
+  <string name="pref_proxy_host_title">Amfitrió del servidor intermediari de sortida</string>
+  <string name="pref_proxy_host_summary">Nom de l\'amfitrió del servidor intermediari</string>
+  <string name="pref_proxy_host_dialog">Introduïu l\'amfitrió del servidor intermediari</string>
+  <string name="pref_proxy_port_title">Port del servidor intermediari de sortida</string>
+  <string name="pref_proxy_port_summary">Port del servidor intermediari</string>
+  <string name="pref_proxy_port_dialog">Introduïu el port del servidor intermediari</string>
+  <string name="pref_proxy_username_title">Nom d\'usuari del servidor intermediari de sortida</string>
+  <string name="pref_proxy_username_summary">Nom d\'usuari del servidor intermediari (opcional)</string>
+  <string name="pref_proxy_username_dialog">Introduïu el nom d\'usuari del servidor intermediari</string>
+  <string name="pref_proxy_password_title">Contrasenya del servidor intermediari de sortida</string>
+  <string name="pref_proxy_password_summary">Contrasenya del servidor intermediari (opcional)</string>
+  <string name="pref_proxy_password_dialog">Introduïu la contrasenya del servidor intermediari</string>
+  <string name="status">Estat</string>
+  <string name="setting_up_full_transparent_proxying_">S\'està configurant el servidor intermediari transparent complet...</string>
+  <string name="setting_up_app_based_transparent_proxying_">S\'està configurant el servidor intermediari transparent per apps...</string>
+  <string name="transparent_proxying_enabled">S\'ha ACTIVAT el servidor intermediari transparent</string>
+  <string name="transproxy_enabled_for_tethering_">S\'ha activat el servidor intermediari per la compartició de xarxa</string>
+  <string name="warning_error_starting_transparent_proxying_">ATENCIÓ: hi ha hagut un error en iniciar el servidor intermediari transparent</string>
+  <string name="transproxy_rules_cleared">S\'han esborrat les regles del servidor intermediari transparent</string>
+  <string name="couldn_t_start_tor_process_">No s\'ha pogut iniciar el procés Tor:</string>
+  <string name="setting_up_port_based_transparent_proxying_">S\'està configurant el servidor intermediari transparent per ports...</string>
+  <string name="bridge_error">Hi ha hagut un error de pont</string>
+  <string name="bridge_requires_ip">Per poder utilitzar la funcionalitat de pont, cal que introduïu almenys una adreça IP de pont.</string>
+  <string name="send_email_for_bridges">Envieu un correu a bridges at torproject.org amb la línia «get bridges» sola al cos del missatge des d\'un compte de gmail.</string>
+  <string name="error">Error</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Els paràmetres d\'adreces accessibles han provocat una excepció.</string>
+  <string name="your_relay_settings_caused_an_exception_">Els paràmetres de reemissió han causat una excepció.</string>
+  <string name="exit_nodes">Nodes de sortida</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Empremtes, àlies, països i adreces per l\'últim salt</string>
+  <string name="enter_exit_nodes">Introduïu els nodes de sortida</string>
+  <string name="exclude_nodes">Nodes per excloure</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Empremtes, àlies, països i adreces per excloure</string>
+  <string name="enter_exclude_nodes">Introduïu nodes per excloure</string>
+  <string name="strict_nodes">Nodes estrictes</string>
+  <string name="use_only_these_specified_nodes">Utilitza *només* aquests nodes especificats</string>
+  <string name="bridges">Ponts</string>
+  <string name="use_bridges">Utilitza ponts</string>
+  <string name="bridges_obfuscated">Ponts ofuscats</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Activa nodes alternatius d\'entrada a la xarxa Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Activeu-ho si els ponts configurats són ponts ofuscats</string>
+  <string name="ip_address_and_port_of_bridges">Adreça IP i port dels ponts</string>
+  <string name="enter_bridge_addresses">Introduïu les adreces del pont</string>
+  <string name="relays">Reemissors</string>
+  <string name="relaying">Reemissió</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Activa el vostre dispositiu per ser un reemissor sense sortida</string>
+  <string name="relay_port">Port de reemissió</string>
+  <string name="listening_port_for_your_tor_relay">Port d\'escolta per la vostra reemissió de Tor</string>
+  <string name="enter_or_port">Introduïu el port OR</string>
+  <string name="relay_nickname">Àlies del reemissor</string>
+  <string name="the_nickname_for_your_tor_relay">L\'àlies pel vostre reemissor de Tor</string>
+  <string name="enter_a_custom_relay_nickname">Introduïu un àlies personalitzat pel vostre reemissor</string>
+  <string name="reachable_addresses">Adreces accessibles</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">S\'executa com a client darrera d\'un tallafocs amb normes restrictives</string>
+  <string name="reachable_ports">Ports accessibles</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Ports que es poden accedir darrera d\'un tallafocs restrictiu</string>
+  <string name="enter_ports">Introduïu els ports</string>
+  <string name="enable_hidden_services">Allotjament de servei ocult</string>
+  <string name="run_servers_accessible_via_the_tor_network">Permet que un servidor al dispositiu sigui accessible des de la xarxa Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">introduïu els ports de l\'amfitrió local pels serveis ocults</string>
+  <string name="hidden_service_ports">Ports del servei coult</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">el nom adreçable pel vostre servei ocult (generat automàticament)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">activa la sortida del registre de depuració (cal utilitzar l\'adb o l\'aLogCat per veure\'l)</string>
+  <string name="project_home">Lloc(s) web del projecte:</string>
+  <string name="the_tor_license">La llicència Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Programari de terceres parts:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Una aplicació vol obrir el port %S de servei ocult a la xarxa Tor. Això és segur si confieu en l\'aplicació.</string>
+  <string name="found_existing_tor_process">s\'ha trobat un procés Tor existent...</string>
+  <string name="something_bad_happened">Ha fallat alguna cosa. Comproveu el registre</string>
+  <string name="hidden_service_on">servei ocult a:</string>
+  <string name="unable_to_read_hidden_service_name">ha estat impossible llegir el nom del servei ocult</string>
+  <string name="unable_to_start_tor">Ha estat impossible iniciar Tor:</string>
+  <string name="pref_use_sys_iptables_title">Utilitza les Iptables per defecte</string>
+  <string name="pref_use_sys_iptables_summary">utilitza el binari incorporat amb l\'Iptables enlloc del que porta l\'Orbot</string>
+  <string name="error_installing_binares">Els binaris de Tor no s\'han pogut instal·lar o actualitzar.</string>
+  <string name="pref_use_persistent_notifications">Manté la icona sempre a la barra d\'eines mentre l\'Orbot està connectat</string>
+  <string name="pref_use_persistent_notifications_title">Notificacions sempre activades</string>
+  <string name="notification_using_bridges">Ponts activats.</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Trieu la localització i la llengua per l\'Orbot</string>
+  <string name="wizard_locale_title">Tria la llengua</string>
+  <string name="wizard_locale_msg">Deixa-ho per defecte o canvia la llengua actual</string>
+  <string name="powered_by">funciona amb Tor</string>
+  <string name="btn_save_settings">Desa els paràmetres</string>
+  <string name="bandwidth_">Ample de banda:</string>
+  <string name="down">baixada</string>
+  <string name="up">pujada</string>
+  <string name="pref_disable_network_title">No hi ha autodesconnexió de xarxa</string>
+  <string name="pref_disable_network_summary">Posa el Tor en pausa mentre no hi ha connexió a internet</string>
+  <string name="newnym">Heu canviat a una nova identitat Tor.</string>
+  <string name="menu_use_chatsecure">Utilitza ChatSecure</string>
+  <string name="permission_manage_tor_label">Gestiona Tor</string>
+  <string name="permission_manage_tor_description">Activa aquesta app per controlar el servei Tor</string>
+  <string name="install_apps_">Voleu instal·lar les apps?</string>
+  <string name="your_tor_public_ips_">Les vostres IP públiques de Tor:</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="get_bridges_email">Correu-e</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Activa</string>
+  <string name="standard_browser">Navegador estàndard</string>
+</resources>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
new file mode 100644
index 0000000..468e0b4
--- /dev/null
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">spustit a vypnout Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot se spouští...</string>
+  <string name="status_activated">Připojen k síti Tor</string>
+  <string name="status_disabled">Orbot je deaktivován</string>
+  <string name="tor_process_starting">Startuji Tor klienta...</string>
+  <string name="tor_process_complete">hotovo.</string>
+  <string name="tor_process_waiting">čekám.</string>
+  <string name="not_anonymous_yet">VAROVÁNÍ: Vaše komunikace ještě není anonymní! Prosím nastavte vašim aplikacím HTTP proxy 127.0.0.1:8118 nebo SOCKS4A či SOCKS5 proxy 172.0.0.1:9050</string>
+  <string name="menu_home">Domů</string>
+  <string name="menu_browse">Prohlížet</string>
+  <string name="menu_settings">Nastavení</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Pomoc</string>
+  <string name="menu_start">Zapnout</string>
+  <string name="menu_stop">Vypnout</string>
+  <string name="menu_about">O aplikaci</string>
+  <string name="main_layout_download">Stáhnout</string>
+  <string name="main_layout_upload">Nahrát</string>
+  <string name="button_help">Nápověda</string>
+  <string name="button_close">Zavřít</string>
+  <string name="button_about">O aplikaci</string>
+  <string name="button_clear_log">Vyčistit log</string>
+  <string name="menu_verify">Ověřit</string>
+  <string name="menu_exit">Konec</string>
+  <string name="press_to_start">- podržte pro spuštění -</string>
+  <string name="pref_trans_proxy_group">Transparentní proxy (vyžaduje roota)</string>
+  <string name="pref_trans_proxy_title">Transparentní proxy</string>
+  <string name="pref_trans_proxy_summary">Automatické Torování aplikací</string>
+  <string name="pref_transparent_all_title">Torovat všechno</string>
+  <string name="pref_transparent_all_summary">Proxynovat všechny aplikace skrz Tor</string>
+  <string name="pref_transparent_port_fallback_title">Záložní port pro proxy</string>
+  <string name="pref_transparent_port_fallback_summary">VAROVÁNÍ: Obchází běžné porty (80, 443, etc). *POUŽIJTE JEN* pokud módy \'All\' nebo \'App\' nefungují.</string>
+  <string name="pref_transparent_port_title">Seznam portů</string>
+  <string name="pref_transparent_port_summary">Seznam portů co proxynovat. *POUŽIJTE JEN* pokud módy \'All\' nebo \'App\' nefungují</string>
+  <string name="pref_transparent_port_dialog">Zadejte porty pro proxynování</string>
+  <string name="pref_has_root">Vyžaduje root přístup</string>
+  <string name="pref_has_root_summary">Požádat o práva roota kvůli transparentnímu proxy</string>
+  <string name="status_install_success">Binárky toru byly úspěšně nainstalovány!</string>
+  <string name="status_install_fail">Nebylo možno nainstalovat binárky Toru. Prosím zkontrolujte log a upozorněte tor-assistants at torproject.org</string>
+  <string name="title_error">Chyba aplikace</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">O Orbotovi</string>
+  <string name="btn_next">Další</string>
+  <string name="btn_back">Zpět</string>
+  <string name="btn_finish">Dokončit</string>
+  <string name="btn_okay">Budiž</string>
+  <string name="btn_cancel">Zrušit</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Pár detailů o Orbot</string>
+  <string name="wizard_permissions_root">Práva udělena</string>
+  <string name="wizard_permissions_stock">Oprávnění Orbota</string>
+  <string name="wizard_premissions_msg_root">Výborně! Bylo detekováno, že root oprávnění bylo Orbotu uděleno. Budeme tuto sílu užívat moudře.</string>
+  <string name="wizard_permissions_msg_stock">I když to není nutné, Orbot může pracovat lépe, pokud má vaše zařízení root. Použijte tlačítko dole pro udělení supersíly Orbotovi. </string>
+  <string name="wizard_permissions_no_root">Pokud nemáte přístup roota, nebo nevíte, o co se jedná, ujistěte se, že používáte aplikace, které s Orbotem spolupracují.</string>
+  <string name="wizard_permissions_consent">Rozumín a přeji si pokračovat bez roota (superuživatelských oprávnění)</string>
+  <string name="wizard_permission_enable_root">Udělit Orbotovi root oprávnění</string>
+  <string name="wizard_configure">Nastavení Torování</string>
+  <string name="wizard_configure_msg">Orbot umožňuje směrovat datový provoz všech aplikací přes Tor NEBO zvolit aplikace individuálně.</string>
+  <string name="wizard_configure_all">Tor Proxy pro všechny aplikace</string>
+  <string name="wizard_configure_select_apps">Zvolit aplikace pro Tor individuálně</string>
+  <string name="wizard_tips_tricks">Aplikace povolené pro Orbota</string>
+  <string name="wizard_tips_msg">Aplikace níže byly vyvinuty tak, aby spolupracovaly s Orbotem. Klikněte na každé tlačítko pro instalaci, aplikace můžete najít i v Obchodu Play nebo na webu GuardianProject.info či F-Droid.org.</string>
+  <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="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>
+  <string name="wizard_final">Orbot je připraven!</string>
+  <string name="wizard_exit_at_first_screen_toast">Orbot musíte nejdříve nastavit, než ho začnete používat!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Tato volba otevře ve webovém prohlížeči stránku https://check.torproject.org pro kontrolu, jestli je Orbot správně nastaven a jste připojen k Tor.</string>
+  <string name="pref_hs_group">Skrytý hosting služby</string>
+  <string name="pref_general_group">Obecné</string>
+  <string name="pref_start_boot_title">Spustit Orbot při startu systému</string>
+  <string name="pref_start_boot_summary">Automaticky spustit Orbot a připojit se k Tor po startu zařízení</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Varování</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Oprávnění</string>
+  <string name="wizard_permissions_root_msg1">Volitelně můžete Orbotu udělit \'siperuýivatelský\' (root) přístup pto povolení rozšířených funkcí, například transparentní proxy.</string>
+  <string name="wizard_permissions_root_msg2">Pokud si to nepřejete, používejte prosím aplikace napsané tak, aby spolupracovaly s Orbotem</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Najděte všechny aplikace Guardian Projektu na Obchodu Play</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparentní proxy</string>
+  <string name="wizard_transproxy_msg">Toto povolí aplikacím automaticky běžet přes Tor síť bez jakéhokoliv nastavování.</string>
+  <string name="wizard_transproxy_hint">(Povolte tuto volbu, pokud nemáte ponětí, o co se jedná)</string>
+  <string name="wizard_transproxy_none">Žádné</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Povolit Tor transparentní proxy pro zařízení připojená přes Wifi a USB tethering (vyžaduje restart)</string>
+  <string name="button_grant_superuser">Požadavek na Superuživatelský přístup</string>
+  <string name="pref_select_apps">Vybrat aplikace</string>
+  <string name="pref_select_apps_summary">Zvolte aplikace používající směrováni přes Tor</string>
+  <string name="pref_node_configuration">Konfigurace uzlu (nodu)</string>
+  <string name="pref_node_configuration_summary">Tato rozšířená nastavení mohou snížit vaši anonymitu</string>
+  <string name="pref_entrance_node">Vstupní nody</string>
+  <string name="pref_entrance_node_summary">Otisky (fingerprints), přezdívky serveru (nicks), státy a adresy pro první skok (hop)</string>
+  <string name="pref_entrance_node_dialog">Zadejte vstupní nody</string>
+  <string name="button_invert_selection">Převrátit výběr</string>
+  <string name="pref_proxy_title">Odchozí síťová proxy (volitelné)</string>
+  <string name="pref_proxy_type_title">Typ odchozí proxy</string>
+  <string name="pref_proxy_type_summary">Protokol pro proxy server: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Zadejte typ proxy</string>
+  <string name="pref_proxy_host_title">Hostitel odchozí proxy</string>
+  <string name="pref_proxy_host_summary">Jméno hostitele proxy serveru</string>
+  <string name="pref_proxy_host_dialog">Zadejte hostitele proxy</string>
+  <string name="pref_proxy_port_title">Port odchozí proxy</string>
+  <string name="pref_proxy_port_summary">Port proxy serveru</string>
+  <string name="pref_proxy_port_dialog">Zadejte proxy port</string>
+  <string name="pref_proxy_username_title">Uživatelské jméno odchozí proxy</string>
+  <string name="pref_proxy_username_summary">Proxy uživatelské jméno (volitelné)</string>
+  <string name="pref_proxy_username_dialog">Zadejte Proxy uživatelské jméno</string>
+  <string name="pref_proxy_password_title">Heslo odchozí proxy</string>
+  <string name="pref_proxy_password_summary">Proxy heslo (volitelné)</string>
+  <string name="pref_proxy_password_dialog">Zadejte Proxy heslo</string>
+  <string name="status">Stav</string>
+  <string name="setting_up_full_transparent_proxying_">Nastavuji transparentní proxy…</string>
+  <string name="setting_up_app_based_transparent_proxying_">Nastavení na aplikacích založené transparentní proxy...</string>
+  <string name="transparent_proxying_enabled">Transparentní proxy POVOLENA</string>
+  <string name="transproxy_enabled_for_tethering_">Transparentní proxy povolena pro Tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">VAROVÁNÍ: chyba při startu transparentní proxy!</string>
+  <string name="transproxy_rules_cleared">Pravidla TransProxy vymazána</string>
+  <string name="couldn_t_start_tor_process_">Nelze spustit Tor proces:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Nastavení na portu založené transparentní proxy...</string>
+  <string name="bridge_error">Chyba bridge</string>
+  <string name="bridge_requires_ip">Pro použití bridge musíte zadat minimálné jednu IP adresu bridge.</string>
+  <string name="send_email_for_bridges">Zašlete email pouze s řádkem \"get bridges\" v obsahu zprávy z vašeho gmail účtu na adresu bridges at torproject.org</string>
+  <string name="error">Chyba</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Vaše nastavení dostupných adres (ReachableAddresses) způsobilo chybu!</string>
+  <string name="your_relay_settings_caused_an_exception_">Vaše nastavení relace způsobilo výjimku!</string>
+  <string name="exit_nodes">Výstupní nody</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Otisky (fingerprints), přezdívky serveru (nicks), státy a adresy pro poslední skok (hop)</string>
+  <string name="enter_exit_nodes">Zadejte výstupní nody</string>
+  <string name="exclude_nodes">Vyloučené nody</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Otisky (fingerprints), přezdívky serveru (nicks), státy a adresy pro vyloučené nody</string>
+  <string name="enter_exclude_nodes">Zadejte nody k vyloučení</string>
+  <string name="strict_nodes">Striktní nody</string>
+  <string name="use_only_these_specified_nodes">Použít *pouze* tyto specifické nody</string>
+  <string name="bridges">Bridge</string>
+  <string name="use_bridges">Použít bridge</string>
+  <string name="bridges_obfuscated">Matoucí bridge (Obfuscated Bridges)</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Povolit alternativní vstupní nody do sítě Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Povolte, pokud jsou nastavené bridge matoucí bridge</string>
+  <string name="ip_address_and_port_of_bridges">IP adresy a porty bridgů</string>
+  <string name="enter_bridge_addresses">Zadejte adresy bridgů</string>
+  <string name="relays">Relé</string>
+  <string name="relaying">Používání relé</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Spuštění zařízení jako neodchozího relé</string>
+  <string name="relay_port">Port relé</string>
+  <string name="listening_port_for_your_tor_relay">Naslouchání Vašeho Tor relé</string>
+  <string name="enter_or_port">Zadejte OR port</string>
+  <string name="relay_nickname">Přezdívka relé</string>
+  <string name="the_nickname_for_your_tor_relay">Přezdívka Vašeho Tor relé</string>
+  <string name="enter_a_custom_relay_nickname">Zadejte klientskou přezdívku relé</string>
+  <string name="reachable_addresses">Dostupné adresy</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Běžet jako klient za firewallem s restriktivní politikou</string>
+  <string name="reachable_ports">Dostupné porty</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Porty dostupné za restriktivním firewallem</string>
+  <string name="enter_ports">Zadejte porty</string>
+  <string name="enable_hidden_services">Skrytý hosting služby</string>
+  <string name="run_servers_accessible_via_the_tor_network">umožnit serveru na zařízení být přístupné skrze síť Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">vložte porty localhostu pro skryté služby</string>
+  <string name="hidden_service_ports">Skryté porty služby</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">adresovatelné jméno pro vaši skrytou službu (generováno automaticky)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">umožnit ladicí informace na výstup (musí používat adb nebo aLogCat k prohlížení)</string>
+  <string name="project_home">Domovské(á) umístění projektu</string>
+  <string name="the_tor_license">Tor Licence</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Software třetích stran:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Aplikace požaduje otevření skrytého portu serveru %S k síti Tor. Toto je bezpečně, pokud aplikaci důvěřujete.</string>
+  <string name="found_existing_tor_process">nalezev existující Tor proces…</string>
+  <string name="something_bad_happened">Stalo se něco špatného. Zkontrolujte log</string>
+  <string name="hidden_service_on">skrytá služba na:</string>
+  <string name="unable_to_read_hidden_service_name">nelze číst název skryté služby</string>
+  <string name="unable_to_start_tor">Nelze spustit Tor:</string>
+  <string name="unable_to_reset_tor">Restartujte vaše zařízení, nejsme schopni resetovat Tor!</string>
+  <string name="pref_use_sys_iptables_title">Použít defaultní Iptables</string>
+  <string name="pref_use_sys_iptables_summary">použít vestavěné iptables binárky místo těch dodávaných s Orbotem</string>
+  <string name="error_installing_binares">Nelze nainstalovat nebo aktualizovat Tor binárky.</string>
+  <string name="pref_use_persistent_notifications">Vždy zobrazit ikonu ve stavovém řádku, pokud je Orbot připojen.</string>
+  <string name="pref_use_persistent_notifications_title">Notifikace vždy zapnuté</string>
+  <string name="notification_using_bridges">Bridge povoleny!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Jazyk</string>
+  <string name="set_locale_summary">Zvolte jazyk pro Orbot</string>
+  <string name="wizard_locale_title">Zvolte jazyk</string>
+  <string name="wizard_locale_msg">Ponechat standartní, nebo přepnout stávající jazyk</string>
+  <string name="btn_save_settings">Uložit nastavení</string>
+  <string name="bandwidth_">Šířka pásma:</string>
+  <string name="down">stahování</string>
+  <string name="up">nahrávání</string>
+  <string name="pref_disable_network_title">Vypnout uspávání sítě</string>
+  <string name="pref_disable_network_summary">Uspat Tor když není k dispozici přístup k Internetu</string>
+  <string name="newnym">Vaše identita na Toru byla změněna!</string>
+  <string name="menu_use_chatsecure">Použít ChatSecure</string>
+  <string name="permission_manage_tor_label">Spravovat Tor</string>
+  <string name="permission_manage_tor_description">Umožnit této aplikaci ovládat službu Tor</string>
+  <string name="install_apps_">Nainstalovat aplikace?</string>
+  <string name="restart_orbot_to_use_this_bridge_">Pro projevení změn restartujte Orbot</string>
+  <string name="menu_qr">QR kódy</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Aktivovat</string>
+  <string name="send_email">Pošli email</string>
+  <string name="standard_browser">Standartní prohlížeč</string>
+</resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
new file mode 100644
index 0000000..65e386f
--- /dev/null
+++ b/app/src/main/res/values-cs/strings.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">spustit a vypnout Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot se spouští…</string>
+  <string name="status_activated">Připojen k síti Tor</string>
+  <string name="status_disabled">\"Orbot je deaktivován</string>
+  <string name="status_shutting_down">Orbot se vypíná</string>
+  <string name="tor_process_starting">Startuji Tor klienta…</string>
+  <string name="tor_process_complete">hotovo.</string>
+  <string name="tor_process_waiting">čekám.</string>
+  <string name="not_anonymous_yet">VAROVÁNÍ: Vaše komunikace ještě není anonymní! Prosím nastavte vašim aplikacím HTTP proxy 127.0.0.1:8118 nebo SOCKS4A či SOCKS5 proxy 172.0.0.1:9050</string>
+  <string name="menu_home">Domů</string>
+  <string name="menu_browse">Prohlížet</string>
+  <string name="menu_settings">Nastavení</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Pomoc</string>
+  <string name="menu_apps">Aplikace</string>
+  <string name="menu_start">Zapnout</string>
+  <string name="menu_stop">Vypnout</string>
+  <string name="menu_about">O aplikaci</string>
+  <string name="button_help">Pomoc</string>
+  <string name="button_close">Zavřít</string>
+  <string name="button_about">O aplikaci</string>
+  <string name="button_clear_log">Vyčistit log</string>
+  <string name="menu_verify">Ověřit</string>
+  <string name="menu_exit">Konec</string>
+  <string name="press_to_start">- podržte pro spuštění -</string>
+  <string name="pref_trans_proxy_group">Transparentní proxy (vyžaduje roota)</string>
+  <string name="pref_trans_proxy_title">Transparentní proxy</string>
+  <string name="pref_trans_proxy_summary">Automatické Torování aplikací</string>
+  <string name="pref_transparent_all_title">Torovat všechno</string>
+  <string name="pref_transparent_all_summary">Proxynovat všechny aplikace skrz Tor</string>
+  <string name="pref_transparent_port_fallback_title">Záložní port pro proxy</string>
+  <string name="pref_transparent_port_fallback_summary">VAROVÁNÍ: Obchází časté porty (80, 443, etc). *POUŽIJTE JEN* pokud módy \'All\' nebo \'App\' nefungují.</string>
+  <string name="pref_transparent_port_title">Seznam portů</string>
+  <string name="pref_transparent_port_summary">Seznam portů co proxynovat. *POUŽIJTE JEN* pokud módy \'All\' nebo \'App\' nefungují</string>
+  <string name="pref_transparent_port_dialog">Zadejte porty pro proxynování</string>
+  <string name="pref_has_root">Vyžaduje root přístup</string>
+  <string name="pref_has_root_summary">Požádat o práva roota kvůli transparentnímu proxy</string>
+  <string name="status_install_success">Binárky toru byly úspěšně nainstalovány!</string>
+  <string name="title_error">Chyba aplikace</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">O Orbotovi</string>
+  <string name="btn_next">Další</string>
+  <string name="btn_back">Zpět</string>
+  <string name="btn_finish">Dokončit</string>
+  <string name="btn_cancel">Zrušit</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_permissions_root">Práva udělena</string>
+  <string name="wizard_proxy_help_info">Nastavení Proxy</string>
+  <string name="wizard_final">Orbot je připraven!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Hlavní</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Varování</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparentní proxy</string>
+  <string name="wizard_transproxy_none">Není</string>
+  <string name="status">Status</string>
+  <string name="error">Chyba</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Uloz nastaveni</string>
+  <string name="menu_vpn">Aplikace</string>
+</resources>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
new file mode 100644
index 0000000..a48a10a
--- /dev/null
+++ b/app/src/main/res/values-cy/strings.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">cychwyn a stopio Tor</string>
+  <string name="tor_proxy_service_process">gwasanaethdirpwrytor</string>
+  <string name="status_starting_up">Mae Orbot yn cychwyn...</string>
+  <string name="status_activated">Wedi cysylltu â rhwydwaith Tor</string>
+  <string name="tor_process_starting">Yn cychwyn cleient Tor</string>
+  <string name="tor_process_complete">Wedi ei gwblhau.</string>
+  <string name="tor_process_waiting">yn aros.</string>
+  <string name="not_anonymous_yet">RHYBUDD: Nid yw eich traffig yn ddienw eto! Os gwelwch yn dda ffurfweddu eich ceisiadau at arfer HTTP proxy 127.0.0.1:8118 neu SOCKS4A neu ddirprwy SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Hafan</string>
+  <string name="menu_browse">Pori</string>
+  <string name="menu_settings">Gosodiadau</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Help</string>
+  <string name="menu_start">Cychwyn</string>
+  <string name="menu_stop">Stop</string>
+  <string name="menu_about">Amdanom ni</string>
+  <string name="main_layout_download">Llwytho i lawr</string>
+  <string name="main_layout_upload">Llwytho i fyny</string>
+  <string name="button_help">Help</string>
+  <string name="button_close">Cau</string>
+  <string name="button_about">Amdanom ni</string>
+  <string name="button_clear_log">Clirio log</string>
+  <string name="menu_verify">Gwirio</string>
+  <string name="menu_exit">Gadael</string>
+  <string name="press_to_start">- pwyswch yn hir i gychwyn -</string>
+  <string name="pref_trans_proxy_group">Dirprwyo tryloyw (angen Gwreiddyn)</string>
+  <string name="pref_trans_proxy_title">Dirprwyo tryloyw</string>
+  <string name="pref_trans_proxy_summary">\'Torifying\' o Apps yn awtomatig</string>
+  <string name="pref_transparent_all_title">Popeth Tor</string>
+  <string name="pref_transparent_all_summary">Traffig dirprwy i\'r holl apps drwy Tor</string>
+  <string name="pref_transparent_port_title">Rhestr Porthau</string>
+  <string name="pref_transparent_port_summary">Rhestr o borthau i\'w dirprwyo. *DEFNYDDIER YN UNIG* os nad yw modd \'Popeth\' neu \'App\' yn gweithio</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Am Orbot</string>
+  <string name="btn_next">Nesaf</string>
+  <string name="btn_back">Yn ôl</string>
+  <string name="btn_finish">Gorffen</string>
+  <string name="btn_okay">Iawn</string>
+  <string name="btn_cancel">Diddymu</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Rhai manylion am Orbot</string>
+  <string name="wizard_permissions_root">Caniatâd wedi\'i roi</string>
+  <string name="wizard_proxy_help_info">Gosodiadau Dirprwy</string>
+  <string name="wizard_final">Mae Orbot yn barod!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Cyffredinol</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Rhybudd</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Dirprwyo\'n dryloyw</string>
+  <string name="wizard_transproxy_none">Dim</string>
+  <string name="pref_select_apps">Dewiswch Apps</string>
+  <string name="pref_select_apps_summary">Dewiswch Apps i\'w llwybro drwy Tor</string>
+  <string name="pref_node_configuration">Ffurfweddiad nod</string>
+  <string name="pref_entrance_node">Nodau mynediad</string>
+  <string name="pref_entrance_node_dialog">I mewn i nodau mynediad</string>
+  <string name="pref_proxy_password_summary">Cyfrinair y Dirprwy (Dewisol)</string>
+  <string name="status">Statws</string>
+  <string name="error">Gwall</string>
+  <string name="exit_nodes">Nodau Gadael</string>
+  <string name="enter_exit_nodes">I mewn i Nodau Gadael</string>
+  <string name="exclude_nodes">Yn eithrio Nodau</string>
+  <string name="enter_exclude_nodes">I mewn i Nodau Eithrio</string>
+  <string name="the_tor_license">Trwydded Tor</string>
+  <string name="third_party_software">Meddalwedd 3ydd-parti</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Dewiswch locale ac iaith i Orbot</string>
+  <string name="wizard_locale_title">Dewiswch iaith</string>
+  <string name="btn_save_settings">Cadw\'r gosodiadau</string>
+</resources>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
new file mode 100644
index 0000000..2c63a07
--- /dev/null
+++ b/app/src/main/res/values-da/strings.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot er en gratis og åben proxy-applikation, der gør det muligt at anvende internettet mere sikkert fra andre programmer. Orbot bruger Tor til at kryptere internettrafikken, og skjuler den ved at sende den gennem serverere, lokaliseret i hele verden. Tor er gratis og åben software, der kan hjælpe dig mod netværksovervågning kaldet trafikanalyse, der kan true din personlige frihed, dit privatliv, handelsaktivitet og forhold.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">start og stop Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot starter op ...</string>
+  <string name="status_activated">Der er forbindelse til Tor-netværket</string>
+  <string name="status_disabled">Orbot er slået fra</string>
+  <string name="tor_process_starting">Starter Tor klienten...</string>
+  <string name="tor_process_complete">udført.</string>
+  <string name="tor_process_waiting">afventer.</string>
+  <string name="not_anonymous_yet">ADVARSEL: Din trafik er ikke endnu ikke anonym! Konfigurér venligst dine programmer, så de bruger HTTP proxy 127.0.0.1:8118 eller SOCKS4A eller SOCKS5-proxy 127.0.0.1:9050</string>
+  <string name="menu_home">Hjem</string>
+  <string name="menu_browse">Brows</string>
+  <string name="menu_settings">Indstillinger</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Hjælp</string>
+  <string name="menu_start">Start</string>
+  <string name="menu_stop">Stop</string>
+  <string name="menu_about">Om</string>
+  <string name="main_layout_download">Henter</string>
+  <string name="main_layout_upload">Sender</string>
+  <string name="button_help">Hjælp</string>
+  <string name="button_close">Luk</string>
+  <string name="button_about">Om</string>
+  <string name="button_clear_log">Ryd log</string>
+  <string name="menu_verify">Tjek</string>
+  <string name="menu_exit">Afslut</string>
+  <string name="press_to_start">- hold nede for start -</string>
+  <string name="pref_trans_proxy_group">Transparent proxy (kræver Root)</string>
+  <string name="pref_trans_proxy_title">Transparent proxy</string>
+  <string name="pref_trans_proxy_summary">Anvend automatisk Tor på programmer</string>
+  <string name="pref_transparent_all_title">Brug Tor til alt</string>
+  <string name="pref_transparent_all_summary">Proxy-trafik for alle programmer gennem Tor</string>
+  <string name="pref_transparent_port_fallback_title">Tilbagefaldsport for proxy</string>
+  <string name="pref_transparent_port_fallback_summary">ADVARSEL: Omgår almindelige porte (80, 443, osv). Bør *KUN* anvendes hvis \'All\' eller \'App\' tilstande ikke virker.</string>
+  <string name="pref_transparent_port_title">Portliste</string>
+  <string name="pref_transparent_port_summary">Liste af porte der skal filtreres gennem proxyen. Bør *KUN* anvendes hvis \'All\' eller \'App\' tilstande ikke virker.</string>
+  <string name="pref_transparent_port_dialog">Indtast porte der skal filtreres gennem proxyen.</string>
+  <string name="pref_has_root">Forespørg om Root-adgang</string>
+  <string name="pref_has_root_summary">Kræver root privilegier for gennemsigtig proxy.</string>
+  <string name="status_install_success">Tor\'s binære filer succesfuldt installeret!</string>
+  <string name="status_install_fail">Tor\'s binære filer kunne ikke installeres. Læs venligst loggen og underret tor-assistants at torproject.org</string>
+  <string name="title_error">Programfejl</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Om Orbot</string>
+  <string name="btn_next">Næste</string>
+  <string name="btn_back">Tilbage</string>
+  <string name="btn_finish">Afslut</string>
+  <string name="btn_okay">Okay</string>
+  <string name="btn_cancel">Fortryd</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Nogle Orbot detaljer</string>
+  <string name="wizard_permissions_root">Tilladelse givet</string>
+  <string name="wizard_permissions_stock">Orbot tilladelser</string>
+  <string name="wizard_premissions_msg_root">Fremragende! Vi kan se at du har givet root tilladelser til Orbot . Vi vil bruge denne magt med omtanke.</string>
+  <string name="wizard_permissions_msg_stock">Selvom det ikke er påkrævet, kan Orbot blive et mere nyttigt værktøj, hvis din enhed har root adgang. Benyt knappen herunder for at tildele Orbot superkræfter!</string>
+  <string name="wizard_permissions_no_root">Hvis du ikke har root adgang eller ikke aner hvad vi snakker om, skal du være sikker på at du benytter dig af apps som kan fungere med Orbot.</string>
+  <string name="wizard_permissions_consent">Jeg forstår og vil gerne fortsætte uden Superuser</string>
+  <string name="wizard_permission_enable_root">Tillad root for Orbot</string>
+  <string name="wizard_configure">Indstil Torifikation</string>
+  <string name="wizard_configure_msg">Orbot giver dig mulighed for at føre al app-trafik igennem Tor ELLER vælge individuelt imellem apps.</string>
+  <string name="wizard_configure_all">Kør alle programmers trafik gennem Tor proxyen</string>
+  <string name="wizard_configure_select_apps">Vælg individuelle apps for Tor</string>
+  <string name="wizard_tips_tricks">Orbot-aktiverede apps</string>
+  <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="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>
+  <string name="wizard_final">Orbot er klar!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Dette vil åbne din browser på https://check.torproject.org for at se om Orbot er korrekt konfigureret og at du er forbundet til Tor.</string>
+  <string name="pref_hs_group">Udbyd en skjult service</string>
+  <string name="pref_general_group">Generelt</string>
+  <string name="pref_start_boot_title">Start Orbot ved opstart</string>
+  <string name="pref_start_boot_summary">Start automatisk Orbot og forbind til Tor når din android enhed starter</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Advarsel</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Tilladelser</string>
+  <string name="wizard_permissions_root_msg1">Du kan eventuelt give Orbot \'Superuser\' adgang for at aktivere funktioner som f.eks. Transparent Proxying.</string>
+  <string name="wizard_permissions_root_msg2">Hvis du ikke vil dette, så vær sikker på at du bruger apps som fungerer med Orbot</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot-aktiverede apps</string>
+  <string name="wizard_tips_play">Find alle Guardian Project programmer på Google Play</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transperant Proxying</string>
+  <string name="wizard_transproxy_msg">Dette tillader at dine apps automatisk kører gennem Tor netværket uden nogen konfiguration.</string>
+  <string name="wizard_transproxy_hint">(Check denne boks hvis du ikke aner hvad vi snakker om)</string>
+  <string name="wizard_transproxy_none">Ingen</string>
+  <string name="pref_transparent_tethering_title">Tor internet-hotspot</string>
+  <string name="pref_transparent_tethering_summary">Start Tor gennemsigtig proxy for Wifi og internetdeling over USB (kræver genstart)</string>
+  <string name="button_grant_superuser">Anmod om Superuser adgang</string>
+  <string name="pref_select_apps">Vælg apps</string>
+  <string name="pref_select_apps_summary">Vælg apps som føres gennem Tor</string>
+  <string name="pref_node_configuration">Konfiguration af Tor node</string>
+  <string name="pref_node_configuration_summary">Avancerede indstillinger, der kan reducere anonymiteten</string>
+  <string name="pref_entrance_node">Indgangspunkter til Tor netværket</string>
+  <string name="pref_entrance_node_summary">Fingeraftryk, servernavne, lande og adresser for første hop</string>
+  <string name="pref_entrance_node_dialog">Indtast indgangspunkter</string>
+  <string name="pref_proxy_title">Udgående netværksproxy (Valgfri)</string>
+  <string name="pref_proxy_type_title">Udgående proxy-type</string>
+  <string name="pref_proxy_type_summary">Protokol til proxy serveren: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Indtast proxy type</string>
+  <string name="pref_proxy_host_title">Udgående proxy-vært</string>
+  <string name="pref_proxy_host_summary">Værtsnavn for proxyserver</string>
+  <string name="pref_proxy_host_dialog">Indtast proxy vært</string>
+  <string name="pref_proxy_port_title">Udgående proxy-port</string>
+  <string name="pref_proxy_port_summary">Proxyserverens port</string>
+  <string name="pref_proxy_port_dialog">Indtast proxy port</string>
+  <string name="pref_proxy_username_title">Brugernavn for udgående proxy</string>
+  <string name="pref_proxy_username_summary">Proxy brugernavn (Valgfri)</string>
+  <string name="pref_proxy_username_dialog">Indtast proxy-brugernavnet</string>
+  <string name="pref_proxy_password_title">Kodeord for udgående proxy</string>
+  <string name="pref_proxy_password_summary">Adgangskode for udgående proxy (Valgfri)</string>
+  <string name="pref_proxy_password_dialog">Indtast proxy-kodeordet</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Opsætter total, gennemsigtig proxy...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Opsætter program-afhængig transparent proxy...</string>
+  <string name="transparent_proxying_enabled">Transparent proxying AKTIVERET</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy slået til for internetdeling!</string>
+  <string name="warning_error_starting_transparent_proxying_">ADVARSEL: fejl under start af den gennemsigtige proxy!</string>
+  <string name="transproxy_rules_cleared">Indstillinger for TransProxy er nulstillet</string>
+  <string name="couldn_t_start_tor_process_">Kunne ikke starte Tor processen:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Opsætter port-baseret gennemsigtig proxy...</string>
+  <string name="bridge_error">Fejl ved Bro</string>
+  <string name="bridge_requires_ip">For at kunne bruge bro-komponenten, skal du indaste mindst én IP-adresse på en bro.</string>
+  <string name="send_email_for_bridges">Send en e-mail til bridges at torproject.org med teksten \"get bridges\" alene i mailens tekstfelt fra en gmail-konto.</string>
+  <string name="error">Fejl</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Din ReachableAdresses indstilling forudsagede en fejl!</string>
+  <string name="your_relay_settings_caused_an_exception_">Dine relæindstillinger forårsagede en fejl!</string>
+  <string name="exit_nodes">Udgangspunkter</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingeraftryk, servernavne, lande og adresser for det sidste hop</string>
+  <string name="enter_exit_nodes">Indtast udgangspunkter</string>
+  <string name="exclude_nodes">Ekskluder punkter</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingeraftryk, servernavne, lande og adresser der skal ekskluderes</string>
+  <string name="enter_exclude_nodes">Indtast noder at ekskludere</string>
+  <string name="strict_nodes">Strikte punkter</string>
+  <string name="use_only_these_specified_nodes">Brug *kun* disse specificerede punkter</string>
+  <string name="bridges">Broer</string>
+  <string name="use_bridges">Brug broer</string>
+  <string name="bridges_obfuscated">Skjulte broer</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Slå alternative indgangspunkter til Tor netværket til</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktiver hvis de indstillede broer er skjulte broer</string>
+  <string name="ip_address_and_port_of_bridges">IP adresser og porte på broer</string>
+  <string name="enter_bridge_addresses">Indtast bro-adresser</string>
+  <string name="relays">Relæer</string>
+  <string name="relaying">Relæfunktion</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Lad denne enhed være et ikke-udgangs relæ</string>
+  <string name="relay_port">Relæets port</string>
+  <string name="listening_port_for_your_tor_relay">Port at dette Tor relæ lytter på</string>
+  <string name="enter_or_port">Indtast OR port</string>
+  <string name="relay_nickname">Relænavn</string>
+  <string name="the_nickname_for_your_tor_relay">Kaldenavnet for dit Tor-relæ</string>
+  <string name="enter_a_custom_relay_nickname">Indtast et valgfrit navn for relæet</string>
+  <string name="reachable_addresses">Opnåelige adresser</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Kør som en klient bag en firewall med restrektive regler</string>
+  <string name="reachable_ports">Porte hvor forbindelse kan dannes</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Porte bag en restriktiv firewall hvor en forbindelse kan oprettes</string>
+  <string name="enter_ports">Indtast porte</string>
+  <string name="enable_hidden_services">Udbyd en service</string>
+  <string name="run_servers_accessible_via_the_tor_network">tillad at en server på enheden er tilgængelig via Tor-netværket</string>
+  <string name="enter_localhost_ports_for_hidden_services">indtast lokale adresser for skjulte services</string>
+  <string name="hidden_service_ports">Skjulte service porte</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">den absolutte sti til din skjulte service (genereres automatisk)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">aktiver fejlfindings-log til output (der skal anvendes adb eller aLogCat for at se dette)</string>
+  <string name="project_home">Projekt hjemmeside(r):</string>
+  <string name="the_tor_license">Tor licensen</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Tredjeparts-software:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="hidden_service_request">Et program vil åbne den skjulte server-port %S til Tor netværket. Dette er sikkert hvis du stoler på programmet.</string>
+  <string name="found_existing_tor_process">fandt eksisterende Tor process...</string>
+  <string name="something_bad_happened">Noget slemt er sket. Check loggen</string>
+  <string name="hidden_service_on">skjult service på:</string>
+  <string name="unable_to_read_hidden_service_name">ikke i stand til at læse navnet på den skjulte service</string>
+  <string name="unable_to_start_tor">Kunne ikke starte Tor:</string>
+  <string name="unable_to_reset_tor">Genstart din enhed. Ude af stand til at nulstille tor!</string>
+  <string name="pref_use_sys_iptables_title">Anvend standardindstillinger for Iptables</string>
+  <string name="pref_use_sys_iptables_summary">anvend det indbyggede iptables-program i stedet for versionen der følger med Orbot</string>
+  <string name="error_installing_binares">Kunne ikke installere eller opgradere Tor programmerne.</string>
+  <string name="pref_use_persistent_notifications">Vis altid ikonet i statuslinien når Orbot er forbundet til netværket</string>
+  <string name="pref_use_persistent_notifications_title">Vis altid notifikationer</string>
+  <string name="notification_using_bridges">Broer er aktiverede!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Sprog</string>
+  <string name="set_locale_summary">Vælg sproginstillinger og sprog for Orbot</string>
+  <string name="wizard_locale_title">Vælg sprog</string>
+  <string name="wizard_locale_msg">Behold standardindstilling eller skift det nuværende sprog</string>
+  <string name="powered_by">drevet af Tor</string>
+  <string name="btn_save_settings">Gem Indstillinger</string>
+  <string name="no_internet_connection_tor">Ingen internetforbindelse; Tor er på standby...</string>
+  <string name="bandwidth_">Båndbredde:</string>
+</resources>
diff --git a/app/src/main/res/values-de-rAT/strings.xml b/app/src/main/res/values-de-rAT/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/app/src/main/res/values-de-rAT/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
new file mode 100644
index 0000000..acf2662
--- /dev/null
+++ b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot ist eine kostenlose Proxy-Anwendung, mit deren Hilfe andere Anwendungen das Internet sicherer nutzen können. Orbot verwendet Tor, um Ihren Internetverkehr zu verschlüsseln und ihn dann zu verbergen, indem er über eine Reihe weltweit verteilter Computer geleitet wird. Tor ist ein freies Programm und ein offenes Netzwerk, das Ihnen hilft, sich gegen Angriffe auf die persönliche Freiheit und die Privatsphäre oder auf vertrauliche Geschäftsbeziehungen sowie gegen die Datenüberwachung aus Staatssicherheitsgründen zu wehren.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">Tor starten und beenden</string>
+  <string name="tor_proxy_service_process">Tor-Vermittlungsdienst</string>
+  <string name="status_starting_up">Orbot startet …</string>
+  <string name="status_activated">Verbunden mit dem Tor-Netzwerk</string>
+  <string name="status_disabled">Orbot ist deaktiviert</string>
+  <string name="status_shutting_down">TorService wird heruntergefahren</string>
+  <string name="tor_process_starting">Tor-Programm wird gestartet …</string>
+  <string name="tor_process_complete">abgeschlossen.</string>
+  <string name="tor_process_waiting">warten.</string>
+  <string name="not_anonymous_yet">WARNUNG: Ihr Datenverkehr ist noch nicht anonymisiert! Bitte stellen Sie Ihre Programme so ein, dass Sie entweder den HTTP-Proxy 127.0.0.1:8118 oder den SOCKS4A bzw. SOCKS5-Proxy 127.0.0.1:9050 verwenden.</string>
+  <string name="menu_home">Start</string>
+  <string name="menu_browse">Durchsuchen</string>
+  <string name="menu_settings">Einstellungen</string>
+  <string name="menu_log">Protokoll</string>
+  <string name="menu_info">Hilfe</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Start</string>
+  <string name="menu_stop">Stopp</string>
+  <string name="menu_about">Über</string>
+  <string name="menu_promo_apps">Weitere Apps …</string>
+  <string name="main_layout_download">Heruntergeladen</string>
+  <string name="main_layout_upload">Hochgeladen</string>
+  <string name="button_help">Hilfe</string>
+  <string name="button_close">Schließen</string>
+  <string name="button_about">Über</string>
+  <string name="button_clear_log">Protokoll löschen</string>
+  <string name="menu_verify">Überprüfen</string>
+  <string name="menu_exit">Beenden</string>
+  <string name="menu_scan">BrückenQR scannen</string>
+  <string name="menu_share_bridge">BrückenQR teilen</string>
+  <string name="press_to_start">- Zum Starten gedrückt halten -</string>
+  <string name="pref_trans_proxy_group">Transparente Vermittlung (benötigt Root-Rechte)</string>
+  <string name="pref_trans_proxy_title">Transparente Vermittlung</string>
+  <string name="pref_trans_proxy_summary">Anwendungen automatisch durch Tor leiten</string>
+  <string name="pref_transparent_all_title">Alles durch Tor leiten</string>
+  <string name="pref_transparent_all_summary">Verbindungen aller Anwendungen durch Tor leiten</string>
+  <string name="pref_transparent_port_fallback_title">Rückfallportvermittlung</string>
+  <string name="pref_transparent_port_fallback_summary">WARNUNG: Umgeht öffentliche Ports (80, 443, usw.). *NUR BENUTZEN*, wenn »All« oder »App«-Modus nicht funktioniert.</string>
+  <string name="pref_transparent_port_title">Portliste</string>
+  <string name="pref_transparent_port_summary">Liste von Anschlüssen zur Vermittlung. *NUR BENUTZEN* wenn »All« oder »App«-Modus nicht funktioniert</string>
+  <string name="pref_transparent_port_dialog">Ports zur Vermittlung eingeben</string>
+  <string name="pref_has_root">Anfrage auf Root-Zugriff</string>
+  <string name="pref_has_root_summary">Anfrage auf Root-Zugriff für transparente Vermittlung</string>
+  <string name="status_install_success">Die Tor-Programmdateien wurden erfolgreich installiert!</string>
+  <string name="status_install_fail">Die Tor-Programmdateien konnten nicht erfolgreich installiert werden. Bitte prüfen Sie das Protokoll und wenden Sie sich an tor-assistants at torproject.org.</string>
+  <string name="title_error">Anwendungsfehler</string>
+  <string name="wizard_title">Willkommen bei Orbot</string>
+  <string name="wizard_btn_tell_me_more">Über Orbot</string>
+  <string name="btn_next">Weiter</string>
+  <string name="btn_back">Zurück</string>
+  <string name="btn_finish">Fertigstellen</string>
+  <string name="btn_okay">OK</string>
+  <string name="btn_cancel">Abbrechen</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Nähere Informationen zu Orbot</string>
+  <string name="wizard_details_msg">Orbot ist eine quelloffene Anwendung, die Tor, LibEvent und Polipo enthält. Sie stellt einen lokalen HTTP-Proxy (Port: 8118) und einen SOCKS-Proxy (Port: 9050) in das Tor-Netzwerk bereit. Auf gerooteten Geräten kann Orbot auch sämtliche Internetverbindungen durch Tor leiten.</string>
+  <string name="wizard_permissions_root">Berechtigung erteilt</string>
+  <string name="wizard_permissions_stock">Orbot-Berechtigungen</string>
+  <string name="wizard_premissions_msg_root">Ausgezeichnet! Sie haben Orbot Root-Rechte eingeräumt. Orbot wird diese Berechtigung sinnvoll verwenden.</string>
+  <string name="wizard_permissions_msg_stock">Es ist nicht zwingend erforderlich, aber Orbot kann ein leistungsfähigeres Werkzeug werden, wenn Ihr Gerät gerootet ist. Drücken Sie unten auf den Schalter, um Orbot Superuser-Rechte zu gewähren.</string>
+  <string name="wizard_permissions_no_root">Falls Sie keinen Root-Zugriff haben oder nicht wissen, was das ist, achten Sie darauf, dass Sie Anwendungen verwenden, die Orbot nutzen können.</string>
+  <string name="wizard_permissions_consent">Ich habe verstanden und möchte ohne Systemverwalterzugriff weitermachen</string>
+  <string name="wizard_permission_enable_root">Orbot Root-Rechte einräumen</string>
+  <string name="wizard_configure">Torification konfigurieren</string>
+  <string name="wizard_configure_msg">Orbot lässt Ihnen die Wahl, den Datenverkehr aller Anwendungen durch Tor zu leiten ODER einzelne Anwendungen auszuwählen.</string>
+  <string name="wizard_configure_all">Den Verkehr aller Anwendungen durch Tor leiten</string>
+  <string name="wizard_configure_select_apps">Anwendungen einzeln für Tor auswählen</string>
+  <string name="wizard_tips_tricks">Orbot aktivierte Anwendungen</string>
+  <string name="wizard_tips_msg">Die unten aufgeführten Anwendungen wurden für die Zusammenarbeit mit Orbot entwickelt. Wählen Sie diese durch anklicken zum Installieren aus oder laden Sie diese später bei Google Play,  GuardianProject.info oder F-Droid.org herunter.</string>
+  <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="wizard_tips_twitter">Twitter-Proxy auf den Rechner »localhost« und Port 8118 einstellen</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Schreiben Sie eine Geschichte und überlassen Sie Tor das Sicherheitsmanagement!</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_proxy_help_msg">Wenn die verwendete Android-App die Nutzung eines HTTP- oder SOCKS-Proxys unterstützt, kann sie mit Orbot verknüpft werden und Tor nutzen.\n\n\nDie Einstellung für \'Host\' ist 127.0.0.1 oder \'localhost\'. Für HTTP wird der Port 8118 eingetragen. Für SOCKS der Port 9050. Sie sollten möglichst SOCKS4A oder SOCKS5 verwenden.\n\n\n\n Mehr Informationen zur Verwendung von Proxys unter Android finden Sie in den FAQ auf http://tinyurl.com/proxyandroid\n</string>
+  <string name="wizard_final">Orbot ist bereit!</string>
+  <string name="wizard_final_msg">Millionen Menschen auf der ganzen Welt nutzen Tor aus einer Vielzahl von Gründen..\n\nJournalisten und Blogger, Verteidiger für Menschenrechte, Polizeibeamte, Soldaten, Firmen, Bürger repressiver Regime und ganz normale Menschen … und jetzt können Sie das auch!</string>
+  <string name="wizard_exit_at_first_screen_toast">Bitte konfigurieren Sie Orbot, bevor Sie es verwenden können!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Sie haben sich erfolgreich mit dem Tor-Netzwerk verbunden - was aber NICHT bedeutet, dass Ihr Gerät sicher ist. Sie können den Knopf »Browser« verwenden, um Ihre Verbindung zu überprüfen. \n\nBesuchen Sie uns auf https://guardianproject.info/apps/orbot oder senden Sie uns eine E-Mail an help at guardianproject.info, um mehr zu erfahren.</string>
+  <string name="tor_check">Durch das Bestätigen mit »OK« wird die Seite https://check.torproject.org in Ihrem Webbrowser geöffnet, sodass Sie überprüfen können, ob Orbot richtig konfiguriert ist und Sie mit Tor verbunden sind.</string>
+  <string name="pref_hs_group">Versteckte Dienste</string>
+  <string name="pref_general_group">Allgemein</string>
+  <string name="pref_start_boot_title">Orbot beim Systemstart ausführen</string>
+  <string name="pref_start_boot_summary">Automatisches Starten von Orbot und Verbinden mit Tor beim Start des Android-Gerätes</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot bringt Tor zu Android!\n\nTor unterstützt Sie, sich gegen Zensur, Datenrückverfolgung und die Überwachung des Netzes zu wehren, die Ihre Privatsphäre, vertraulichen Informationen und persönlichen Beziehungen bedrohen.\n\nDieser Assistent hilft Ihnen dabei, Orbot und Tor einzurichten.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Warnung</string>
+  <string name="wizard_warning_msg">Orbot nur zu installieren, anonymisiert nicht automatisch den mobilen Netzwerkverkehr.\n\nSie müssen Orbot, das Gerät und die Apps konfigurieren, um Tor erfolgreich zu verwenden.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Zugriffsrechte</string>
+  <string name="wizard_permissions_root_msg1">Sie können Orbot wahlweise Systemverwalterzugriff geben, um erweiterte Funktionen zu aktivieren, wie z.B. transparente Vermittlung.</string>
+  <string name="wizard_permissions_root_msg2">Wenn Sie dies nicht möchten, stellen Sie bitte sicher, Anwendungen zu verwenden, die für die Zusammenarbeit mit Orbot geschrieben wurden.</string>
+  <string name="wizard_permissions_no_root_msg">Ihr Gerät scheint nicht gerootet zu sein oder stellt keinen Root oder \'Systemverwalterzugriff bereit.\n\nBitte nutzen Sie den \'Apps\' Modus auf dem Hauptbildschirm.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot aktivierte Anwendungen</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: Sichere Unterhaltungsanwendung mit vertraulicher Verschlüsselung</string>
+  <string name="wizard_tips_orweb">Orfox: Datenschutz optimierter Browser der Tor verwendet</string>
+  <string name="wizard_tips_play">Alle Guardian Project-Anwendungen im Google Play Store finden</string>
+  <string name="wizard_tips_fdroid">Alle Guardian Project-Anwendungen bei F-Droid finden</string>
+  <string name="wizard_tips_fdroid_org">Alle Guardian Project-Anwendungen unter https://f-droid.org finden</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparente Vermittlung</string>
+  <string name="wizard_transproxy_msg">Dies ermöglicht Ihren Anwendungen automatisch das Tor-Netzwerk zu verwenden, ohne dieses konfigurieren zu müssen.</string>
+  <string name="wizard_transproxy_hint">(Dieses Feld auswählen, wenn Sie nicht wissen wovon wir reden)</string>
+  <string name="wizard_transproxy_none">Nichts</string>
+  <string name="pref_transparent_tethering_title">Tor-Anbindung</string>
+  <string name="pref_transparent_tethering_summary">Transparente Tor-Vermittlung für WLAN und angebundene USB-Geräte aktivieren (benötigt einen Neustart)</string>
+  <string name="button_grant_superuser">Systemverwalterzugriff anfordern</string>
+  <string name="pref_select_apps">Anwendungen auswählen</string>
+  <string name="pref_select_apps_summary">Die Anwendungen auswählen, welche durch Tor geleitet werden sollen</string>
+  <string name="pref_node_configuration">Netzknotenkonfiguration</string>
+  <string name="pref_node_configuration_summary">Dies sind erweiterte Einstellungen, die Ihre Anonymität beeinträchtigen können</string>
+  <string name="pref_entrance_node">Eingangsnetzknoten</string>
+  <string name="pref_entrance_node_summary">Fingerabdrücke, Spitznamen, Länder und Adressen für den ersten Knotenpunkt</string>
+  <string name="pref_entrance_node_dialog">Eingangsnetzknoten eingeben</string>
+  <string name="pref_allow_background_starts_title">Hintergrundstatistiken erlauben</string>
+  <string name="pref_allow_background_starts_summary">Erlauben Sie jeder Anwendung, Orbot zu beauftragen, Tor und zugehörige Dienste zu starten</string>
+  <string name="button_proxy_all">Alles über Proxy</string>
+  <string name="button_proxy_none">Nichts über Proxy</string>
+  <string name="button_invert_selection">Auswahl umkehren</string>
+  <string name="pref_proxy_title">Ausgehender Netzwerk-Proxy (optional)</string>
+  <string name="pref_proxy_type_title">Ausgehender Vermittlungstyp</string>
+  <string name="pref_proxy_type_summary">Protokoll zur Verwendung des Proxy Servers: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Vermittlungstyp eingeben</string>
+  <string name="pref_proxy_host_title">Ausgehender Vermittlungsrechner</string>
+  <string name="pref_proxy_host_summary">Rechnername des Vermittlungsservers</string>
+  <string name="pref_proxy_host_dialog">Vermittlungsrechner eingeben</string>
+  <string name="pref_proxy_port_title">Ausgehender Proxy-Anschluss</string>
+  <string name="pref_proxy_port_summary">Anschluss des Vermittlungsservers</string>
+  <string name="pref_proxy_port_dialog">Vermittlungsanschluss eingeben</string>
+  <string name="pref_proxy_username_title">Ausgehender Proxy-Benutzername</string>
+  <string name="pref_proxy_username_summary">Proxy-Benutzername (optional)</string>
+  <string name="pref_proxy_username_dialog">Proxy-Benutzernamen eingeben</string>
+  <string name="pref_proxy_password_title">Ausgehendes Proxy-Passwort</string>
+  <string name="pref_proxy_password_summary">Proxy-Passwort (optional)</string>
+  <string name="pref_proxy_password_dialog">Proxy-Passwort eingeben</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Voll transparente Vermittlung wird eingestellt …</string>
+  <string name="setting_up_app_based_transparent_proxying_">Anwendungsbasierte transparente Vermittlung wird eingestellt …</string>
+  <string name="transparent_proxying_enabled">Transparente Vermittlung AKTIVIERT</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy für Anbindung aktiviert!</string>
+  <string name="warning_error_starting_transparent_proxying_">WARNUNG: Fehler beim Starten der transparenten Vermittlung!</string>
+  <string name="transproxy_rules_cleared">TransProxy-Regeln gelöscht</string>
+  <string name="couldn_t_start_tor_process_">Tor-Prozess konnte nicht gestartet werden:</string>
+  <string name="privoxy_is_running_on_port_">Polipo läuft auf Port: </string>
+  <string name="setting_up_port_based_transparent_proxying_">Anschlussbasierte transparente Vermittlung wird eingestellt …</string>
+  <string name="bridge_error">Brückenfehler</string>
+  <string name="bridge_requires_ip">Um die Brückenfunktion nutzen zu können, müssen Sie mindestens eine Brücken-IP-Adresse eingeben.</string>
+  <string name="send_email_for_bridges">Von Ihrem Gmail-Konto eine E-Mail an bridges at torproject.org mit dem Text »get bridges« im Nachrichtenfeld senden.</string>
+  <string name="error">Fehler</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Ihre eingestellten erreichbaren Adressen haben einen Ausnahmefehler verursacht!</string>
+  <string name="your_relay_settings_caused_an_exception_">Ihre Relaiseinstellungen haben einen Ausnahmefehler verursacht!</string>
+  <string name="exit_nodes">Ausgangsnetzknoten</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerabdrücke, Spitznamen, Länder und Adressen für den letzten Knotenpunkt.</string>
+  <string name="enter_exit_nodes">Ausgangsnetzknoten eingeben</string>
+  <string name="exclude_nodes">Netzknoten ausschließen</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerabdrücke, Spitznamen, Länder und Adressen, die ausgeschlossen werden sollen</string>
+  <string name="enter_exclude_nodes">Auszuschließende Netzknoten eingeben</string>
+  <string name="strict_nodes">Absolute Netzknoten</string>
+  <string name="use_only_these_specified_nodes">*Ausschließlich* diese angegebenen Netzknoten verwenden</string>
+  <string name="bridges">Brücken</string>
+  <string name="use_bridges">Brücken benutzen</string>
+  <string name="bridges_obfuscated">Verschleierte Brücken</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Alternative Eingangsnetzknoten in das Tor-Netzwerk aktivieren</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktivieren, falls Brücken verschleierte Brücken sind</string>
+  <string name="ip_address_and_port_of_bridges">IP-Adresse und Port der Brücken</string>
+  <string name="enter_bridge_addresses">Brückenadressen eingeben</string>
+  <string name="relays">Relais</string>
+  <string name="relaying">Weiterleitung</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Ihr Gerät als Nichtausgangsrelais aktivieren</string>
+  <string name="relay_port">Relaisanschluss</string>
+  <string name="listening_port_for_your_tor_relay">Anschluss, auf dem bei Ihrem Tor-Relais gehört werden soll</string>
+  <string name="enter_or_port">OR-Port eingeben</string>
+  <string name="relay_nickname">Relaisspitzname</string>
+  <string name="the_nickname_for_your_tor_relay">Der Spitzname für Ihr Tor-Relais</string>
+  <string name="enter_a_custom_relay_nickname">Einen selbsterstellten Relaisspitznamen eingeben</string>
+  <string name="reachable_addresses">Erreichbare Adressen</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Als Programm hinter einer Firewall mit restriktiven Regeln betreiben</string>
+  <string name="reachable_ports">Erreichbare Ports</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Die Anschlüsse sind hinter einer restriktiven Firewall erreichbar</string>
+  <string name="enter_ports">Ports eingeben</string>
+  <string name="enable_hidden_services">Versteckte Dienste</string>
+  <string name="run_servers_accessible_via_the_tor_network">Auf dem Gerät einen Server betreiben, auf den das Tor-Netzwerk zugreifen kann</string>
+  <string name="enter_localhost_ports_for_hidden_services">Lokale Ports für versteckte Dienste eingeben</string>
+  <string name="hidden_service_ports">Ports der versteckten Dienste</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Der adressierbare Name für Ihren versteckten Dienst (wird automatisch generiert)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Ausgabe des Fehlerdiagnoseprotokolls aktivieren (benötigt adb oder aLogCat zur Ansicht)</string>
+  <string name="project_home">Internetseite(n) des Projektes:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Die Tor-Lizenz</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Drittanbieteranwendungen:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Eine Anwendung möchte den versteckten Server-Anschluss %S öffnen. Das ist sicher, wenn Sie der Anwendung vertrauen.</string>
+  <string name="found_existing_tor_process">bestehender Tor-Prozess gefunden …</string>
+  <string name="something_bad_happened">Etwas ist schief gelaufen. Bitte Protokoll prüfen</string>
+  <string name="hidden_service_on">Versteckte Dienste auf:</string>
+  <string name="unable_to_read_hidden_service_name">Name des versteckten Dienstes kann nicht gelesen werden</string>
+  <string name="unable_to_start_tor">Tor kann nicht gestartet werden:</string>
+  <string name="unable_to_reset_tor">Starten Sie Ihr Gerät neu, Tor konnte nicht zurückgesetzt werden!</string>
+  <string name="pref_use_sys_iptables_title">Vorgegebene IPtables verwenden</string>
+  <string name="pref_use_sys_iptables_summary">Die vorhandene IPtables-Datei verwenden, anstatt der von Orbot mitgelieferten.</string>
+  <string name="error_installing_binares">Die Tor-Programmdateien konnten nicht installiert oder aktualisiert werden.</string>
+  <string name="pref_use_persistent_notifications">Wenn Orbot verbunden ist immer das Orbot-Symbol in der Statusleiste anzeigen</string>
+  <string name="pref_use_persistent_notifications_title">Aktivitätsanzeige</string>
+  <string name="pref_use_expanded_notifications">Erweiterte Benachrichtigung mit Tor-Austrittsland und IP anzeigen</string>
+  <string name="pref_use_expanded_notifications_title">Erweiterte Benachrichtigungen</string>
+  <string name="notification_using_bridges">Brücken aktiviert!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Sprache</string>
+  <string name="set_locale_summary">Gebietsschema und Sprache für Orbot auswählen</string>
+  <string name="wizard_locale_title">Sprache auswählen</string>
+  <string name="wizard_locale_msg">Voreinstellung beibehalten oder Sprache ändern</string>
+  <string name="powered_by">betrieben mit Tor</string>
+  <string name="btn_save_settings">Einstellungen speichern</string>
+  <string name="no_internet_connection_tor">Keine Internetverbindung; Tor ist in Bereitschaft …</string>
+  <string name="bandwidth_">Bandbreite:</string>
+  <string name="down">runter</string>
+  <string name="up">hoch</string>
+  <string name="pref_disable_network_title">Bereitschaft wenn kein Netz</string>
+  <string name="pref_disable_network_summary">Tor in Bereitschaft versetzen, wenn kein Internet verfügbar ist</string>
+  <string name="newnym">Sie haben zu einer neuen Tor-Identität gewechselt!</string>
+  <string name="menu_verify_browser">Browser</string>
+  <string name="menu_use_chatsecure">ChatSecure benutzen</string>
+  <string name="permission_manage_tor_label">Tor verwalten</string>
+  <string name="permission_manage_tor_description">Diese Anwendung aktivieren, um den Tor-Dienst zu kontrollieren</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Es sieht nicht so aus, dass Sie Orfox installiert haben. Wollen Sie dabei Hilfe oder sollen wir einfach den Browser öffnen?</string>
+  <string name="install_apps_">Anwendungen installieren?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Keine Netzwerkverbindung. Tor wird in Bereitschaft versetzt …</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Netzwerkverbindung ist vorhanden. Tor wird aktiviert …</string>
+  <string name="updating_settings_in_tor_service">Einstellungen im Tor-Dienst werden aktualisiert</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Port auf dem der SOCKS-Proxy bereitgestellt wird (Standard: 9050 oder 0 zum deaktivieren)</string>
+  <string name="pref_socks_dialog">SOCKS-Portkonfiguration</string>
+  <string name="pref_transport_title">Tor TransProxy-Port</string>
+  <string name="pref_transport_summary">Port auf dem der Transparente Proxy bereitgestellt wird (Standard: 9040 oder 0 zum deaktivieren)</string>
+  <string name="pref_transport_dialog">TransProxy-Portkonfiguration</string>
+  <string name="pref_dnsport_title">Tor DNS-Port</string>
+  <string name="pref_dnsport_summary">Port auf dem DNS bereitgestellt wird (Standard: 5400 oder 0 zum deaktivieren)</string>
+  <string name="pref_dnsport_dialog">DNS-Portkonfiguration</string>
+  <string name="pref_torrc_title">Benutzerdefinierte Torrc-Konfiguration</string>
+  <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="your_tor_public_ips_">Ihre öffentlichen IPs für Tor:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Bitte deaktivieren Sie diese Anwendung unter Android->Einstellungen->Anwendungen, falls Sie Probleme mit Orbot haben:</string>
+  <string name="app_conflict">Anwendungskonflikt</string>
+  <string name="pref_transproxy_refresh_title">Automatische Transproxy-Aktualisierung</string>
+  <string name="pref_transproxy_refresh_summary">Transproxy-Regeln erneut anwenden, wenn sich der Netzwerkstatus ändert</string>
+  <string name="pref_transproxy_flush_title">Transproxy ENTFERNEN ERZWINGEN</string>
+  <string name="pref_transproxy_flush_summary">Hier Tippen, um JETZT alle Transparent-Proxy Netzwerkregeln zu löschen</string>
+  <string name="transparent_proxy_rules_flushed_">Transparente Proxy-Regeln geleert!</string>
+  <string name="you_do_not_have_root_access_enabled">Sie haben keinen aktivierten Root-Zugang</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Sie müssen Tor stoppen und wieder Starten, um die neuen Einstellungen zu übernehmen.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbit/s</string>
+  <string name="mbps">Mbit/s</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Brücken aktualisiert</string>
+  <string name="restart_orbot_to_use_this_bridge_">Bitte Orbot zum Aktivieren der Änderungen neustarten</string>
+  <string name="menu_qr">QR-Codes</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Wenn Ihr mobiles Netzwerk aktiv Tor sperrt, können Sie mit einer Brücke auf das Netzwerk zugreifen. Wählen Sie einen der oben genannten Brückentypen aus, um Brücken zu aktivieren.</string>
+  <string name="bridge_mode">Brückemodus</string>
+  <string name="get_bridges_email">E-Mail</string>
+  <string name="get_bridges_web">Netz</string>
+  <string name="activate">Aktivieren</string>
+  <string name="apps_mode">VPN-Modus der Anwendungen</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Mit Hilfe von VPN kann man alle Anwendungen über Tor umleiten.\n\n*WARNUNG* Das ist eine neue, experimentelle Funktion und sie startet in einigen fällen nicht automatisch oder stoppt einfach. Die Funktion sollte NICHT für das anonyme Surfen genutzt werden, sondern NUR um Firewalls und Filter zu umgehen.</string>
+  <string name="send_email">E-Mail senden</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Sie können eine Brücken-Adresse per E-Mail, im Web oder per Scan eines BrückenQR-Codes erhalten. Wählen Sie unten \'E-Mail\' oder \'Web\', um eine Brückenadresse anzufordern.\n\nSobald Sie eine Adresse haben, fügen Sie diese bei den Einstellungen für Brücken ein und starten Sie Orbot neu.</string>
+  <string name="install_orweb">Orfox installieren</string>
+  <string name="standard_browser">Standard-Browser</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">HINWEIS: Nur die Standard Tor-Brücken funktionieren mit Intel X86/Atom Geräten</string>
+  <string name="vpn_default_world">Welt</string>
+</resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
new file mode 100644
index 0000000..30c827c
--- /dev/null
+++ b/app/src/main/res/values-el/strings.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">εκκίνηση και διακοπή Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Το Orbot ξεκινά</string>
+  <string name="status_activated">Συνδέθηκε στο δίκτυο Tor</string>
+  <string name="status_disabled">\"Το Orbot είναι Απενεργοποιημένο</string>
+  <string name="tor_process_starting">Εκκίνηση του πελάτη Tor...</string>
+  <string name="tor_process_complete">ολοκληρώθηκε...</string>
+  <string name="tor_process_waiting">αναμονή</string>
+  <string name="not_anonymous_yet">ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η κυκλοφορία σας δεν είναι ακόμη ανώνυμη! Ρυθμίστε τις εφαρμογές σας ώστε να χρησιμοποιούν ως πληρεξούσιο HTTP 127.0.0.1:8118 ή SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Αρχική</string>
+  <string name="menu_browse">Περιήγηση</string>
+  <string name="menu_settings">Ρυθμίσεις</string>
+  <string name="menu_log">Καταγραφή</string>
+  <string name="menu_info">Βοήθεια</string>
+  <string name="menu_start">Εκκίνηση</string>
+  <string name="menu_stop">Διακοπή</string>
+  <string name="menu_about">Σχετικά</string>
+  <string name="main_layout_download">Λήψη (ταχύτητα/σύνολο)</string>
+  <string name="main_layout_upload">Αποστολή (ταχύτητα/σύνολο)</string>
+  <string name="button_help">Βοήθεια</string>
+  <string name="button_close">Κλείσιμο</string>
+  <string name="button_about">Σχετικά</string>
+  <string name="button_clear_log">Διαγραφή Καταγραφής</string>
+  <string name="menu_verify">Έλεγχος</string>
+  <string name="menu_exit">Έξοδος</string>
+  <string name="press_to_start">-για να εκκινήσει κρατήστε το πατημένο-</string>
+  <string name="pref_trans_proxy_group">Διαφανής Πληρεξούσιος Διακομηστής (Απαιτεί διαχείριση root)</string>
+  <string name="pref_trans_proxy_title">Διαφανής Πληρεξούσιος Διακομηστής</string>
+  <string name="pref_trans_proxy_summary">Αυτόματη Προσαρμογή Εφαρμογών στο Tor</string>
+  <string name="pref_transparent_all_title">Ανωνυμοποίηση Όλων</string>
+  <string name="pref_transparent_all_summary">Να γίνεται η μεταβίβαση της κυκλοφορίας όλων των εφαρμογών μέσω του Tor</string>
+  <string name="pref_transparent_port_fallback_title">Θύρα αναδίπλωσης του πληρεξούσιου διακομιστή</string>
+  <string name="pref_transparent_port_fallback_summary">ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Παρακάμπτει τις κοινές θύρες (80, 443, κλπ). *ΝΑ ΧΡΗΣΙΜΟΠΟΙΕΙΤΑΙ ΜΟΝΟΝ* όταν οι λειτουργίες \'All\' ή \'App\' δεν αποδίδουν.</string>
+  <string name="pref_transparent_port_title">Λίστα θυρών</string>
+  <string name="pref_transparent_port_summary">Λίστα θυρών πληρεξούσιου διακομιστή. *ΝΑ ΧΡΗΣΙΜΟΠΟΙΕΙΤΑΙ ΜΟΝΟΝ* όταν οι λειτουργίες \'All\' ή \'App\' δεν αποδίδουν.</string>
+  <string name="pref_transparent_port_dialog">Εισάγετε θύρες πληρεξούσιου διακομιστή</string>
+  <string name="pref_has_root">Άιτημα πρόσβασης με δικαιώματα υπερχρήστη</string>
+  <string name="pref_has_root_summary">Άιτημα πρόσβασης με δικαιώματα υπερχρήστη για διαφανή μεταβίβαση δεδομένων μέσω πληρεξούσιου διακομιστή</string>
+  <string name="status_install_success">Τα δυαδικά αρχεία του Tor εγκαταστάθηκαν με επιτυχία!</string>
+  <string name="status_install_fail">Τα δυαδικά αρχεία του Tor δεν εγκαταστάθηκαν. Ελέγξτε τις καταγραφές και ειδοποιείστε στην διεύθυνση tor-assistants at torproject.org</string>
+  <string name="title_error">Σφάλμα εφαρμογής</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Σχετικά με το Orbot</string>
+  <string name="btn_next">Επόμενο</string>
+  <string name="btn_back">Πίσω</string>
+  <string name="btn_finish">Τέλος</string>
+  <string name="btn_okay">Okay</string>
+  <string name="btn_cancel">Άκυρο</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Μερικές λεπτομέρειες για το Orbot</string>
+  <string name="wizard_permissions_root">Η άδεια παραχωρήθηκε</string>
+  <string name="wizard_permissions_stock">Άδειες Orbot</string>
+  <string name="wizard_premissions_msg_root">Καλώς! Διαπιστώνουμε ότι έχετε ενεργοποιημένο τον υπερχρήστη για το Orbot. Θα χρησιμοποιήσουμε το προνόμιο αυτό με σύνεση.</string>
+  <string name="wizard_permissions_msg_stock"> Αν και δεν είναι απαραίτητο, το Orbot μπορεί να γίνει ισχυρότερο όταν η συσκευή σας έχει διαμορφωθεί για πρόσβαση υπερχρήστη. Πατήστε το πιο κάτω κουμπί για να δώσετε αυξημένα δικαιώματα στο Orbot! </string>
+  <string name="wizard_permissions_no_root">Αν δεν διαθέτετε πρόσβαση υπερχήστη ή δεν καταλαβαίνετε τι εννοούμε, απλώς χρησιμοποιείτε εφαρμογές που φτιάχτηκαν για να συνεργάζονται με το Orbot.</string>
+  <string name="wizard_permissions_consent">Καταλαβαίνω και θέλω να συνεχίσω ως Υπερχρήστης</string>
+  <string name="wizard_permission_enable_root">Απόδοση Διαχειρισης στο Orbot</string>
+  <string name="wizard_configure">Ρύθμιση Torification</string>
+  <string name="wizard_configure_msg">Το Orbot σας επιτρέπει να κατευθύνετε όλη την κυκλοφορία κάποιας εφαρμογής προς το Tor ή να επιλέξετε κάθε μια εφαρμογή ξεχωριστά.</string>
+  <string name="wizard_configure_all">Το Tor να γίνει ενδιάμεσος διακομιστής Proxy για όλες τις εφαρμογές</string>
+  <string name="wizard_configure_select_apps">Επιλογή μεμονωμένων εφαρμογών για το Tor</string>
+  <string name="wizard_tips_tricks">Εφαρμογές συμβατές για Orbont</string>
+  <string name="wizard_tips_msg">Οι παρακάτω εφαρμογές αναπτύχθηκαν ώστε να λειτουργούν με το Orbot. Πατήστε σε κάθε κουμπί για να εγκατασταθεί τώρα ή μπορείτε να τις βρείτε αργότερα στο Android Market</string>
+  <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="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>
+  <string name="wizard_final">Το Orbot είναι έτοιμο!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Θα ανοίξει ο περιηγητής δικτύου στην σελίδα https://check.torproject.org για να διαπιστώσετε αν το Orbot είναι σωστά ρυθμισμένο και ότι είστε συνδεδεμένος/η στο Tor.</string>
+  <string name="pref_hs_group">Φιλοξενία κρυφών υπηρεσιών</string>
+  <string name="pref_general_group">Γενικά</string>
+  <string name="pref_start_boot_title">Έναρξη του Orbot κατά την εκκίνηση</string>
+  <string name="pref_start_boot_summary">Αυτόματη έναρξη του Orbot και σύνδεση στο Tor όταν ξεκινά η Android συσκευή σας</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Προειδοποίηση</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Άδειες</string>
+  <string name="wizard_permissions_root_msg1">Αν θέλετε, μπορεί να δώσετε στο Orbot πρόσβαση \'Υπερχρήστη\' ώστε να ενεργοποιήσετε τα προχωρημένα χαρακτηριστικά, όπως το Transparent Proxying.</string>
+  <string name="wizard_permissions_root_msg2">Αν δεν θέλετε κάτι τέτοιο, βεβαιωθείτε ότι χρησιμοποιείτε εφαρμογές που συνεργάζονται με το Orbot</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Εφαρμογές συμβατές με Orbot</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: Ασφαλές chat app με Off-the-Record κρυπτογράφηση</string>
+  <string name="wizard_tips_play">Βρες όλες τις εφαρμογές Guardian Project στο Google Play</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Διαφανής μεσολάβηση διακομιστή</string>
+  <string name="wizard_transproxy_msg">Το στοιχείο αυτό επιτρέπει στις εφαρμογές σας να λειτουργούν μέσω του δικτύου Tor χωρίς κάποια ρύθμιση.</string>
+  <string name="wizard_transproxy_hint">(Επιλέξτε αυτό το τετράγωνο αν δεν καταλαβαίνετε για τι πράγμα μιλάμε)</string>
+  <string name="wizard_transproxy_none">Καμία</string>
+  <string name="pref_transparent_tethering_title">Διασύνδεση Tor</string>
+  <string name="pref_transparent_tethering_summary">Ενεργοποίηση της Διαφανούς μεσολάβησης διακομιστή για συσκευές με WiFi και διασύνδεση USB (απαιτεί επανεκκίνηση)</string>
+  <string name="button_grant_superuser">Αίτημα Πρόσβασης Υπερχρήστη</string>
+  <string name="pref_select_apps">Επιλογή εφαρμογών</string>
+  <string name="pref_select_apps_summary">Επιλέξτε τις εφαρμογές που θα διέλθουν μέσω Tor</string>
+  <string name="pref_node_configuration">Ρύθμιση κόμβου</string>
+  <string name="pref_node_configuration_summary">Οι ρυθμίσεις αυτές είναι προχωρημένες και μπορούν να μειώσουν την ανωνυμία σας.</string>
+  <string name="pref_entrance_node">Κόμβοι εισόδου</string>
+  <string name="pref_entrance_node_summary">Αποτυπώματα, ψευδώνυμα, χώρες και διευθύνσεις για την πρώτη σύνδεση</string>
+  <string name="pref_entrance_node_dialog">Εισάγετε κόμβους εισαγωγής</string>
+  <string name="pref_proxy_title">Διακομιστής μεσολάβησης εξερχομένων δεδομένων</string>
+  <string name="pref_proxy_type_title">Τύπος του διακομιστή μεσολάβησης εξερχομένων δεδομένων</string>
+  <string name="pref_proxy_type_summary">Πρωτόκολλο του διακομιστή μεσολάβησης: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Εισάγετε τύπο διακομιστή μεσολάβησης</string>
+  <string name="pref_proxy_host_title">Διακομιστής μεσολάβησης εξερχόμενων δεδομένων</string>
+  <string name="pref_proxy_host_summary">Hostname Διακομιστή Μεσολάβησης</string>
+  <string name="pref_proxy_host_dialog">Εισάγετε τον υπολογιστή για τον διακομιστή μεσολάβησης</string>
+  <string name="pref_proxy_port_title">Θύρα εξερχομένων του διακομιστή μεσολάβησης</string>
+  <string name="pref_proxy_port_summary">Θύρα Διακομιστή Μεσολάβησης</string>
+  <string name="pref_proxy_port_dialog">Εισάγετε την θύρα του διακομιστή μεσολάβησης</string>
+  <string name="pref_proxy_username_title">Όνομα χρήστη για τον Διακομιστή Μεσολάβησης εξερχόμενων δεδομένων</string>
+  <string name="pref_proxy_username_summary">Όνομα χρήστη για το Διακομιστή Μεσολάβησης (Προαιρετικό)</string>
+  <string name="pref_proxy_username_dialog">Εισάγετε το Όνομα Χρήστη για το Διακομιστή Μεσολάβησης</string>
+  <string name="pref_proxy_password_title">Κωδικός για τον Διακομιστή Μεσολάβησης εξερχόμενων δεδομένων</string>
+  <string name="pref_proxy_password_summary">Κωδικός για τον Διακομιστή Μεσολάβησης (Προαιρετικό)</string>
+  <string name="pref_proxy_password_dialog">Εισάγετε τον Κωδικό για τον Διακομιστή Μεσολάβησης</string>
+  <string name="status">Κατάσταση</string>
+  <string name="setting_up_full_transparent_proxying_">Ρύθμιση </string>
+  <string name="setting_up_app_based_transparent_proxying_">Ρύθμιση της διαφανούς μεσολάβησης διακομιστή</string>
+  <string name="transparent_proxying_enabled">Η διαφανής μεσολάβηση διακομιστή ΕΝΕΡΓΟΠΟΙΗΘΗΚΕ</string>
+  <string name="transproxy_enabled_for_tethering_">Το TransProxy ενεργοποιήθηκε για την διασύνδεση - Tethering</string>
+  <string name="warning_error_starting_transparent_proxying_">ΠΡΟΕΙΔΟΠΟΙΗΣΗ: σφάλμα κατά την εκκίνηση της διαφανούς μεσολάβησης διακομιστή!</string>
+  <string name="transproxy_rules_cleared">Οι ρυθμίσεις του TransProxy απομακρύνθηκαν</string>
+  <string name="couldn_t_start_tor_process_">Αδυναμία εκκίνησης της διεργασίας Tor:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Ρύθμιση της διαφανούς μεσολάβησης διακομιστή κατά θύρα...</string>
+  <string name="bridge_error">Σφάλμα γέφυρας</string>
+  <string name="bridge_requires_ip">Για να χρησιμοποιήσετε το στοιχείο γέφυρας, πρέπει να εισάγετε την διεύθυνση ΙΡ τουλάχιστον μιας γέφυρας.</string>
+  <string name="send_email_for_bridges">Μέσω ενός λογαριασμού gmai στείλτε ένα μήνυμα στην διεύθυνση bridges at torproject.org με την φαση \"get bridges\" μόνη της στο σώμα το μηνύματος.</string>
+  <string name="error">Σφάλμα</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Οι ρυθμίσεις ReachableAddresses προκάλεσαν μια εξαίρεση!</string>
+  <string name="your_relay_settings_caused_an_exception_">Οι ρυθμίσεις αναμεταδότη σας προκάλεσαν μια εξαίρεση!</string>
+  <string name="exit_nodes">Κόμβοι εξόδου</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Αποτυπώματα, ψευδώνυμα, χώρες και διευθύνσεις της τελευταίας σύνδεσης</string>
+  <string name="enter_exit_nodes">Εισάγετε κόμβους εξόδου</string>
+  <string name="exclude_nodes">Εξαιρετέοι κόμβοι</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Αποτυπώματα, ψευδώνυμα, χώρες και διευθύνσεις προς εξαίρεση</string>
+  <string name="enter_exclude_nodes">Εισάγετε Εξαιρετέους κόμβους</string>
+  <string name="strict_nodes">Αποκλειστικοί κόμβοι</string>
+  <string name="use_only_these_specified_nodes">Χρήση *μόνον* αυτών των συγκεκριμένων κόμβων</string>
+  <string name="bridges">Γέφυρες</string>
+  <string name="use_bridges">Χρήση γεφυρών</string>
+  <string name="bridges_obfuscated">Κρυφές γέφυρες</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Ενεργοποίηση εναλλακτικών κόμβων εισόδου στο δίκτυο Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Ενεργοποιήστε το αν οι ρυθμισμένες γέφυρες είναι κρυφές</string>
+  <string name="ip_address_and_port_of_bridges">Διεύθυνση ΙΡ και θύρα των γεφυρών</string>
+  <string name="enter_bridge_addresses">Εισάγετε την διεύθυνση της γέφυρας</string>
+  <string name="relays">Αναμεταδότες</string>
+  <string name="relaying">Γίνεται αναμετάδοση</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Μετατρέψτε την συσκευή σας σε ένα αναμεταδότη μη-εξόδου</string>
+  <string name="relay_port">Θύρα αναμετάδοσης</string>
+  <string name="listening_port_for_your_tor_relay">Θύρα ακρόασης για τον αναμεταδότη σας</string>
+  <string name="enter_or_port">Εισάγετε την θύρα OR</string>
+  <string name="relay_nickname">Ψευδώνυμο του αναμεταδότη</string>
+  <string name="the_nickname_for_your_tor_relay">Το ψευδώνυμο του αναμεταδότη σας Tor</string>
+  <string name="enter_a_custom_relay_nickname">Εισάγετε ένα προτιμώμενο ψευδώνυμο αναμεταδότη</string>
+  <string name="reachable_addresses">Προσιτές διευθύνσεις</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Εκτέλεση ως πελάτη πίσω από τοίχος προστασίας με περιοριστικές πολιτικές</string>
+  <string name="reachable_ports">Προσιτές θύρες</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Προσιτές θύρες πίσω από περιοριστικό τοίχος προστασίας</string>
+  <string name="enter_ports">Εισάγετε θύρες</string>
+  <string name="enable_hidden_services">Φιλοξενία κρυφών υπηρεσιών</string>
+  <string name="run_servers_accessible_via_the_tor_network">να επιτρέπετε στον διακομιστή της συσκευής να είναι προσβάσιμος μέσω του δικτύου Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">εισάγετε τις θύρες κρυφών υπηρεσιών του localhost</string>
+  <string name="hidden_service_ports">Θύρες κρυφών υπηρεσιών</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">το όνομα προσπέλασης για τις κρυφές υπηρεσίες σας (παράγεται αυτόματα)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ενεργοποίηση καταγραφών αποσφαλμάτωσης (για την προβολή τους απαιτείται χρήση adb ή aLogCat)</string>
+  <string name="project_home">Ιστοσελίδες του έργου:</string>
+  <string name="the_tor_license">Η Άδεια Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Λογισμικό τρίτων:</string>
+  <string name="hidden_service_request">Κάποια εφαρμογή προσπαθεί να ανοίξει την κρυφή θύρα διακομιστή %S στο δίκτυο Tor. Πρόκειται για ασφαλή ενέργεια, εφόσον γνωρίζετε την εφαρμογή.</string>
+  <string name="found_existing_tor_process">αναζήτηση διεργασιών Tor...</string>
+  <string name="something_bad_happened">Κάτι κακό συνέβη. Ελέγξτε τις καταγραφές</string>
+  <string name="hidden_service_on">ενεργοποιημένη κρυφή υπηρεσία:</string>
+  <string name="unable_to_read_hidden_service_name">αδυναμία ανάγνωσης του ονόματος της κρυφής υπηρεσίας</string>
+  <string name="unable_to_start_tor">Αδυναμία εκκίνησης του Tor:</string>
+  <string name="pref_use_sys_iptables_title">Χρήση αρχικού iptables</string>
+  <string name="pref_use_sys_iptables_summary">χρήση του ενσωματωμένου iptables αντί για εκείνων του πακέτου Orbot</string>
+  <string name="error_installing_binares">Τα αρχεία Tor δεν μπόρεσαν να εγκατασταθούν ή να αναβαθμιστούν.</string>
+  <string name="pref_use_persistent_notifications">Να διατηρείται πάντοτε το εικονίδιο στην γραμμή εργαλείων όταν το Orbot συνδέεται</string>
+  <string name="pref_use_persistent_notifications_title">Ειδοποιήσεις διαρκούς σύνδεσης</string>
+  <string name="notification_using_bridges">Οι γέφυρες ενεργοποιήθηκαν!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Επιλέξτε ρυθμίσεις τοπικότητας και γλώσσας για το Orbot</string>
+  <string name="wizard_locale_title">Επιλέξτε γλώσσα</string>
+  <string name="wizard_locale_msg">Παραμείνετε στην αρχική ή αλλάξτε την τρέχουσα γλώσσα</string>
+  <string name="btn_save_settings">Αποθήκευση ρυθμίσεων</string>
+  <string name="bandwidth_">Εύρος ζώνης:</string>
+  <string name="down">κατέβασμα</string>
+  <string name="up">ανέβασμα</string>
+  <string name="pref_disable_network_title">Χωρίς Αυτόματη Αναστολή Δικτύου</string>
+  <string name="pref_disable_network_summary">Θέσε το Tor σε λειτουργία sleep όταν δεν υπάρχει διαθέσιμη σύνδεση Ιnternet</string>
+  <string name="newnym">Έχετε αλλάξει επιτυχώς την ταυτότητα σας στο Tor! </string>
+  <string name="menu_use_chatsecure">Χρήση του ChatSecure</string>
+  <string name="permission_manage_tor_label">Διαχείριση Tor</string>
+  <string name="permission_manage_tor_description">Εξουσιοδοτήστε την εφαρμογή να ελέγχει την υπηρεσία του Tor</string>
+  <string name="install_apps_">Εγκατάσταση εφαρμογών?</string>
+</resources>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..4ddc60d
--- /dev/null
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="btn_next">Next</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
new file mode 100644
index 0000000..3c103de
--- /dev/null
+++ b/app/src/main/res/values-eo/strings.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">ŝalti kaj malŝalti Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot ŝaltiĝas...</string>
+  <string name="status_activated">Konektita al Tor-reto</string>
+  <string name="status_disabled">Orbot estas malaktivigita</string>
+  <string name="tor_process_starting">Ŝaltiĝas Tor-kliento...</string>
+  <string name="tor_process_complete">kompleta.</string>
+  <string name="tor_process_waiting">atendas.</string>
+  <string name="not_anonymous_yet">ATENTIGO: Via trafiko ankoraŭ ne estas anonima! Bonvolu agordi viajn aplikaĵojn por uzi HTTP-prokurilon 127.0.0.1:8118 aŭ SOCKS4A- aŭ SOCKS5-prokurilo 127.0.0.1:9050</string>
+  <string name="menu_home">Hejma tasto</string>
+  <string name="menu_browse">Foliumi</string>
+  <string name="menu_settings">Agordoj</string>
+  <string name="menu_log">Protokolo</string>
+  <string name="menu_info">Helpo</string>
+  <string name="menu_start">Starti</string>
+  <string name="menu_stop">Halti</string>
+  <string name="menu_about">Pri</string>
+  <string name="main_layout_download">Elŝutado</string>
+  <string name="main_layout_upload">Alŝutado</string>
+  <string name="button_help">Helpo</string>
+  <string name="button_close">Fermi</string>
+  <string name="button_about">Pri</string>
+  <string name="button_clear_log">Forviŝi protokolon</string>
+  <string name="menu_verify">Kontroli</string>
+  <string name="menu_exit">Eliri</string>
+  <string name="press_to_start">- longe puŝi por ŝalti -</string>
+  <string name="pref_trans_proxy_summary">Aŭtomata Tor-igo de Aplikaĵoj</string>
+  <string name="pref_transparent_all_title">Tor-igu ĉion</string>
+  <string name="pref_transparent_port_title">Listo de Pordoj</string>
+  <string name="pref_has_root">Peti Administrajn Rajtojn</string>
+  <string name="status_install_success">Binara kodo de Tor estas sukcese instalita!</string>
+  <string name="status_install_fail">Binaraj dosieroj de Tor ne povis esti instalitaj. Kontrolu protokolon kaj sciigu nin per tor-assistants at torproject.org</string>
+  <string name="title_error">Eraro de Aplikaĵo</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Pri Orbot</string>
+  <string name="btn_next">Sekva</string>
+  <string name="btn_back">Malantaŭe</string>
+  <string name="btn_finish">Fini</string>
+  <string name="btn_cancel">Rezigni</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Kelkaj Detaloj pri Orbot</string>
+  <string name="wizard_permissions_root">Permeso estas Aluĝita</string>
+  <string name="wizard_permissions_stock">Permesoj de Orbot</string>
+  <string name="wizard_permissions_consent">Mi komprenas kaj volas daŭri sen administraj rajtoj</string>
+  <string name="wizard_configure">Agordi Tor-igon</string>
+  <string name="wizard_configure_select_apps">Elekti Individualajn Aplikaĵojn por Tor</string>
+  <string name="wizard_tips_tricks">Aplikaĵoj permesitaj por Orbot</string>
+  <string name="wizard_tips_otrchat">ChatSecutre - Sekura tujmesaĝilo por Android</string>
+  <string name="wizard_tips_proxy">Agordoj de prokurilo - Lernu kiel agordi aplikaĵojn por kunlabori kun Orbot</string>
+  <string name="wizard_tips_twitter">Agordi prokurilon por Twitter je adreso \"localhost\" kaj pordo 8118</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
+  <string name="wizard_proxy_help_info">Retperant‐agordoj</string>
+  <string name="wizard_final">Orbot estas preparita!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_hs_group">Gastigado de kaŝita servo</string>
+  <string name="pref_general_group">Ĝenerala</string>
+  <string name="pref_start_boot_title">Ŝalti Orbot dum praŝargado</string>
+  <string name="pref_start_boot_summary">Aŭtomate startigi Orbot kaj konekti al Tor dum praŝargado de via Androida ilo</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Averto</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permesoj</string>
+  <string name="wizard_permissions_root_msg2">Se vi ne volas fari tion, bonvolu certiĝi ke eblas agordi aplikaĵojn por kunlabori kun Orbot</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Aplikaĵoj permesitaj por Orbot</string>
+  <string name="wizard_tips_play">Trovu ĉiujn aplikaĵojn de Guardian Project ĉe Google Play</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_hint">(Marku ĉi tiun butonon se vi ne scias pri kio ni parolas)</string>
+  <string name="wizard_transproxy_none">Neniom</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="button_grant_superuser">Peti Administrajn Rajtojn</string>
+  <string name="pref_select_apps">Elekti aplikaĵojn</string>
+  <string name="pref_node_configuration">Agordo de Nodoj</string>
+  <string name="pref_node_configuration_summary">Tie troviĝas progresintaj agordoj kiuj povas limigi vian anonimecon</string>
+  <string name="pref_entrance_node">Eniraj nodoj</string>
+  <string name="pref_entrance_node_summary">Fingrospuroj, kaŝnomoj, landoj kaj adresoj por la unua hopo</string>
+  <string name="pref_entrance_node_dialog">Entajpu enirajn nodojn</string>
+  <string name="pref_proxy_title">Elira prokurilo (Malnepra)</string>
+  <string name="pref_proxy_type_title">Tipo de elira prokurilo</string>
+  <string name="pref_proxy_type_summary">Protokolo uzata de la prokurilo: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Entajpu tipon de la prokurilo</string>
+  <string name="pref_proxy_host_title">Adreso de la elira prokurilo</string>
+  <string name="pref_proxy_host_summary">Adresnomo de la prokurilo</string>
+  <string name="pref_proxy_host_dialog">Entajpu adreson</string>
+  <string name="pref_proxy_port_title">Pordo de la elira prokurilo</string>
+  <string name="pref_proxy_port_summary">Pordo de la Prokurservilo</string>
+  <string name="pref_proxy_port_dialog">Entajpu la pordon</string>
+  <string name="pref_proxy_username_title">Uzantnomo de la elira prokurilo</string>
+  <string name="pref_proxy_username_summary">Uzantnomo de la prokurilo (Malnepra)</string>
+  <string name="pref_proxy_username_dialog">Entajpu uzantnomon</string>
+  <string name="pref_proxy_password_title">Pasvorto de la elira prokurilo</string>
+  <string name="pref_proxy_password_summary">Pasvorto de la prokurilo (Malnepra)</string>
+  <string name="pref_proxy_password_dialog">Entajpu pasvorton</string>
+  <string name="status">Stato</string>
+  <string name="couldn_t_start_tor_process_">Tor-procedo ne sukcesis stariĝi:</string>
+  <string name="bridge_error">Eraro de Ponto</string>
+  <string name="error">Eraro</string>
+  <string name="your_relay_settings_caused_an_exception_">Via agordo de relajso kaŭzis escepton!</string>
+  <string name="exit_nodes">Finnodoj</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingrospuroj, kaŝnomoj, landoj kaj adresoj por la lasta hopo</string>
+  <string name="enter_exit_nodes">Entajpu finnofojn</string>
+  <string name="use_only_these_specified_nodes">Uzi *nur* tiujn ĉi nodojn</string>
+  <string name="bridges">Pontoj</string>
+  <string name="use_bridges">Uzi Pontojn</string>
+  <string name="ip_address_and_port_of_bridges">IP-adresoj kaj pordoj de pontoj</string>
+  <string name="enter_or_port">Entajpu OR-pordon</string>
+  <string name="relay_nickname">Kaŝnomo de la relajso</string>
+  <string name="the_nickname_for_your_tor_relay">Kaŝnomo por via Tor-relajso</string>
+  <string name="enter_a_custom_relay_nickname">Entajpu propran kaŝnomon de la relajso</string>
+  <string name="reachable_addresses">Atingeblaj adresoj</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Startigi kiel kliento malantaŭ fajromuro kun restriktaj reguloj</string>
+  <string name="reachable_ports">Atingeblaj pordoj</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Pordoj, kiuj atingeblas tra la restrikta fajromuro</string>
+  <string name="enter_ports">Entajpu pordojn</string>
+  <string name="enable_hidden_services">Gastigado de Kaŝitaj Servoj</string>
+  <string name="run_servers_accessible_via_the_tor_network">permesi al servilo sur ĉi tiu aparato esti atingebla per Tor-reto</string>
+  <string name="enter_localhost_ports_for_hidden_services">entajpi localhost-pordojn de kaŝitaj servoj</string>
+  <string name="hidden_service_ports">Pordoj de Kaŝitaj Servoj</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">adreso de via kaŝita servo (aŭtomate generata)</string>
+  <string name="project_home">Retpaĝaro(j) de la Projekto:</string>
+  <string name="the_tor_license">The Tor License</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="found_existing_tor_process">trovi ekzistantan Tor-procedon...</string>
+  <string name="hidden_service_on">kaŝitaj servoj je:</string>
+  <string name="unable_to_read_hidden_service_name">ne eblas legi nomon de la kaŝita servo</string>
+  <string name="unable_to_start_tor">Ne eblas startigi Tor:</string>
+  <string name="pref_use_sys_iptables_title">Uzi defaŭltajn Iptables</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Elekti lokaĵaron kaj lingvon por Orbot</string>
+  <string name="wizard_locale_title">Elekti lingvon</string>
+  <string name="btn_save_settings">Konservi Agordojn</string>
+  <string name="bandwidth_">Kapacito:</string>
+  <string name="down">el</string>
+  <string name="up">al</string>
+  <string name="menu_use_chatsecure">Uzi ChatSecure</string>
+  <string name="install_apps_">Instali aplikaĵojn?</string>
+</resources>
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
new file mode 100644
index 0000000..b921a40
--- /dev/null
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">reiniciar Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot está iniciándose...</string>
+  <string name="status_activated">Conectado a la red Tor</string>
+  <string name="status_disabled">\"Orbot está Desactivado</string>
+  <string name="tor_process_starting">Iniciando el cliente Tor...</string>
+  <string name="tor_process_complete">Completar</string>
+  <string name="tor_process_waiting">esperando...</string>
+  <string name="not_anonymous_yet">CIUDADO: Tu tráfico no es anónimo aún! Por favor configura tus aplicaciones para que usen el HTTP proxy 127.0.0.1:8118 o SOCKS4A o el proxy SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Inicio</string>
+  <string name="menu_browse">Navegar</string>
+  <string name="menu_settings">Configuración</string>
+  <string name="menu_log">Registro</string>
+  <string name="menu_info">Ayuda</string>
+  <string name="menu_start">Iniciar</string>
+  <string name="menu_stop">Detener</string>
+  <string name="menu_about">Acerca de</string>
+  <string name="main_layout_download">Descargar</string>
+  <string name="main_layout_upload">Subir</string>
+  <string name="button_help">Ayuda</string>
+  <string name="button_close">Cerrar</string>
+  <string name="button_about">Acerca de</string>
+  <string name="button_clear_log">Borrar Registros</string>
+  <string name="menu_verify">Chequear</string>
+  <string name="menu_exit">Salir</string>
+  <string name="pref_trans_proxy_group">Proxying Transparente (Requiere Root)</string>
+  <string name="pref_trans_proxy_title">Proxying Transparente</string>
+  <string name="pref_trans_proxy_summary">Torificación Automática de Aplicaciones</string>
+  <string name="pref_transparent_all_title">Torear Todo</string>
+  <string name="status_install_fail">Los archivos binarios Tor no pudieron ser instalado. Compruebe el registro y notificar a tor-assistants at torproject.org</string>
+  <string name="title_error">Error de la aplicación</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Acerca de Orbot</string>
+  <string name="btn_next">Siguiente</string>
+  <string name="btn_back">Atrás</string>
+  <string name="btn_finish">Finalizar</string>
+  <string name="btn_okay">Ok</string>
+  <string name="btn_cancel">Cancelar</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Algunos detalles de Orbot</string>
+  <string name="wizard_final">Orbot está listo!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">General</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxying Transparente</string>
+  <string name="pref_proxy_password_dialog">Ingrese contraseña Proxy</string>
+  <string name="enter_ports">Ingresar puertos</string>
+  <string name="the_tor_license">La Licencia de Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="unable_to_start_tor">No se puede iniciar Tor:</string>
+  <string name="default_bridges"></string>
+  <string name="wizard_locale_title">Elegir el lenguaje</string>
+  <string name="btn_save_settings">Guardar configuración</string>
+  <string name="bandwidth_">Ancho de banda:</string>
+  <string name="menu_use_chatsecure">Usar ChatSecure</string>
+  <string name="install_apps_">Instalar apps?</string>
+</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
new file mode 100644
index 0000000..15c5d59
--- /dev/null
+++ b/app/src/main/res/values-es/strings.xml
@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot es una aplicación libre de proxy (interpuesto) que faculta a otras aplicaciones para usar Internet de forma más segura. Orbot utiliza Tor para cifrar su tráfico de Internet, y luego lo oculta rebotándolo a través de una serie de computadoras por todo el mundo. Tor es software libre y una red abierta que le ayuda a defenderse contra una forma de vigilancia de red conocida como análisis de tráfico que amenaza la libertad y la privacidad personales, las actividades y relaciones comerciales confidenciales, y la seguridad de estado.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">https://check.torproject.org/?lang=es</string>
+  <string name="secure_default_web_url">https://check.torproject.org/?lang=es</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">iniciar y detener Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot está iniciandose...</string>
+  <string name="status_activated">Conectado a la red Tor</string>
+  <string name="status_disabled">Orbot está desactivado</string>
+  <string name="status_shutting_down">TorService se está cerrando</string>
+  <string name="tor_process_starting">Iniciando cliente Tor...</string>
+  <string name="tor_process_complete">completado.</string>
+  <string name="tor_process_waiting">en espera.</string>
+  <string name="not_anonymous_yet">ADVERTENCIA: ¡Su tráfico no es anónimo aún! Configure sus aplicaciones para utilizar proxy HTTP 127.0.0.1:8118, o proxy SOCKS4A o SOCKS5 127.0.0.1:9050 (o podría habilitar la proxyficación transparente si su dispositivo está rooteado)</string>
+  <string name="menu_home">Principal</string>
+  <string name="menu_browse">Examinar</string>
+  <string name="menu_settings">Configuración</string>
+  <string name="menu_log">Registro (log)</string>
+  <string name="menu_info">Ayuda</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Iniciar</string>
+  <string name="menu_stop">Detener</string>
+  <string name="menu_about">Acerca de</string>
+  <string name="menu_promo_apps">Obtener aplicaciones...</string>
+  <string name="main_layout_download">Descarga</string>
+  <string name="main_layout_upload">Subida</string>
+  <string name="button_help">Ayuda</string>
+  <string name="button_close">Cerrar</string>
+  <string name="button_about">Acerca de</string>
+  <string name="button_clear_log">Limpiar registro (log)</string>
+  <string name="menu_verify">Verificar</string>
+  <string name="menu_exit">Salir</string>
+  <string name="menu_scan">Escanear QR de bridge</string>
+  <string name="menu_share_bridge">Compartir QR de bridge</string>
+  <string name="press_to_start">- mantega pulsado para iniciar -</string>
+  <string name="pref_trans_proxy_group">Proxyficación transparente (requiere root)</string>
+  <string name="pref_trans_proxy_title">Proxyficación transparente</string>
+  <string name="pref_trans_proxy_summary">Torificado automático de aplicaciones</string>
+  <string name="pref_transparent_all_title">Torificar todo</string>
+  <string name="pref_transparent_all_summary">Proxyfica vía Tor el tráfico de todas las aplicaciones sin configurarlas</string>
+  <string name="pref_transparent_port_fallback_title">Puertos a proxyficar para contingencias</string>
+  <string name="pref_transparent_port_fallback_summary">ADVERTENCIA: Evita puertos comunes (80, 443, etc). *USAR SÓLO* si los modos \'Todo\' o \'Aplicaciones\' no funcionan.</string>
+  <string name="pref_transparent_port_title">Lista de puertos</string>
+  <string name="pref_transparent_port_summary">Lista de puertos a proxyficar. *USAR SÓLO* si los modos \'Todo\' o \'Aplicaciones\' no funcionan</string>
+  <string name="pref_transparent_port_dialog">Introduzca los puertos a proxyficar</string>
+  <string name="pref_has_root">Solicitar permisos de root</string>
+  <string name="pref_has_root_summary">Solicita permisos de root para usar proxyficación transparente</string>
+  <string name="status_install_success">¡Los binarios de Tor se instalaron con éxito!</string>
+  <string name="status_install_fail">Los archivos binarios de Tor no pudieron ser instalados. Revise el registro (log) y notifique a tor-assistants at torproject.org</string>
+  <string name="title_error">Error de la aplicación</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Acerca de Orbot</string>
+  <string name="btn_next">Siguiente</string>
+  <string name="btn_back">Atrás</string>
+  <string name="btn_finish">Finalizar</string>
+  <string name="btn_okay">Aceptar</string>
+  <string name="btn_cancel">Cancelar</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Algunos detalles de Orbot</string>
+  <string name="wizard_details_msg">Orbot es una aplicación de código-abierto que contiene Tor, LibEvent y Polipo. Proporciona un proxy HTTP (8118) y un proxy SOCKS (9050) locales hacia la red Tor. Orbot también tiene la capacidad, en un dispositivo rooteado, de enviar todo el tráfico de Internet a través de Tor.</string>
+  <string name="wizard_permissions_root">Permiso concedido</string>
+  <string name="wizard_permissions_stock">Permisos de Orbot</string>
+  <string name="wizard_premissions_msg_root">¡Excelente! Hemos detectado que ha concedido a Orbot permisos de root. Utilizaremos estos poderes sabiamente.</string>
+  <string name="wizard_permissions_msg_stock"> Aunque no es un requisito, Orbot puede convertirse en una herramienta más potente si accede a su dispositivo con permisos de root. ¡Utilice el botón inferior para conceder superpoderes a Orbot!</string>
+  <string name="wizard_permissions_no_root">Si no tiene acceso como root o no tiene idea de qué estamos hablando, tan solo asegúrese de utilizar aplicaciones específicamente preparadas para trabajar con Orbot (o que permitan conexión por proxy HTTP o SOCKS).</string>
+  <string name="wizard_permissions_consent">Comprendo, y quiero continuar sin poderes administrativos</string>
+  <string name="wizard_permission_enable_root">Conceder permisos de root a Orbot</string>
+  <string name="wizard_configure">Configurar torificación</string>
+  <string name="wizard_configure_msg">Orbot le da la opción de dirigir el tráfico de todas las aplicaciones a través de Tor - o - de seleccionar sus aplicaciones a torificar individualmente.</string>
+  <string name="wizard_configure_all">Proxyficar todas la aplicaciones a través de Tor</string>
+  <string name="wizard_configure_select_apps">Seleccionar aplicaciones individuales para Tor</string>
+  <string name="wizard_tips_tricks">Aplicaciones habilitadas para Orbot</string>
+  <string name="wizard_tips_msg">Las siguientes aplicaciones fueron desarrolladas para trabajar con Orbot. Haga clic en cada botón para instalarlas ahora, o puede encontrarlas más tarde en Google Play, en la web guardianproject.info o vía f-droid.org </string>
+  <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="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="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>
+  <string name="wizard_final">¡Orbot está listo!</string>
+  <string name="wizard_final_msg">Millones de personas por todo el mundo usan Tor por una amplia variedad de razones.\n\nPeriodistas y blogueros, defensores de los derechos humanos, funcionarios judiciales, corporaciones, ciudadanos bajo regímenes represivos, y simples ciudadanos corrientes... ¡y ahora usted también está listo!</string>
+  <string name="wizard_exit_at_first_screen_toast">¡Por favor, configure Orbot antes para poder comenzar a usarlo!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Ha conectado con éxito a la red Tor - pero esto no significa que su dispositivo sea seguro. Puede usar el botón \'Navegador\' para probar su conexión. \n\nVisítenos en https://guardianproject.info/apps/orbot o envíe un correo electrónico a help at guardianproject.info para conocer más.</string>
+  <string name="tor_check">Esto abrirá https://check.torproject.org/?lang=es en su navegador predeterminado para comprobar que Orbot esté configurado y que esté conectado a Tor.</string>
+  <string name="pref_hs_group">Alojamiento de servicios ocultos (dentro de la red Tor)</string>
+  <string name="pref_general_group">General</string>
+  <string name="pref_start_boot_title">Iniciar Orbot en el arranque</string>
+  <string name="pref_start_boot_summary">Inicia Orbot y conecta a Tor automáticamente cuando arranca su dispositivo Android</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">¡Orbot trae Tor a Android!\n\nTor le ayuda a defenderse contra el filtrado de contenido, el análisis de tráfico y la vigilancia de la red, que amenazan la privacidad, la información confidencial y las relaciones personales.\n\nEste asistente le ayudará a configurar Orbot y Tor en su dispositivo.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Advertencia</string>
+  <string name="wizard_warning_msg">Simplemente instalando Orbot no anonimizará automáticamente su tráfico móvil/celular.\n\nPara usar Tor con éxito tiene que configurar adecuadamente Orbot, su dispositivo, y otras aplicaciones.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permisos</string>
+  <string name="wizard_permissions_root_msg1">Opcionalmente puede conceder permisos de \'Superusuario\' a Orbot para habilitar las características avanzadas, como la proxyficación transparente.</string>
+  <string name="wizard_permissions_root_msg2">Si no desea hacer esto, asegúrese de utilizar aplicaciones específicamente preparadas para trabajar con Orbot (o configurables para ello)</string>
+  <string name="wizard_permissions_no_root_msg">Su dispositivo no parece estar rooteado o proporcionar root o acceso de \"Superusuario\".\n\nEn su lugar, por favor, pruebe con el modo \'Aplicaciones\' en la pantalla principal.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox: Navegador con privacidad mejorada que funciona a través de Tor</string>
+  <string name="wizard_tips_play">Descubre todas las aplicaciones de Guardian Project en Google Play</string>
+  <string name="wizard_tips_fdroid">Encontrará todas las aplicaciones del Guardian Project en F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Encontrará todas las aplicaciones del Guardian Project en https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxyficación transparente</string>
+  <string name="wizard_transproxy_msg">Permite que sus aplicaciones se ejecuten automáticamente a través de la red Tor sin realizar configuración alguna.</string>
+  <string name="wizard_transproxy_hint">(Marque esta casilla si no tiene idea de qué estamos hablando)</string>
+  <string name="wizard_transproxy_none">Ninguno</string>
+  <string name="pref_transparent_tethering_title">Tor tethering</string>
+  <string name="pref_transparent_tethering_summary">Habilita la proxyficación transparente de Tor para dispositivos tethered (dispositivos móviles \"amarrados\", pasarela a Internet para otros dispositivos conectados a ellos mediante Wifi, USB o Bluetooth) -- (requiere reinicio)</string>
+  <string name="button_grant_superuser">Solicitar permisos de superusuario</string>
+  <string name="pref_select_apps">Seleccionar aplicaciones</string>
+  <string name="pref_select_apps_summary">Escoja las aplicaciones a redirigir través de Tor</string>
+  <string name="pref_node_configuration">Configuración de nodos</string>
+  <string name="pref_node_configuration_summary">¡Estas son configuraciones avanzadas que pueden reducir su anonimato! Afectan a los circuitos (túneles) que se establezcan para su propio tráfico a través de Tor; si repite tráfico ajeno estas configuraciones no afectan a esos circuitos.</string>
+  <string name="pref_entrance_node">Nodos de entrada</string>
+  <string name="pref_entrance_node_summary">Reglas de identificación de repetidores de entrada a la red Tor, mediante huellas de validación de claves (fingerprints), alias (nicks), códigos de país y 
+direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de nodos, y las configuraciones de bridges.</string>
+  <string name="pref_entrance_node_dialog">Introduzca nodos de entrada</string>
+  <string name="pref_allow_background_starts_title">Permitir inicios en segundo plano</string>
+  <string name="pref_allow_background_starts_summary">Deja que cualquier aplicación le diga a Orbot que inicie Tor y servicios relacionados</string>
+  <string name="button_proxy_all">Proxyficar todo</string>
+  <string name="button_proxy_none">No proxyficar nada</string>
+  <string name="button_invert_selection">Invertir selección</string>
+  <string name="pref_proxy_title">Proxy de salida a la red (opcional)</string>
+  <string name="pref_proxy_type_title">Tipo de proxy saliente</string>
+  <string name="pref_proxy_type_summary">Protocolo a usar para el servidor proxy saliente: HTTP, HTTPS, Socks4, Socks5.</string>
+  <string name="pref_proxy_type_dialog">Introduzca tipo de proxy</string>
+  <string name="pref_proxy_host_title">Servidor proxy saliente</string>
+  <string name="pref_proxy_host_summary">Nombre del servidor proxy </string>
+  <string name="pref_proxy_host_dialog">Introduzca el servidor proxy</string>
+  <string name="pref_proxy_port_title">Puerto del proxy saliente </string>
+  <string name="pref_proxy_port_summary">Puerto del servidor proxy</string>
+  <string name="pref_proxy_port_dialog">Introduzca el puerto del proxy</string>
+  <string name="pref_proxy_username_title">Nombre de usuario en el proxy de salida</string>
+  <string name="pref_proxy_username_summary">Nombre de usuario en el proxy (opcional)</string>
+  <string name="pref_proxy_username_dialog">Introduzca nombre de usuario en el proxy</string>
+  <string name="pref_proxy_password_title">Contraseña en el proxy de salida</string>
+  <string name="pref_proxy_password_summary">Contraseña en el proxy (opcional)</string>
+  <string name="pref_proxy_password_dialog">Introduzca contraseña en el proxy</string>
+  <string name="status">Estado</string>
+  <string name="setting_up_full_transparent_proxying_">Estableciendo proxyficación transparente completa... </string>
+  <string name="setting_up_app_based_transparent_proxying_">Estableciendo proxyficación transparente por aplicaciones... </string>
+  <string name="transparent_proxying_enabled">Proxyficación transparente ACTIVADA</string>
+  <string name="transproxy_enabled_for_tethering_">¡TransProxy (proxyficación transparente) habilitado para tethering (pasarela)!</string>
+  <string name="warning_error_starting_transparent_proxying_">ADVERTENCIA: ¡Error al iniciar la proxyficación transparente!</string>
+  <string name="transproxy_rules_cleared">Reglas de TransProxy (proxyficación transparente) borradas</string>
+  <string name="couldn_t_start_tor_process_">No se pudo iniciar el proceso de Tor: </string>
+  <string name="privoxy_is_running_on_port_">Polipo se está ejecutando en el puerto:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Estableciendo proxyficación transparente por puertos... </string>
+  <string name="bridge_error">Error de bridge (repetidor puente)</string>
+  <string name="bridge_requires_ip">Para utilizar la función bridge (repetidor puente, acceso a Tor de publicitación restringida), debe introducir al menos una dirección IP de bridge.</string>
+  <string name="send_email_for_bridges">Envíe un correo a bridges at torproject.org incluyendo en el cuerpo del mensaje una línea sólo con \"get bridges\", desde una cuenta con dominio gmail.com, yahoo.com o yahoo.cn (que soportan DKIM)</string>
+  <string name="error">Error</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">¡Sus \'Reglas de direcciones accesibles\' han producido una excepción!</string>
+  <string name="your_relay_settings_caused_an_exception_">¡La configuración de su repetidor ha producido una excepción!</string>
+  <string name="exit_nodes">Nodos de salida</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Reglas de identificación de repetidores de salida de la red Tor, mediante huellas de validación de claves (fingerprints), alias (nicks), códigos de país y direcciones (o rangos)</string>
+  <string name="enter_exit_nodes">Introduzca repetidores de salida</string>
+  <string name="exclude_nodes">Excluír nodos</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Reglas de identificación de repetidores a evitar en la red Tor, mediante huellas de validación de claves (fingerprints), alias (nicks), códigos de país y direcciones (o rangos)</string>
+  <string name="enter_exclude_nodes">Introduzca repetidores a evitar</string>
+  <string name="strict_nodes">Hacer estricta la exclusión de nodos (incluso si falla la comunicación)</string>
+  <string name="use_only_these_specified_nodes">Usar *sólo* estos nodos especificados</string>
+  <string name="bridges">Bridges (repetidores puente) </string>
+  <string name="use_bridges">Usar bridges</string>
+  <string name="bridges_obfuscated">Bridges ofuscados (contra análisis DPI del tráfico) </string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilita nodos alternativos de entrada a la red Tor, de publicitación restringida. Prevalece sobre \'Nodos de entrada\'</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilítelo si los bridges (repetidores puente) de su lista de configuración están ofuscados (encapsulando el tráfico SSL para evitar ser detectados) </string>
+  <string name="ip_address_and_port_of_bridges">Direcciones IP y puertos de los bridges</string>
+  <string name="enter_bridge_addresses">Introduzca direcciones de bridge</string>
+  <string name="relays">Repetidores</string>
+  <string name="relaying">Repetición de tráfico</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Habilitar que su dispositivo no sea repetidor de salida (de la red Tor) </string>
+  <string name="relay_port">Puerto de repetidor</string>
+  <string name="listening_port_for_your_tor_relay">Puerto de escucha para su repetidor Tor</string>
+  <string name="enter_or_port">Introduzca puerto OR (Onion Routing, repositorio de repetidores)</string>
+  <string name="relay_nickname">Alias del repetidor</string>
+  <string name="the_nickname_for_your_tor_relay">El apodo que identificará a su repetidor en la red Tor</string>
+  <string name="enter_a_custom_relay_nickname">Introduzca un alias personalizado para su repetidor</string>
+  <string name="reachable_addresses">Reglas de direcciones accesibles ([accept(*)|reject] IP:port, etc.)</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Ejecutar Tor como sólo cliente detrás de un cortafuegos (firewall) con políticas restrictivas</string>
+  <string name="reachable_ports">Puertos accesibles</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Puertos accesibles detrás de un firewall restrictivo (80 y 443 por defecto)</string>
+  <string name="enter_ports">Introduzca puertos</string>
+  <string name="enable_hidden_services">Activar alojamiento de servicios ocultos (en la red Tor)</string>
+  <string name="run_servers_accessible_via_the_tor_network">Permite el acceso a servidores ocultos por dispositivo (IP oculta al usuario) accesibles a través de la red Tor (dominio .onion, sin DNS)</string>
+  <string name="enter_localhost_ports_for_hidden_services">Introduzca los puertos locales de sus servicios ocultos</string>
+  <string name="hidden_service_ports">Puertos de los servicios ocultos</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">El nombre direccionable (sin DNS, .onion generado automáticamente) para su servicio oculto</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Habilitar el registro de depuración (debug log) a la salida (debe utilizar adb o aLogCat para verlo)</string>
+  <string name="project_home">Página(s) principal(es) del proyecto:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Licencia de Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Software de terceras partes</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Una aplicación está intentando abrir el puerto %S de servicio oculto hacia la red Tor. Esto es seguro si su aplicación es de su confianza.</string>
+  <string name="found_existing_tor_process">Se encontró un proceso de Tor ya existente...</string>
+  <string name="something_bad_happened">Hubo algún tipo de problema. Compruebe el registro (log)</string>
+  <string name="hidden_service_on">Servicio oculto en:</string>
+  <string name="unable_to_read_hidden_service_name">No fue posible leer el nombre del servicio oculto</string>
+  <string name="unable_to_start_tor">No fue posible iniciar Tor: </string>
+  <string name="unable_to_reset_tor">¡Reinicie su dispositivo, no se pudo reiniciar Tor!</string>
+  <string name="pref_use_sys_iptables_title">Usar el Iptables por defecto</string>
+  <string name="pref_use_sys_iptables_summary">Usa el binario de Iptables del sistema en lugar del incluído en el paquete de Orbot</string>
+  <string name="error_installing_binares">No fue posible instalar o actualizar los binarios de Tor.</string>
+  <string name="pref_use_persistent_notifications">Mantener siempre el icono de Orbot en la barra de tareas cuando esté conectado</string>
+  <string name="pref_use_persistent_notifications_title">Notificaciones siempre activadas</string>
+  <string name="pref_use_expanded_notifications">Mostrar notificación expandida con el país de salida de Tor y la IP</string>
+  <string name="pref_use_expanded_notifications_title">Notificaciones expandidas</string>
+  <string name="notification_using_bridges">¡Bridges habilitados! </string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Idioma</string>
+  <string name="set_locale_summary">Elija la configuración regional y el idioma para Orbot</string>
+  <string name="wizard_locale_title">Escoja idioma</string>
+  <string name="wizard_locale_msg">Deje el predeterminado o cambie de idioma</string>
+  <string name="powered_by">impulsado por Tor</string>
+  <string name="btn_save_settings">Guardar configuración</string>
+  <string name="no_internet_connection_tor">Sin conexión a Internet; Tor está en suspensión...</string>
+  <string name="bandwidth_">Ancho de banda:</string>
+  <string name="down">bajada</string>
+  <string name="up">subida</string>
+  <string name="pref_disable_network_title">Sin suspensión-automática de la red</string>
+  <string name="pref_disable_network_summary">Ponga Tor en suspensión cuando no haya Internet disponible</string>
+  <string name="newnym">¡Ha cambiado a una nueva identidad de Tor!</string>
+  <string name="menu_verify_browser">Navegador</string>
+  <string name="menu_use_chatsecure">Usar ChatSecure</string>
+  <string name="permission_manage_tor_label">Administrar Tor</string>
+  <string name="permission_manage_tor_description">Habilita esta aplicación para controlar el servicio Tor</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">No parece que tenga Orfox instalado. ¿Quiere ayuda con eso, o simplemente debemos abrir el navegador?</string>
+  <string name="install_apps_">¿Instalar aplicaciones?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">No hay conectividad de red. Poniendo a Tor a dormir...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">La conectividad de red es buena. Despertando a Tor...</string>
+  <string name="updating_settings_in_tor_service">actualizando la configuración en el servicio Tor</string>
+  <string name="pref_socks_title">SOCKS de Tor</string>
+  <string name="pref_socks_summary">Puerto sobre el que Tor ofrece su proxy SOCKS (por defecto: 9050 o 0 para deshabilitarlo)</string>
+  <string name="pref_socks_dialog">Configuración del puerto SOCKS</string>
+  <string name="pref_transport_title">Puerto de TransProxy de Tor</string>
+  <string name="pref_transport_summary">Puerto sobre el que Tor ofrece su Proxy Transparente (por defecto: 9040 o 0 para deshabilitarlo)</string>
+  <string name="pref_transport_dialog">Configuración del puerto de TransProxy</string>
+  <string name="pref_dnsport_title">Puerto DNS de Tor</string>
+  <string name="pref_dnsport_summary">Puerto sobre el que Tor ofrece su DNS (por defecto: 5400 o 0 para deshabilitarlo)</string>
+  <string name="pref_dnsport_dialog">Configuración del puerto DNS</string>
+  <string name="pref_torrc_title">Configuración personalizada de torrc</string>
+  <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="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>
+  <string name="pref_transproxy_refresh_title">Auto-refresco de transproxy</string>
+  <string name="pref_transproxy_refresh_summary">Reaplica las reglas de transproxy cuando el estado de la red cambia</string>
+  <string name="pref_transproxy_flush_title">Transproxy FORZAR ELIMINACIÓN</string>
+  <string name="pref_transproxy_flush_summary">Pulse aquí para desechar AHORA todas las reglas de red de transproxy </string>
+  <string name="transparent_proxy_rules_flushed_">¡Reglas de proxy transparente desechadas!</string>
+  <string name="you_do_not_have_root_access_enabled">No tiene habilitado el acceso como ROOT</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Puede que tenga que detener e iniciar Orbot para que el cambio de configuración se habilite.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Bridges actualizados</string>
+  <string name="restart_orbot_to_use_this_bridge_">Por favor, reinicie Orbot para habilitar los cambios</string>
+  <string name="menu_qr">Códigos QR</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Si su red móvil/celular bloquea activamente Tor, puede usar un Puente (bridge) para acceder a la red. SELECCIONE uno de los tipos de repetidor puente arriba para hablitar los puentes.</string>
+  <string name="bridge_mode">Modo bridge</string>
+  <string name="get_bridges_email">Correo electrónico</string>
+  <string name="get_bridges_web">Página web</string>
+  <string name="activate">Activar</string>
+  <string name="apps_mode">Aplicaciones en modo VPN</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Puede habilitar que todas las aplicaciones de su dispositivo transiten a través de la red Tor usando la función VPN de Android.\n\n*ADVERTENCIA* Esta es una característica experimental nueva, y en algunos casos puede que no se inicie automáticamente, o puede que se detenga. NO debe usarse para anonimato, SÓLO para atravesar cortafuegos (firewalls) y filtros.</string>
+  <string name="send_email">Enviar correo</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Puede obtener una dirección de bridge (repetidor puente) a través de correo electrónico, la web, o escaneando un código QR de bridge. Seleccione \'Correo\' o \'Web\' debajo para solicitar una dirección de bridge.\n\nUna vez tenga una dirección, copie y péguela en la opción \"Bridges\" de la configuración de Orbot, y reinicie.</string>
+  <string name="install_orweb">Instalar Orfox</string>
+  <string name="standard_browser">Navegador estándar</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTA: Sólo los repetidores puente (bridges) estándar de Tor funcionan en dispositivos Intel X86/ATOM</string>
+  <string name="vpn_default_world">Mundo</string>
+</resources>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
new file mode 100644
index 0000000..9ef3be4
--- /dev/null
+++ b/app/src/main/res/values-et/strings.xml
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.orghttp://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">käivita ja peata Tor</string>
+  <string name="tor_proxy_service_process">torproxyteenus</string>
+  <string name="status_starting_up">Orbot käivitub...</string>
+  <string name="status_activated">Ühendatud Tor võrgustikku</string>
+  <string name="status_disabled">Orbot deaktiveeritud</string>
+  <string name="tor_process_starting">Tor kliendi käivitamine...</string>
+  <string name="tor_process_complete">valmis.</string>
+  <string name="tor_process_waiting">ootel.</string>
+  <string name="not_anonymous_yet">HOIATUS: Teie liiklus pole veel anonüümne! Palun seadistage oma rakendused nii et need kasutaksid HTTP proxy\'t 127.0.0.1:8118 või SOCKS4A või SOCKS5 proxy\'t 127.0.0.1:9050</string>
+  <string name="menu_home">Kodu</string>
+  <string name="menu_browse">Sirvi</string>
+  <string name="menu_settings">Seaded</string>
+  <string name="menu_log">Logi</string>
+  <string name="menu_info">Abi</string>
+  <string name="menu_start">Start</string>
+  <string name="menu_stop">Stopp</string>
+  <string name="menu_about">Lähemalt</string>
+  <string name="main_layout_download">Lae alla</string>
+  <string name="main_layout_upload">Lae üles</string>
+  <string name="button_help">Abi</string>
+  <string name="button_close">Sulge</string>
+  <string name="button_about">Lähemalt</string>
+  <string name="button_clear_log">Nulli logi</string>
+  <string name="menu_verify">Kontrolli</string>
+  <string name="menu_exit">Välja</string>
+  <string name="press_to_start">- pikk vajutus alustamiseks -</string>
+  <string name="pref_trans_proxy_group">Läbipaistev proxy (Nõuab Root õigusi)</string>
+  <string name="pref_trans_proxy_title">Läbipaistev proxy</string>
+  <string name="pref_trans_proxy_summary">Rakenduste automaatne Torifitseerimine</string>
+  <string name="pref_transparent_all_title">Kõik läbi Tor\'i</string>
+  <string name="pref_transparent_all_summary">Proxy kõikide reakenduste liiklus läbi Tor\'i</string>
+  <string name="pref_transparent_port_fallback_title">Pordiproxy reserv</string>
+  <string name="pref_transparent_port_fallback_summary">HOIATUS: Väldib tavaporte (80, 443, jne). *KASUTAGE AINULT SIIS* kui \'Kõik\' või \'Rakendused\' režiim ei tööta.</string>
+  <string name="pref_transparent_port_title">Portide loend</string>
+  <string name="pref_transparent_port_summary">Proxy portide loend. *KASUTAGE SINULT SIIS* kui \'Kõik\' või \'Rakendused\' režiim ei tööta</string>
+  <string name="pref_transparent_port_dialog">Sisestage pordid mida proxy\'da</string>
+  <string name="pref_has_root">Nõua root juurdepääsu</string>
+  <string name="pref_has_root_summary">Nõua läbipaistva proxy jaoks root juurdepääsu</string>
+  <string name="status_install_success">Tor binaarid edukalt paigaldatud!</string>
+  <string name="status_install_fail">Tor binaarfailide paigaldamine ebaõnnestus. Palun kontrollige logi ja teavitage tor-assistants at torproject.org</string>
+  <string name="title_error">Rakenduse Viga</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Lähemalt Orbot\'ist</string>
+  <string name="btn_next">Edasi</string>
+  <string name="btn_back">Tagasi</string>
+  <string name="btn_finish">Lõpeta</string>
+  <string name="btn_okay">Hea küll</string>
+  <string name="btn_cancel">Katkesta</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Mõned Orbot\'i detailid</string>
+  <string name="wizard_permissions_root">Luba Antud</string>
+  <string name="wizard_permissions_stock">Orbot õigused</string>
+  <string name="wizard_premissions_msg_root">Vinge! Leidsime et teie seadmes on Orbot\'ile lubatud root õigused. Lubame kasutada seda väge arukalt.</string>
+  <string name="wizard_permissions_msg_stock">Kuigi see pole vajalik, saab root juurdepääsuga seadmel kasutada Orbot\'i palju võimsama vahendina. Kasutage allpool olevat nuppu et lubada Orbot\'ile supervõimed!</string>
+  <string name="wizard_permissions_no_root">Kui teil pole root juurdepääsu või te ei tea millest jutt käib, siis kindlustage et kasutate ainult rakendusi mis on seadistatud Orbot\'iga koos töötama.</string>
+  <string name="wizard_permissions_consent">Saan aru ja jätkan ilma Superkasutajata</string>
+  <string name="wizard_permission_enable_root">Luba Orbotile Root õigused</string>
+  <string name="wizard_configure">Seadista Torifitseerimine</string>
+  <string name="wizard_configure_msg">Orbot võimaldab juhtida kõigi rakenduste liikluse läbi Tor\'i VÕI valida need rakendused individuaalselt.</string>
+  <string name="wizard_configure_all">Proxy kõik rakendused läbi Tor\'i</string>
+  <string name="wizard_configure_select_apps">Valige Tor\'i jaoks individuaalsed rakendused</string>
+  <string name="wizard_tips_tricks">Orbot-lubatud rakendused</string>
+  <string name="wizard_tips_msg">Alltoodud rakendused arendati Orbot\'iga koos töötama. Koheseks paigaldamiseks vajutage igat allolevat nuppu või paigaldage need hiljem Google Play portaalist, GuardianProject.info veebilehelt või F-Droid.org kaudu.</string>
+  <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="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>
+  <string name="wizard_final">Orbot on valmis!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">See avab teie veebisivikus lehe https://check.torproject.org mille kaudu saate näha kas Orbot on ehk seadistatud ja olete ühenduses Tor\'iga.</string>
+  <string name="pref_hs_group">Peidetud Teenuste Majutus</string>
+  <string name="pref_general_group">Üldist</string>
+  <string name="pref_start_boot_title">Käivita Orbot seadme käivitumisel</string>
+  <string name="pref_start_boot_summary">Automaatne Orbot käivitumine ja Tor külge ühendumine seadme käivitumisel</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Hoiatus</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Load</string>
+  <string name="wizard_permissions_root_msg1">Võite Orbot\'ile lubada \'Superkasutaja\' juurdepääsu selleks et võimaldada rohkem võimalusi, nagu näiteks Läbipaistev Proxy.</string>
+  <string name="wizard_permissions_root_msg2">Kui te ei soovi seda teha, siis palun kindlustage et kasutate ainult rakendusi mis on seadistatud töötama koos Orbot\'iga</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Kõik Guardian Project rakendused on leitavad ka Google Play kaudu</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Läbipaistev Proxy</string>
+  <string name="wizard_transproxy_msg">Saate kõik rakendused suunata iseeneslikult Tor kaudu, lisaseadistusteta.</string>
+  <string name="wizard_transproxy_hint">(Klikkige sellele kastile kui teil pole õrna aimugi millest jutt käib)</string>
+  <string name="wizard_transproxy_none">Puudub</string>
+  <string name="pref_transparent_tethering_title">Tor lõastamine</string>
+  <string name="pref_transparent_tethering_summary">Luba Tor Läbipaistev Proxy WiFi ja USB lõastatud seadmetele (vajab uuestilaadimist)</string>
+  <string name="button_grant_superuser">Nõua Superkasutaja Juurdepääsu</string>
+  <string name="pref_select_apps">Vali Rakendused</string>
+  <string name="pref_select_apps_summary">Vali läbi Tor suunatavad rakendused</string>
+  <string name="pref_node_configuration">Sõlme seadistamine</string>
+  <string name="pref_node_configuration_summary">Need on seadistused edasijõudnutele ja võivad vähendada teie anonüümsust</string>
+  <string name="pref_entrance_node">Sisendsõlmed</string>
+  <string name="pref_entrance_node_summary">Sõrmejäljed, hüüdnimed, riigid ja aadressid esimese hüppe jaoks</string>
+  <string name="pref_entrance_node_dialog">Sisestage sisendsõlmed</string>
+  <string name="pref_proxy_title">Väljuva võrgu proxy (Valikuline)</string>
+  <string name="pref_proxy_type_title">Väljuva proxy tüüp</string>
+  <string name="pref_proxy_type_summary">Proxy serveri kasutamise protokoll: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Sisestage proxy tüüp</string>
+  <string name="pref_proxy_host_title">Väljuva proxy seade</string>
+  <string name="pref_proxy_host_summary">Proxyserveri seadmenimi</string>
+  <string name="pref_proxy_host_dialog">Sisestage proxy seade</string>
+  <string name="pref_proxy_port_title">Väljuva proxy port</string>
+  <string name="pref_proxy_port_summary">Proxyserveri port</string>
+  <string name="pref_proxy_port_dialog">Sisestage proxy port</string>
+  <string name="pref_proxy_username_title">Väljuva proxy kasutajanimi</string>
+  <string name="pref_proxy_username_summary">Proxy kasutajanimi (Valikuline)</string>
+  <string name="pref_proxy_username_dialog">Sisestage proxy kasutajanimi</string>
+  <string name="pref_proxy_password_title">Väljuva proxy salasõna</string>
+  <string name="pref_proxy_password_summary">Proxy salasõna (Valikuline)</string>
+  <string name="pref_proxy_password_dialog">Sisestage proxy salasõna</string>
+  <string name="status">Olek</string>
+  <string name="setting_up_full_transparent_proxying_">Täisläbipaistva proxy seadistamine...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Rakenduspõhise läbipaistva proxy seadistamine...</string>
+  <string name="transparent_proxying_enabled">Läbipaistev proxy LUBATUD</string>
+  <string name="transproxy_enabled_for_tethering_">LäbivProxy lõastamine lubatud!</string>
+  <string name="warning_error_starting_transparent_proxying_">Hoiatus: viga läbipaistva proxy käivitamisel!</string>
+  <string name="transproxy_rules_cleared">LäbivProxy seaded nullitud</string>
+  <string name="couldn_t_start_tor_process_">Tor protsessi käivitamine ebaõnnestus:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Pordipõhise läbipaistva proxy seadistamine...</string>
+  <string name="bridge_error">Silla viga</string>
+  <string name="bridge_requires_ip">Silla võimaluse kasutamiseks peate sisestama vähemalt ühe silla IP aadressi.</string>
+  <string name="send_email_for_bridges">Saatke e-kiri oma gmail kontolt aadressile bridges at torproject.org mis sisaldab ainult ühte rida \"get bridges\".</string>
+  <string name="error">Viga</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Teie ReachableAddresses seadistus põhjustas ekse!</string>
+  <string name="your_relay_settings_caused_an_exception_">Teie releeseadistus põhjustas ekse!</string>
+  <string name="exit_nodes">Väljundsõlmed</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Sõrmejäljed, hüüdnimed, riigid ja aadressid viimase hüppe jaoks</string>
+  <string name="enter_exit_nodes">Sisestage väljundsõlmed</string>
+  <string name="exclude_nodes">Välistatud sõlmed</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Sõrmejäljed, hüüdnimed, riigid ja aadressid mida välistada</string>
+  <string name="enter_exclude_nodes">Sisestage välistatavad sõlmed</string>
+  <string name="strict_nodes">Kindlad sõlmed</string>
+  <string name="use_only_these_specified_nodes">Kasuta *ainult* neid märgitud sõlmi</string>
+  <string name="bridges">Sillad</string>
+  <string name="use_bridges">Kasuta sildu</string>
+  <string name="bridges_obfuscated">Varjatud sillad</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Luba Tor võrgustiku alternatiivseid sisendsõlmi</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Luba siis kui seadistatud sillad on varjatud sillad</string>
+  <string name="ip_address_and_port_of_bridges">Sildade IP aadressid ja pordinumbrid</string>
+  <string name="enter_bridge_addresses">Sisestage silla aadressid</string>
+  <string name="relays">Edastajad</string>
+  <string name="relaying">Edastamine</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Luba oma seadmel hakata mitte-väljund edastajaks</string>
+  <string name="relay_port">Edastusport</string>
+  <string name="listening_port_for_your_tor_relay">Port mida teie Tor edastaja kuulab</string>
+  <string name="enter_or_port">Kas Enter VÕI port</string>
+  <string name="relay_nickname">Edastaja hüüdnimi</string>
+  <string name="the_nickname_for_your_tor_relay">Teie Tor edastaja hüüdnimi</string>
+  <string name="enter_a_custom_relay_nickname">Sisestage edastaja kohandatud hüüdnimi</string>
+  <string name="reachable_addresses">Juurdepääsetavad aadressid</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Käivita kui piirava poliitikaga tulemüüri taga asuvat klienti.</string>
+  <string name="reachable_ports">Juurdepääsetavad pordid</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Piirava poliitikaga tulemüüris avatud pordid</string>
+  <string name="enter_ports">Sisestage pordid</string>
+  <string name="enable_hidden_services">Varjatud teenuste majutamine</string>
+  <string name="run_servers_accessible_via_the_tor_network">luba üle Tor võrgustiku juurdepääs seadmes töötavale serverile</string>
+  <string name="enter_localhost_ports_for_hidden_services">sisestage varjatud teenuste localhost pordid</string>
+  <string name="hidden_service_ports">Varjatud teenuste pordid</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">teie varjatud teenuste adresseeritav nimi (luuakse automaatselt)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">lubage väljastatav silumislogi (vaatamiseks peab kasutama kas adb või aLogCat utiliite) </string>
+  <string name="project_home">Projekti kodu(d):</string>
+  <string name="the_tor_license">Tor litsents</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Kolmanda osapoole tarkvara:</string>
+  <string name="hidden_service_request">Üks rakendus soovib avada varjatud teenuse porti %S Tor võrgustikule. See on turvaline kui te usaldate seda rakendust.</string>
+  <string name="found_existing_tor_process">leidus töötav Tor protsess...</string>
+  <string name="something_bad_happened">Juhtus midagi halba. Kontrollige logi</string>
+  <string name="hidden_service_on">varjatud teenused:</string>
+  <string name="unable_to_read_hidden_service_name">ei õnnestu lugeda varjatud teenuse nime</string>
+  <string name="unable_to_start_tor">Tor käivitamine ebaõnnestus:</string>
+  <string name="pref_use_sys_iptables_title">Kasuta iptables vaikeseadeid</string>
+  <string name="pref_use_sys_iptables_summary">kasuta Orbot\'iga kaasneva iptables binaari asemel süsteemset binaari</string>
+  <string name="error_installing_binares">Tor binaaride paigaldamine või uuendamine ebaõnnestus.</string>
+  <string name="pref_use_persistent_notifications">Ühendatud Orbot korral näidata katkematult ikoonide tööriistariba</string>
+  <string name="pref_use_persistent_notifications_title">Pidevalt kuvatavad teated</string>
+  <string name="notification_using_bridges">Sillad lubatud!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Valige Orbot lokaat ja keel</string>
+  <string name="wizard_locale_title">Valige keel</string>
+  <string name="wizard_locale_msg">Jätkake vaikeväärtusega või vahetage kehtiv keel</string>
+  <string name="btn_save_settings">Salvesta seaded</string>
+  <string name="bandwidth_">Ribalaius:</string>
+  <string name="down">alla</string>
+  <string name="up">üles</string>
+  <string name="pref_disable_network_title">Pole võrgu auto-und</string>
+  <string name="pref_disable_network_summary">Pane Tor magama kui Internetiühendus puudub</string>
+  <string name="newnym">Lülitusite uuele Tor identiteedile!</string>
+  <string name="menu_use_chatsecure">Kasutage ChatSecure\'t</string>
+  <string name="permission_manage_tor_label">Hallake Tor\'i</string>
+  <string name="permission_manage_tor_description">Lubage sellel rakendusel hallata Tor teenust</string>
+  <string name="install_apps_">Paigaldada rakendusi?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Interneti ühendus puudub. Panen Tori magama...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Interneti ühendus hea. Äratan Tori üles...</string>
+</resources>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
new file mode 100644
index 0000000..198c612
--- /dev/null
+++ b/app/src/main/res/values-eu/strings.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">Tor abiarazi eta gelditu</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot abiarazten ari da...</string>
+  <string name="status_activated">Tor sarera konektatuta</string>
+  <string name="status_disabled">\"Orbot desaktibatuta dago</string>
+  <string name="tor_process_starting">Tor bezeroa hasten...</string>
+  <string name="tor_process_complete">eginda.</string>
+  <string name="tor_process_waiting">itxaroten.</string>
+  <string name="not_anonymous_yet">ABISUA: Zure trafikoa ez da anonimoa oraindik! Mesedez konfigura itzazu zure aplikazioak 127.0.0.1:8118 HTTP proxya edo 127.0.0.1:9050 SOCKS4 edo SOCKS5 proxyak erabiltzeko</string>
+  <string name="menu_home">Etxea</string>
+  <string name="menu_browse">Arakatu</string>
+  <string name="menu_settings">Ezarpenak</string>
+  <string name="menu_log">Saioa hasi</string>
+  <string name="menu_info">Laguntza</string>
+  <string name="menu_start">Abiarazi</string>
+  <string name="menu_stop">Gelditu</string>
+  <string name="menu_about">Honi buruz</string>
+  <string name="main_layout_download">Deskargatu</string>
+  <string name="main_layout_upload">Igo</string>
+  <string name="button_help">Laguntza</string>
+  <string name="button_close">Itxi</string>
+  <string name="button_about">Honi buruz</string>
+  <string name="button_clear_log">Zerrenda Garbitu</string>
+  <string name="menu_verify">Egiaztatu</string>
+  <string name="menu_exit">Irten</string>
+  <string name="press_to_start">- sakatu luze hasteko -</string>
+  <string name="pref_trans_proxy_group">Proxyatze Gardena (Root behar du)</string>
+  <string name="pref_trans_proxy_title">Proxyatze Gardena</string>
+  <string name="pref_trans_proxy_summary">Aplikazioen Torifikatze Automatikoa</string>
+  <string name="pref_transparent_all_title">Tor-tu Dena</string>
+  <string name="pref_transparent_all_summary">Aplikazio guztien trafikoa Tor bidez proxyatu</string>
+  <string name="pref_transparent_port_fallback_title">Azken aukerako proxy portuak</string>
+  <string name="pref_transparent_port_fallback_summary">KONTUZ: Ohizko portuak sahiezten ditu (80, 443, etab.) *ERABILI BAKARRIK* \'Guztiak\' edo \'Aplikazio\' modua ez badabil.</string>
+  <string name="pref_transparent_port_title">Portu Zerrenda</string>
+  <string name="pref_transparent_port_summary">Proxyak baimenduko dituen portuak. *ERABILI BAKARRIK* \'Guztiak\' edo \'Aplikazio\' modua ez badabil</string>
+  <string name="pref_transparent_port_dialog">Sartu proxyatzeko portuak</string>
+  <string name="pref_has_root">Root sarrera eskatu</string>
+  <string name="pref_has_root_summary">Root sarrera eskatu proxyatze gardenarentzat</string>
+  <string name="status_install_success">Tor bitarrak zuzen instalatuta!</string>
+  <string name="status_install_fail">Tor fitxategi bitarrak ezin izan dira instalatu. Mesedez ikusi erregistroa eta jakinarazi tor-assistants at torproject.org</string>
+  <string name="title_error">Aplikazio Akatsa</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Orboti buruz</string>
+  <string name="btn_next">Hurrengoa</string>
+  <string name="btn_back">Atzera</string>
+  <string name="btn_finish">Amaitu</string>
+  <string name="btn_okay">Ados</string>
+  <string name="btn_cancel">Utzi</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Orbot xehetasun batzuk</string>
+  <string name="wizard_permissions_root">Baimena Emanda</string>
+  <string name="wizard_permissions_stock">Orbot Baimenak</string>
+  <string name="wizard_premissions_msg_root">Bikain! Orbotentzako root baimenak gaituta dituzula detektatu dugu.</string>
+  <string name="wizard_permissions_msg_stock">Beharrezkoa ez den arren, Orbot tresna ahaltsuagoa bihurtu daiteke zure gailuak root atzipena badu. Erabili beheko botoia Orboteri superbotereak emateko!</string>
+  <string name="wizard_permissions_no_root">Root atzipenik ez baduzu edo zertaz ari garen ez badakizu, ziurtatu zire appak Orbotekin lan egiteko konfiguratzen dituzula.</string>
+  <string name="wizard_permissions_consent">Ulertzen dut eta supererabiltzaile gabe jarraitu nahiko nuke</string>
+  <string name="wizard_permission_enable_root">Root Orboti eman</string>
+  <string name="wizard_configure">Torifikazioa Konfiguratu</string>
+  <string name="wizard_configure_msg">Orbotek zure aplikazio guztien EDO banan-banan hautatutako aplikazioen trafiko guztia Tor bidez bideratzeko aukera ematen dizu.</string>
+  <string name="wizard_configure_all">Aplikazio guztiak Tor bidez proxyatu</string>
+  <string name="wizard_configure_select_apps">Hautatu Banakako Aplikazioak Torentzat</string>
+  <string name="wizard_tips_tricks">Orbot-gaitutako Aplikazioak</string>
+  <string name="wizard_tips_msg">Azpiko appak Orbotekin lan egiteko garatuta daude. Sakatu botoi bakoitza orain instalatzeko, edo bilatu geroago Google Play-n, GuardianProject.info webgunean edo F-Droid.org erabiliz.</string>
+  <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="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>
+  <string name="wizard_final">Orbot prest dago!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Honek https://check.torproject.org web nabigatzailean irekiko du Orbot konfiguratuta eta Tor-era konektatuta zauden antzemateko.</string>
+  <string name="pref_hs_group">Ezkutuko Zerbitzuak</string>
+  <string name="pref_general_group">Orokorra</string>
+  <string name="pref_start_boot_title">Hasi Orbot Abiarazterakoan</string>
+  <string name="pref_start_boot_summary">Automatikoki Orbot hasi eta Tor konektatu zure Android gailua abiarazterakoan</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Abisua</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Baimenak</string>
+  <string name="wizard_permissions_root_msg1">Aukera moduan Orbot-i \'Supererabiltzaile\' atzipena eman ahal diozu ezaugarri aurreratuak erabiltzeko, Proxy gardena adibidez.</string>
+  <string name="wizard_permissions_root_msg2">Ez baduzu hau egin nahi ziurtatu Orbot-ekin lan egiten duten aplikazioak erabiltzen dituzula.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Google Play-n Guardiak Proiektuko aplikazio guztiak bilatu</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxyatze Gardena</string>
+  <string name="wizard_transproxy_msg">Honek zure aplikazioak konfiguratu beharrik Tor saretik joatea ahalbidetzen du.</string>
+  <string name="wizard_transproxy_hint">(Gaituta utzi zertaz ari garez ulertzen ez baduzu)</string>
+  <string name="wizard_transproxy_none">Bat ere ez</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Gaitu proxy gardena Wifi eta USB bidez Tethering-atutako gailuentzat (berrabiaraztea beharrezkoa)</string>
+  <string name="button_grant_superuser">Supererabiltzaile sarrera eskatu</string>
+  <string name="pref_select_apps">Aplikazioak hautatu</string>
+  <string name="pref_select_apps_summary">Tor bidez bideratuko diren aplikazioak hautatu</string>
+  <string name="pref_node_configuration">Nodo Konfigurazioa</string>
+  <string name="pref_node_configuration_summary">Hauek zure anonimotasuna murriztu dezaketen ezarpen aurreratuak dira</string>
+  <string name="pref_entrance_node">Sarrera Nodoak</string>
+  <string name="pref_entrance_node_summary">Lehen jauzirako hatzmarka, ezizen, herrialde eta helbideak</string>
+  <string name="pref_entrance_node_dialog">Sartu Sarrera Nodoak</string>
+  <string name="pref_proxy_title">Irteera sareko proxya (Aukerazkoa)</string>
+  <string name="pref_proxy_type_title">Proxy mota</string>
+  <string name="pref_proxy_type_summary">Proxy zerbitzariarentzako erabiltzeko protokoloak: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Sartu Proxy Mota</string>
+  <string name="pref_proxy_host_title">Proxy Ostalaria</string>
+  <string name="pref_proxy_host_summary">Proxy zerbitzariaren helbidea</string>
+  <string name="pref_proxy_host_dialog">Sartu Proxy Ostalaria</string>
+  <string name="pref_proxy_port_title">Proxy Portua</string>
+  <string name="pref_proxy_port_summary">Proxy zerbitzariaren portua</string>
+  <string name="pref_proxy_port_dialog">Sartu Proxy portua</string>
+  <string name="pref_proxy_username_title">Irteerako proxyaren erabiltzaile izena</string>
+  <string name="pref_proxy_username_summary">Proxy erabiltzaile izena (Aukerazkoa)</string>
+  <string name="pref_proxy_username_dialog">Sartu proxy erabiltzailea</string>
+  <string name="pref_proxy_password_title">Irteerako proxyaren pasahitza</string>
+  <string name="pref_proxy_password_summary">Proxy pasahitza (Aukerazkoa)</string>
+  <string name="pref_proxy_password_dialog">Sartu proxy pasahitza</string>
+  <string name="status">Egoera</string>
+  <string name="setting_up_full_transparent_proxying_">Guztientzako proxy gardena martxan ezartzen...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Aplikazioetan oinarritutako proxy transparentea ezartzen...</string>
+  <string name="transparent_proxying_enabled">Proxyatze gardena GAITUTA</string>
+  <string name="transproxy_enabled_for_tethering_">Proxy gardena gaituta Tethering-ean!</string>
+  <string name="warning_error_starting_transparent_proxying_">ABISUA: akatsa proxyatze gardena hasterakoan!</string>
+  <string name="transproxy_rules_cleared">Proxy gardeneko erregelak garbituta</string>
+  <string name="couldn_t_start_tor_process_">Ezin izan da Tor prozesua hasi:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Portuetan oinarritutako proxy gardena ezartzen...</string>
+  <string name="bridge_error">Zubi Akatsa</string>
+  <string name="bridge_requires_ip">Zubi ezaiugarria erabiltzeko gutxienez zubi baten IP helbidea sartu behar duzu.</string>
+  <string name="send_email_for_bridges">Gmail kontutik bridges at torproject.org helbidera eposta bat bidali gorputzean \"get bridges\" lerroa duena.</string>
+  <string name="error">Akatsa</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Zure helbide atzigarriak salbuespena sortu du!</string>
+  <string name="your_relay_settings_caused_an_exception_">Zure errele ezarpenak salbuespena sortu dute!</string>
+  <string name="exit_nodes">Irteera Nodoak</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Hatzmarkak, ezizenak, herrialdeak eta helbideak azkeneko jauzirako</string>
+  <string name="enter_exit_nodes">Irteera Nodoak sartu</string>
+  <string name="exclude_nodes">Nodoak baztertu</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Baztertuko diren hatzmarkak, ezizenak, herrialdeak eta helbideak</string>
+  <string name="enter_exclude_nodes">Baztertzeko nodoak sartu</string>
+  <string name="strict_nodes">Nodo hertsiak</string>
+  <string name="use_only_these_specified_nodes">*Bakarrik* zehaztutako nodo hauek erabili</string>
+  <string name="bridges">Zubiak</string>
+  <string name="use_bridges">Zubiak erabili</string>
+  <string name="bridges_obfuscated">Nahasitako Zubiak</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Tor sarera sartzeko nodo alternatiboak gaitu</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Gaitu konfiguratutako zubiak nahasitako zubiak badira</string>
+  <string name="ip_address_and_port_of_bridges">IP helbidea eta zubien portua</string>
+  <string name="enter_bridge_addresses">Sartu Zubi Helbideak</string>
+  <string name="relays">Erreleak</string>
+  <string name="relaying">Erreleatzea</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Zure gailua ez-irteerako errelea izatea gaitu</string>
+  <string name="relay_port">Errele Portua</string>
+  <string name="listening_port_for_your_tor_relay">Zure Tor errelearentzako entzuteko portua</string>
+  <string name="enter_or_port">Sartu OR portua</string>
+  <string name="relay_nickname">Errele ezizena</string>
+  <string name="the_nickname_for_your_tor_relay">Zure Tor errelearen ezizena</string>
+  <string name="enter_a_custom_relay_nickname">Sartu gustoko errelearen ezizena</string>
+  <string name="reachable_addresses">Helbide atzigarriak</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Suheziaren atzean exekutatu politika murriztaileekin</string>
+  <string name="reachable_ports">Portu atzigarriak</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Suhezi murriztailetik atzigarri diren portuak</string>
+  <string name="enter_ports">Portuak sartu</string>
+  <string name="enable_hidden_services">Ezkutuko Zerbitzuak Gaitu</string>
+  <string name="run_servers_accessible_via_the_tor_network">gailuko zerbitzuak Tor saretik atzitzea gaitu</string>
+  <string name="enter_localhost_ports_for_hidden_services">sartu localhost portuak ezkutuko zerbitzuentzat</string>
+  <string name="hidden_service_ports">Ezkutuko Zerbitzu Portuak</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">zure eskutuko zerbitzuaren izen atzigarria (automatikoki sortuta)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">arazketarako logak gaitu (adb edo aLogCat erabili ikusteko)</string>
+  <string name="project_home">Proiektuaren etxea(k):</string>
+  <string name="the_tor_license">Tor Lizentzia</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3.-Ataleko-Softwarea:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Aplikazio batek ezkutuko zerbitzariko %S portua ireki nau du Tor sarera. Segurua da aplikazioaz fidatzen bazara.</string>
+  <string name="found_existing_tor_process">Aurreko Tor prozesua topatuta...</string>
+  <string name="something_bad_happened">Zerbait txarra gertatu da. Begiratu logetan</string>
+  <string name="hidden_service_on">ezkutuko zerbitzua hemen:</string>
+  <string name="unable_to_read_hidden_service_name">ezkutuko zerbitzuare izena ezin da irakurri</string>
+  <string name="unable_to_start_tor">Ezin izan da Tor hasi:</string>
+  <string name="pref_use_sys_iptables_title">Lehenetsitako Iptables erabili</string>
+  <string name="pref_use_sys_iptables_summary">Sistemako iptables programa erabili Orbot-ekin datorreraren ordez</string>
+  <string name="error_installing_binares">Tor programak ezin izan dira instalatu edo eguneratu.</string>
+  <string name="pref_use_persistent_notifications">Orbot konektatuta dagoenean ikonoa tresna barran mantendu beti</string>
+  <string name="pref_use_persistent_notifications_title">Jakinarazpenetan beti</string>
+  <string name="notification_using_bridges">Zubiak gaituta!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Aukeratu Orbotentzako lokala eta hizkuntza</string>
+  <string name="wizard_locale_title">Hizkuntza aukeratu</string>
+  <string name="wizard_locale_msg">Lehenetsia utzi edo uneko hizkuntzara aldatu</string>
+  <string name="powered_by">Tor-ek eskainita</string>
+  <string name="btn_save_settings">Ezarpenak gorde</string>
+  <string name="no_internet_connection_tor">Ez dago Interneterako konexiorik; Tor egonean dago...</string>
+  <string name="bandwidth_">Banda zabalera:</string>
+  <string name="down">behera</string>
+  <string name="up">gora</string>
+  <string name="pref_disable_network_title">Sareko lokartze automatikorik ez</string>
+  <string name="pref_disable_network_summary">Jarri Tor lotan internet atzigarri ez dagoenean</string>
+  <string name="newnym">ChatSecure - Andriodentzako berehalako mezulari bezero ziurra</string>
+  <string name="menu_use_chatsecure">ChatSecure erabili</string>
+  <string name="permission_manage_tor_label">Tor kudeatu</string>
+  <string name="permission_manage_tor_description">Gaitu app hau Tor zerbitzua kontrolatzeko</string>
+  <string name="install_apps_">App-ak instalatu?</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="menu_qr">QR Kodeak</string>
+  <string name="standard_browser">Nabigatzaile Estandarra</string>
+</resources>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
new file mode 100644
index 0000000..b70cc0f
--- /dev/null
+++ b/app/src/main/res/values-fa/strings.xml
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">ربات پیازی</string>
+  <string name="app_description">اربت یک برنامه پروکسی مجانی است که دیگر برنامه ها را به استفاده امن از اینترنت توانمند می کند . اربوت از تور برای رمزگذاری کردن ترافیک اینترنت شما استفاده می کند و بعد آن ها را از طریق کامپیوترهای متفاوت در نقاط مختلف جهان مخفی می کند. تور یک برنامه مجانی و شبکه باز است که شما از شما در مقابل تحت نظر بودن در شبکه٬‌  تهدید آزادی های شخصی٬ خصوصی٬ فعالیت های کاری و رابطه های شخصی بطور امن محافظت می کند. </string>
+  <string name="internal_web_url">https://guardianproject.info/apps/orbot/</string>
+  <string name="default_web_url">https://check.torproject.org/?lang=fa_IR</string>
+  <string name="secure_default_web_url">https://check.torproject.org/?lang=fa_IR</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">شروع و پایان تور</string>
+  <string name="tor_proxy_service_process">سرويس پروکسی تور</string>
+  <string name="status_starting_up">اربوت درحال آغاز است...</string>
+  <string name="status_activated">متصل به شبکه تور</string>
+  <string name="status_disabled">اربوت غیرفعال شده است.</string>
+  <string name="status_shutting_down">TorService خاموش است</string>
+  <string name="tor_process_starting">شروع کلاینت تور...</string>
+  <string name="tor_process_complete">تمام.</string>
+  <string name="tor_process_waiting">در حال انتظار.</string>
+  <string name="not_anonymous_yet">هشدار: فعالیت شما هنوز \"گمنام\" نیست! لطفن اپلیکیشن خود را تنظیم کنید تا از HTTP پروکسی 127.0.0.1:8118 و یا SOCKS4A و یا SOCKS5 پروکسی 127.0.01:9050 استفاده کند.</string>
+  <string name="menu_home">خانه</string>
+  <string name="menu_browse">مرور</string>
+  <string name="menu_settings">تنظیمات</string>
+  <string name="menu_log">ورود</string>
+  <string name="menu_info">کمک</string>
+  <string name="menu_apps">وی پی ان</string>
+  <string name="menu_start">آغاز</string>
+  <string name="menu_stop">ایست</string>
+  <string name="menu_about">درباره</string>
+  <string name="menu_promo_apps">دریافت برنامه ها ...</string>
+  <string name="main_layout_download">دانلود</string>
+  <string name="main_layout_upload">آپلود</string>
+  <string name="button_help">کمک</string>
+  <string name="button_close">بسته</string>
+  <string name="button_about">درباره</string>
+  <string name="button_clear_log">پاکسازی ورد</string>
+  <string name="menu_verify">بررسی</string>
+  <string name="menu_exit">خروج</string>
+  <string name="menu_scan">اسکن BridgeQR</string>
+  <string name="menu_share_bridge">اشتراک BridgeQR</string>
+  <string name="press_to_start">- نگهدارید برای شروع -</string>
+  <string name="pref_trans_proxy_group">پروکسیدن شفاف (نیاز به Root دارد)</string>
+  <string name="pref_trans_proxy_title">پروکسی شفاف</string>
+  <string name="pref_trans_proxy_summary">تور-نمایی اتوماتیک اپلیکیشن ها</string>
+  <string name="pref_transparent_all_title">تور همه چیز</string>
+  <string name="pref_transparent_all_summary">فعالیت همه اپلیکیشن ها را از طریق تور پروکسی کنید.</string>
+  <string name="pref_transparent_port_fallback_title">قطع پروکسی پورت</string>
+  <string name="pref_transparent_port_fallback_summary">هشدار: پورتهای رایج دور زدن (80, 444, غیره). *فقط در شرایطی استفاده کنید* که حالت های \'همه\' یا \'اپلیکیشن\' کار نمیکند.</string>
+  <string name="pref_transparent_port_title">فهرست پورت</string>
+  <string name="pref_transparent_port_summary">فهرست پرتها به پروکسی.*فقط در شرایطی استفاده کنید* که حالت های \'همه\' یا \'اپلیکیشن\' کار نمیکند.</string>
+  <string name="pref_transparent_port_dialog">پورت ها را  به پروکسی وارد کن</string>
+  <string name="pref_has_root">درخواست دسترسی root</string>
+  <string name="pref_has_root_summary"> درخواست دسترسی رون برای پروکسی کردن شفاف </string>
+  <string name="status_install_success">باینری های تور با موفقیت نصب شدند!</string>
+  <string name="status_install_fail">نصب فایل های دوتایی تور ممکن نبود. لطفن قطعه را وارسی کنید و به tor-assistance at torproject.org اطلاع دهید.</string>
+  <string name="title_error">خطای اپلیکیشین</string>
+  <string name="wizard_title">اوربوت</string>
+  <string name="wizard_btn_tell_me_more">درباره اوربوت</string>
+  <string name="btn_next">بعدی</string>
+  <string name="btn_back">بازگشت</string>
+  <string name="btn_finish">پایان</string>
+  <string name="btn_okay">قبول</string>
+  <string name="btn_cancel">لغو</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">برخی جزییات درباره اوربوت</string>
+  <string name="wizard_details_msg">اربت یک برنامه زبان باز است که شامل Tor, LibEvent and Polipo می شود و وظیفه آن ارائه  local HTTP proxy (8118) و SOCKS proxy (9050) به شبکه تور است. همچنین اربت این قابلیت را در دستگاه های ریشه دار دارد  که می تواند ترافیک اینترنت را از طریق تور ارسال کند. </string>
+  <string name="wizard_permissions_root">مجوز صادر گردید</string>
+  <string name="wizard_permissions_stock">مجوزهای اوربوت</string>
+  <string name="wizard_premissions_msg_root">بسیار عالی! اینطور که معلوم است شما دارای مجوز root برای فعال کردن ربات پیازی هستید. این امکان را بخوبی مورد استفاده قرار خواهیم داد.</string>
+  <string name="wizard_permissions_msg_stock">هرچند ضرورت ندارد اما اگر سیستم شما دارای دسترسی root باشد ربات پیازی با ظرفیت بسیار بیشتری عمل خواهد کرد. دکمه زیر را فشار دهید تا ربات پیازی دارای ظرفیت حداکثری بشود.</string>
+  <string name="wizard_permissions_no_root">اگر سیستم شما دارای دسترسی root نیست و یا اصلا چیزی از این عبارت متوجه نمی شوید، حتما سعی کنید از اپلکیشن هایی استفاده کنید که ویژه ربات پیازی تهیه شده اند.</string>
+  <string name="wizard_permissions_consent">متوجه هستم و ترجیح می دهم بدون root ادامه بدهم.</string>
+  <string name="wizard_permission_enable_root">واگذاری دسترسی root برای ربات پیازی</string>
+  <string name="wizard_configure">تنظیمات تبدیل به تور</string>
+  <string name="wizard_configure_msg">ربات پیازی به شما امکان می دهد که تمام اپلیکشین ها را از طریق توز  منتقل کنید و یا اپلیکیشن مورد نظر خود را شخصن انتخاب کنید.</string>
+  <string name="wizard_configure_all">تمام اپلیکیشن ها را از طریق تور منتقل کنید.</string>
+  <string name="wizard_configure_select_apps">اپلیکیشن های منفرد برای تور انتخاب کنید.</string>
+  <string name="wizard_tips_tricks">اپلیکیشن هایی که برای ربات پیازی تنظیم شده اند</string>
+  <string name="wizard_tips_msg">توصیه می کنیم داونلود و فعال کنید؛ اپلیکیشن هایی را استفاده کنید که مستقیم به اوربوت وصل می شوند. دکمه های زیر را فشار دهید تا نصب شود.</string>
+  <string name="wizard_tips_otrchat">ChatSecure - برنامه امن ارسال پیغام فوری برای اندروئید</string>
+  <string name="wizard_tips_proxy">تنظیمات پروکسی - یادگیری تنظیم اپلیکیشن ها برای کار با اوربوت</string>
+  <string name="wizard_tips_duckgo">اپلیکیشن موتور جستجوی داک داک گو</string>
+  <string name="wizard_tips_twitter">توییتر از \"http proxy \"localhost:8118 پشتیبانی می کند</string>
+  <string name="wizard_tips_story_maker">StoryMaker - ساختن یک داستان و ترک آن به Tor برای امنیت!</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_proxy_help_msg">اگر برنامه آندرویدی که استفاده می کنید می تواند از استفاده HTTP یا  SOCKS proxy ساپورت کند٬ پس می توانید آن را برای اتصال به اوربوت استفاده از تور تنظیم کنید. .\n\n\n تنظیمات هاست 127.0.0.1  یا \"localhost\". برای HTTP تنظیم پورت  8118 است. برای  SOCKS ٬ پروکسی 9050. اگر امکانش وجود دارد از  SOCKS4A یا SOCKS5 استفاده کنید. \n \n\n\n  می توانید در مورد پروکسی در آندروید بیشتر بیاموزید در
+ http://tinyurl.com/proxyandroid\n</string>
+  <string name="wizard_final">اوربوت آماده استفاده میباشد!</string>
+  <string name="wizard_final_msg">بسیاری از مردم در سرتاسر جهان از تور به دلایل متفاوت استفاده می کنند.\n\n خبرنگارها و بلاگرها٬ فعالان حقوق بشر٬ سربازان٬ ماموران اجرای قانون٬ شهروندان رژیم های سرکوبگر و مردم معمولی... و حالا تو </string>
+  <string name="wizard_exit_at_first_screen_toast">لطفا اوربوت را  پیکربندی کنید قبل از اینکه شما شروع به استفاده از آن کنید!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">با موفقیت به شبکه Tor متصل شده اید - اما این بدان معنا نیست دستگاه شما امن است. شما می توانید استفاده کنید از کلید \"مرورگر\" برای تست اتصال . \n\n درباره ما در https://guardianproject.info/apps/orbot و یا ارسال ایمیل به help at guardianproject.info برای کسب اطلاعات بیشتر.</string>
+  <string name="tor_check">با این قدم پیشفرض مرورگر وب شما به صفحه   https://check.torproject.org باز می شود تا شما مشاهده کنید آیا ربات پیازی تنظیم شده است و آیا شما به تور وصل شده اید یا نه.</string>
+  <string name="pref_hs_group">سرويس های مخفی هاست</string>
+  <string name="pref_general_group">کلی</string>
+  <string name="pref_start_boot_title">اوربوت را همزمان با بوت آغاز کن</string>
+  <string name="pref_start_boot_summary">وقتی اندروید بوت شد، بصورت خودکار ربات پیازی را اجرا و آن را به شبکه تور متصل کن</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">اربت٬ تور را برای آندروید می آورد تا از محتویات فیلتر شده٬ آنالیز ترافیک و کنترل شبکه که خطری برای حریم خصوصی است و اطلاعات شخصی و رابطه ها دفاع کند. \n\nT این جادوگر برای تنظیم اربت و تور در دستگاه شما کمک می کند. </string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">هشدار</string>
+  <string name="wizard_warning_msg">نصب کردن اربت به خودی خود ترافیک موبایل شما را ناشناس نخواهد کرد.\n\n باید حتما اربت را در دستگاه یا برنامه ای که از آن استفاده می کنید برای استفاده از تور تنظیم نمایید.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">دسترسی‌ها</string>
+  <string name="wizard_permissions_root_msg1">اگر بخواهید میتوانید به ربات پیازی اجازه دسترسی  سوپر یوزر بدهید تا ویژگیهای پیشرفته  مانند پروکسی شفاف را فعال کند </string>
+  <string name="wizard_permissions_root_msg2">اگر نمیخواهید این کار را انجام دهید ، لطفا مطمئن شوید که از اپلیکیشنهایی استفاده می کنید که با ربات پیازی کار می کنند</string>
+  <string name="wizard_permissions_no_root_msg">بنظر می رسد دستگاه شما ریشه ندارد یا ریشه ای ارائه کند یا دسترسی به کاربری مدیر داشته باشد. \n\n لطفا حالت Apps را در صفحه اصلی روشن نمایید. </string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">  اپلیکیشنهایی که ربات پیازی روی آنها فعال است</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: برنامه گفتگوی امن محرمانه با قابلیت رمزگزاری</string>
+  <string name="wizard_tips_play">تمامي برنامه های Guardian Project را در Google Play پيدا كنيد.</string>
+  <string name="wizard_tips_fdroid">یافتن همه برنامه های Guardian Project در F-Droid</string>
+  <string name="wizard_tips_fdroid_org">یافتن همه برنامه های Guardian Project در https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">پروکسی کردن شفاف</string>
+  <string name="wizard_transproxy_msg">این به برنامه ها به شما اجازه میدهد که بدون هیچ تنظیمی، بصورت خودکار از طریق شبکه تور اجرا شوند</string>
+  <string name="wizard_transproxy_hint">(اگر هیچ ایده‌ای ندارید که راجع به چه چیزی حرف میزنیم این گزینه را انتخاب کنید)</string>
+  <string name="wizard_transproxy_none">هیـچ</string>
+  <string name="pref_transparent_tethering_title"> تترینگ از طریق تور</string>
+  <string name="pref_transparent_tethering_summary">پروکسی شفاف از طریق تور را برای دستگاه هایی که با یو اس بی یا وای فای تتر شده اند مجاز کن. (به ری استارت نیاز دارند)</string>
+  <string name="button_grant_superuser">درخواست دسترسی برای سوپریوزر</string>
+  <string name="pref_select_apps">انتخاب برنامه ها</string>
+  <string name="pref_select_apps_summary"> انتخاب اپلیکیشن برای مسیریابی از طریق تور </string>
+  <string name="pref_node_configuration">تنظیمات گره</string>
+  <string name="pref_node_configuration_summary">اینها تنظیمات پیشرفته ای هستند که ممکن است گمنامی شما را کاهش دهند</string>
+  <string name="pref_entrance_node">گره های ورودی</string>
+  <string name="pref_entrance_node_summary">اثرانگشت ها، اسامی مستعار، کشورها و آدرسهای جهش اول</string>
+  <string name="pref_entrance_node_dialog">گره های ورودی را وارد کنید</string>
+  <string name="pref_allow_background_starts_title">اجازه دادن اجرا در پس زمینه</string>
+  <string name="button_proxy_all">همه پروکسی ها</string>
+  <string name="button_proxy_none">هیچ پروکسی</string>
+  <string name="button_invert_selection">انتخاب برعکس شود</string>
+  <string name="pref_proxy_title">پراکسی شبکه خروجی</string>
+  <string name="pref_proxy_type_title">نوع پروکسی</string>
+  <string name="pref_proxy_type_summary">پروتکل مورد استفاده برای پراکسی سرور: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">نوع پروکسی را وارد کنید</string>
+  <string name="pref_proxy_host_title"> پروکسی میزبان</string>
+  <string name="pref_proxy_host_summary">نام سرور پروکسی میزبان </string>
+  <string name="pref_proxy_host_dialog">نام پروکسی میزبان را وارد کنید</string>
+  <string name="pref_proxy_port_title">پورت پروکسی خروجی</string>
+  <string name="pref_proxy_port_summary">پورت سرور پروکسی</string>
+  <string name="pref_proxy_port_dialog">پورت پروکسی را وارد کنید</string>
+  <string name="pref_proxy_username_title">نام کاربری پراکسی خروجی</string>
+  <string name="pref_proxy_username_summary">نام کاربری پروکسی(اختیازی)</string>
+  <string name="pref_proxy_username_dialog">نام کاربری پروکسی را وارد نمایید</string>
+  <string name="pref_proxy_password_title">کلمه عبور پراکسی خروجی</string>
+  <string name="pref_proxy_password_summary">رمز عبور پروکسی(اختیاری)</string>
+  <string name="pref_proxy_password_dialog">رمز عبور پروکسی را وارد نمایید</string>
+  <string name="status">وضعیت</string>
+  <string name="setting_up_full_transparent_proxying_">نصب پروکسی کاملن شفاف...</string>
+  <string name="setting_up_app_based_transparent_proxying_">نصب پروکسی شفاف مبتنی بر برنامه...</string>
+  <string name="transparent_proxying_enabled">پروکسی شفاف فعال است</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy برای Tethering فعال شده است!</string>
+  <string name="warning_error_starting_transparent_proxying_">هشدار: خطا در هنگام راه اندازی پروکسی شفاف!</string>
+  <string name="transproxy_rules_cleared">قوانین TransProxy پاک شدند</string>
+  <string name="couldn_t_start_tor_process_"> تور نتواست اجرا شود:</string>
+  <string name="privoxy_is_running_on_port_">Polipo در حال اجرا است در پورت:</string>
+  <string name="setting_up_port_based_transparent_proxying_">نصب پروکسی شفاف مبتنی بر پورت...</string>
+  <string name="bridge_error">خطای Bridge </string>
+  <string name="bridge_requires_ip">برای استفاده از ویژگی Bridge، باید حداقل آدرس IP یک پل را وارد کنید.</string>
+  <string name="send_email_for_bridges">از یک حساب کاربری جیمیل، ایمیلی با متن \"get bridges\" به آدرس bridges at torproject.org بفرستید.</string>
+  <string name="error">خطا</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">تنظیمات شما برای آدرس قابل دسترسی باعث ایجاد خطا شده اند !</string>
+  <string name="your_relay_settings_caused_an_exception_">تنظیمات رله شما موجب خطا شده اند</string>
+  <string name="exit_nodes">گره های خروجی</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">اثر انگشتها ، اسامی مستعار ، کشورها و آدرسها برای آخرین جهش </string>
+  <string name="enter_exit_nodes"> گره های خروجی را وارد کنید</string>
+  <string name="exclude_nodes">این گره ها را استفاده نکن</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">اثر انگشتها، اسامی مستعار ، کشورها و آدرسهایی که نباید استفاده شوند</string>
+  <string name="enter_exclude_nodes"> گره هایی که نباید استفاده شوند</string>
+  <string name="strict_nodes">گره های محدود</string>
+  <string name="use_only_these_specified_nodes">فقط * از این گره های مشخص شده استفاده کنید* </string>
+  <string name="bridges">Bridges</string>
+  <string name="use_bridges">از پل Bridges کن</string>
+  <string name="bridges_obfuscated">پل های گیج کننده</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">گره ورودی متناوب به شبکه تور را فعال کنید</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">اگر Bridges تنظیم شده پلهای مربوط به پروکسی گیج کننده هستند این گزینه را فعال کنید</string>
+  <string name="ip_address_and_port_of_bridges">آدرس آی پی و پورتِ پل ها</string>
+  <string name="enter_bridge_addresses">آدرس Bridges را وارد کنید</string>
+  <string name="relays">بازپخش کننده ها</string>
+  <string name="relaying">درحال بازپخش</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">دستگاه خود را برای یک بازپخش کننده غیر-خروجی فعال کنید</string>
+  <string name="relay_port">پورت بازپخش کننده</string>
+  <string name="listening_port_for_your_tor_relay"> پورت شنونده برای باز پخش تور</string>
+  <string name="enter_or_port">پورت OR را وارد کنید</string>
+  <string name="relay_nickname">نام مستعار بازپخش کننده</string>
+  <string name="the_nickname_for_your_tor_relay">نام مستعار بازپخش کننده شما</string>
+  <string name="enter_a_custom_relay_nickname">یک نام مستعار دلخواه برای بازپخش کننده وارد کنید</string>
+  <string name="reachable_addresses">آدرس های قابل دسترس</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">بعنوان یک کاربر پشت دیواره آتش با سیاست های محدود کننده اجرا کنید</string>
+  <string name="reachable_ports">پورت‌های قابل دسترس</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">پورت‌های قابل دسترس پشت یک فایروال محدودکننده</string>
+  <string name="enter_ports">پورت‌ها را وارد کنید</string>
+  <string name="enable_hidden_services">سرویس‌های مخفی را فعال کن</string>
+  <string name="run_servers_accessible_via_the_tor_network">اجازه بده سرورهای روی دستگاه از طریق شبکه تور قابل دسترسی باشند</string>
+  <string name="enter_localhost_ports_for_hidden_services">پورت های لوکال هاست را برای سرویس مخفی وارد کنید</string>
+  <string name="hidden_service_ports">پورت‌های سرویس مخفی</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">نام نشانی پذیر برای سرویس مخفی شما (بصورت خودکار تولید شده است)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ثبت گزارش اشکال زدایی را به خروجی فعال کن (برای نمایش باید از adb یا aLogCat استفاده کنید)</string>
+  <string name="project_home">صفحه (های) اصلی پروژه:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">گواهی تور</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3rd-Party-Software:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">یک اپلیکیشن میخواهد پورت %S سرویس مخفی را به شبکه تور باز کند. اگر به این اپلیکیشن اعتماد دارید این بی خطر است.</string>
+  <string name="found_existing_tor_process">یک تور درحال اجرا پیدا شد...</string>
+  <string name="something_bad_happened">اتفاق بدی افتاد. وقایع ثبت شده را چک کنید</string>
+  <string name="hidden_service_on">سرویس مخفی روی:</string>
+  <string name="unable_to_read_hidden_service_name">ناتوان در خواندن نام سرویس مخفی</string>
+  <string name="unable_to_start_tor">ناتوان در راه اندازی تور:</string>
+  <string name="unable_to_reset_tor">راه اندازی مجدد دستگاه شما ، قادر نیست به تنظیم مجدد Tor !</string>
+  <string name="pref_use_sys_iptables_title">از Iptables پیش فرض استفاده کن</string>
+  <string name="pref_use_sys_iptables_summary">به جای چیزی که با ربات پیازی اومده، از باینری آی پی تیبلز داخلی استفاده کن</string>
+  <string name="error_installing_binares">فایلهای باینری تور قادر به نصب و یا ارتقا نبودند</string>
+  <string name="pref_use_persistent_notifications">وقتی ربات پیازی متصل است، همیشه آیکون مربوط را در نوار ابزار نگه دار.</string>
+  <string name="pref_use_persistent_notifications_title">آگاهسازی همیشه روشن</string>
+  <string name="pref_use_expanded_notifications">نمایش اطلاع رسانی گسترده با کشور خروجی Tor و IP</string>
+  <string name="pref_use_expanded_notifications_title">اطلاعیه گسترده</string>
+  <string name="notification_using_bridges">Bridges فعال شدند!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">زبان</string>
+  <string name="set_locale_summary">زبان محلی  ربات پیازی را انتخاب کنید</string>
+  <string name="wizard_locale_title">انتخاب زبان</string>
+  <string name="wizard_locale_msg">زبان کنونی را تعویض و یا به شکل پیشفرض رهایش کنید</string>
+  <string name="powered_by">طراحی شده توسط Tor</string>
+  <string name="btn_save_settings">ذخیره تنظیمات</string>
+  <string name="no_internet_connection_tor">ارتباط اینترنتی وجود ندارد; تور آماده کار است... </string>
+  <string name="bandwidth_">پهنای باند:</string>
+  <string name="down">پائین</string>
+  <string name="up">بالا</string>
+  <string name="pref_disable_network_title">خاموش کردن در صورت عدم وجود شبکه</string>
+  <string name="pref_disable_network_summary">در صورتی که شبکه وجود نداشته باشد خاموش شود</string>
+  <string name="newnym">شما به شناسه جدید تور منتقل شدید</string>
+  <string name="menu_verify_browser">مرورگر</string>
+  <string name="menu_use_chatsecure">استفاده از ChatSecure</string>
+  <string name="permission_manage_tor_label">مدیریت تور</string>
+  <string name="permission_manage_tor_description">این برنامه بتواند سرویس تور را مدیریت کند</string>
+  <string name="install_apps_">برنامه نصب شود؟</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">ارتباط شبکه ای وجود ندارد. تور به حالت خواب می رود</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">ارتباط شبکه ای خوب است. تور را بیدار نمایید...</string>
+  <string name="updating_settings_in_tor_service">به روز رسانی تنظیمات در سرویس Tor</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">پورتی که تور ارائه می دهد SOCKS proxy روی (پیش فرض: 9050 یا 0 برای غیرفعال کردن)</string>
+  <string name="pref_socks_dialog">پیکربندی پورت SOCKS</string>
+  <string name="pref_transport_title">Tor TransProxy Port</string>
+  <string name="pref_transport_summary">پورتی که تور ارائه می دهد Transparent Proxy روی (پیش فرض:  9040 یا  0 برای غیرفعال کردن)</string>
+  <string name="pref_transport_dialog">پیکربندی پورت Transproxy</string>
+  <string name="pref_dnsport_title">پورت Tor DNS</string>
+  <string name="pref_dnsport_summary">پورتی که Tor ارائه می دهد آن DNS روی (به طور پیش فرض: 5400 یا 0 برای غیر فعال کردن)</string>
+  <string name="pref_dnsport_dialog">پیکربندی پورت DNS</string>
+  <string name="pref_torrc_title">پیکربندی سفارشی Torrc</string>
+  <string name="pref_torrc_summary">فقط متخصصان:  enter direct torrc config lines</string>
+  <string name="pref_torrc_dialog">سفارشی Torrc</string>
+  <string name="wizard_tips_martus">موبایل مارتوس -  Benetech Human Rights Documentation App</string>
+  <string name="your_tor_public_ips_">IP های عمومی Tor شما:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">لطفا این برنامه را در آندروید از کار بیندازید  Android->Settings->Apps اگر مشکلی با اربت دارید:  </string>
+  <string name="app_conflict">تعارض برنامه</string>
+  <string name="pref_transproxy_refresh_title">خودکار تازه کردن Transproxy</string>
+  <string name="pref_transproxy_refresh_summary">درخواست مجدید برای قوانین Transproxy  وقتی وضعیت شبکه تغییر کرد</string>
+  <string name="pref_transproxy_flush_title">حذف اجباری Transproxy</string>
+  <string name="pref_transproxy_flush_summary">اینجا را فشار دهید برای برهم ریختن تمام قوانین  transproxy</string>
+  <string name="transparent_proxy_rules_flushed_">قوانین Transparent proxy  برهم ریخته شد! </string>
+  <string name="you_do_not_have_root_access_enabled">شما دسترسی روت را فعال نکردید. </string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_"> برای اعمال تنظیمات جدید باید اوربات را خاموش و روشن کنید.</string>
+  <string name="menu_vpn">وی پی ان</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Bridges به روز شدند</string>
+  <string name="restart_orbot_to_use_this_bridge_">برای فعال کردن تغییرات لطفا Orbot را راه اندازی مجدد کنید</string>
+  <string name="menu_qr">کدهای QR</string>
+  <string name="bridge_mode">حالت Bridges</string>
+  <string name="get_bridges_email">ایمیل</string>
+  <string name="get_bridges_web">وب</string>
+  <string name="activate">فعال</string>
+  <string name="apps_mode">حالت نرم افزار VPN</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">با استفاده از امکان وی پی ان اندروید٬ اوربات ترافیک تمام اپلیکیشن های موبایل شما را از طریق شبکه تور انتقال میدهد. 
+\n\n*هشدار* 
+امکان تونل تمام گوشی هنوز جدید و در حال آزمایش است. به همین دلیل امکان دارد که به صورت خودکار فعال نشود یا هنگام استفاده قطع شود. از این امکان برای ناشناس بودن در وب هرگز نباید استفاده کنید و باید فقط از آن برای عبور از فایروال ها و دور زدن فیلترینگ استفاده شود.</string>
+  <string name="send_email">ایمیل بفرست</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">می توانید آدرس  bridge  را از طریق ایمیل٬ وب یا با اسکن کردن  bridge QR code بدست آورید. ایمیل یا وب پایین را برای درخواست آدرس bridge انتخاب کنید.\n\n وقتی آدرس را دارید آن را کپی کنید و برگردانید در  اولویت های  Bridges در تنظیمات اربت و آن را دوباره راه اندازی کنید.</string>
+  <string name="install_orweb">نصب Orfox</string>
+  <string name="standard_browser">مرورگر استاندارد</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">نکته:  Tor bridges استاندارد فقط بر روی دستگاه های Intel X86/ATOM  کار می کند</string>
+  <string name="vpn_default_world">جهان</string>
+</resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
new file mode 100644
index 0000000..0179493
--- /dev/null
+++ b/app/src/main/res/values-fi/strings.xml
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot on ilmainen välityspalvelinsovellus, joka tarjoaa muille sovelluksille mahdollisuuden käyttää internetiä turvallisemmin. Orbot käyttää Toria kryptaamaan verkkoliikenteesi ja sitten piilottaa sen kierrättämällä sitä usean tietokoneen kautta ympäri maailman. Tor on vapaa ohjelmisto ja avoin verkosto, jotka auttavat puolustautumaan vapautta ja yksityisyyttä uhkaavalta verkkovalvonnalta ja valtioiden verkonseurannalta sekä suojaamaan salaisia liiketoimintoja ja -yhteyksiä.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">käynnistä ja pysäytä Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot käynnistyy...</string>
+  <string name="status_activated">Yhdistetty Tor-verkkoon</string>
+  <string name="status_disabled">Orbot on poistettu käytöstä</string>
+  <string name="tor_process_starting">Käynnistetään Tor-ohjelmaa...</string>
+  <string name="tor_process_complete">valmis.</string>
+  <string name="tor_process_waiting">odottaa.</string>
+  <string name="not_anonymous_yet">VAROITUS: Verkkoliikenteesi ei ole vielä anonyymiä! Määritä ohjelmasi käyttämään HTTP-välityspalvelinta 127.0.0.1:8118 tai SOCKS4A- tai SOCKS5-välityspalvelinta 127.0.0.1:9050</string>
+  <string name="menu_home">Alkuun</string>
+  <string name="menu_browse">Selaa</string>
+  <string name="menu_settings">Asetukset</string>
+  <string name="menu_log">Loki</string>
+  <string name="menu_info">Ohje</string>
+  <string name="menu_start">Aloita</string>
+  <string name="menu_stop">Lopeta</string>
+  <string name="menu_about">Tietoa</string>
+  <string name="main_layout_download">Lataa</string>
+  <string name="main_layout_upload">Lähetä</string>
+  <string name="button_help">Apua</string>
+  <string name="button_close">Sulje</string>
+  <string name="button_about">Tietoa</string>
+  <string name="button_clear_log">Tyhjennä loki</string>
+  <string name="menu_verify">Tarkista</string>
+  <string name="menu_exit">Lopeta</string>
+  <string name="menu_scan">Skannaa sillan QR-koodi</string>
+  <string name="menu_share_bridge">Jaa sillan QR-koodi</string>
+  <string name="press_to_start">- paina pitkään käynnistääksesi -</string>
+  <string name="pref_trans_proxy_group">Läpinäkyvä välityspalvelimen käyttö (vaatii roottauksen)</string>
+  <string name="pref_trans_proxy_title">Läpinäkyvä välityspalvelimen käyttö</string>
+  <string name="pref_trans_proxy_summary">Ohjelmien automaattinen Torimointi</string>
+  <string name="pref_transparent_all_title">Torraa kaikki</string>
+  <string name="pref_transparent_all_summary">Välitä kaikki ohjelmien liikenne Torin läpi</string>
+  <string name="pref_transparent_port_fallback_title">Välityspalvelinportin varoasetus</string>
+  <string name="pref_transparent_port_fallback_summary">VAROITUS: Kiertää yleisiä portteja (80, 443, jne). *KÄYTÄ VAIN* jos \"Kaikki\" tai \"Sovellus\" -tila ei toimi.</string>
+  <string name="pref_transparent_port_title">Porttilista</string>
+  <string name="pref_transparent_port_summary">Välityspalvelimen kautta vietävien porttien lista. *KÄYTÄ VAIN* jos \"Kaikki\" tai \"Sovellus\" -tila ei toimi.</string>
+  <string name="pref_transparent_port_dialog">Kirjoita portit, jotka viedään välityspalvelimen kautta</string>
+  <string name="pref_has_root">Pyydä root-tason oikeuksia</string>
+  <string name="pref_has_root_summary">Pyydä root-tason oikeuksia läpinäkyvään tiedonvälitykseen</string>
+  <string name="status_install_success">Tor-binääritiedostojen asennus onnistui!</string>
+  <string name="status_install_fail">Tor-binääritiedostojen asennus epäonnistui. Tarkista loki ja ilmoita asiasta osoitteeseen tor-assistants at torproject.org</string>
+  <string name="title_error">Sovellusvirhe</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Tietoja Orbotista</string>
+  <string name="btn_next">Seuraava</string>
+  <string name="btn_back">Takaisin</string>
+  <string name="btn_finish">Lopeta</string>
+  <string name="btn_okay">Selvä</string>
+  <string name="btn_cancel">Peruuta</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Joitakin Orbotin yksityiskohtia</string>
+  <string name="wizard_details_msg">Orbot on avoimen lähdekoodin sovellus, joka sisältää Torin, LibEventin ja Polipon. Se tarjoaa paikallisen HTTP-välityspalvelimen (8118) ja SOCKS-välityspalvelimen (9050) Tor-verkkoon. Rootatulla laitteella Orbot kykenee myös reitittämään kaiken verkkoliikenteen Torin läpi.</string>
+  <string name="wizard_permissions_root">Lupa myönnetty</string>
+  <string name="wizard_permissions_stock">Orbot-oikeudet</string>
+  <string name="wizard_premissions_msg_root">Loistavaa! Olemme havainneet että olet antanut root-tason oikeudet Orbotille. Käytämme näiden oikeuksien suomia mahdollisuuksia harkiten.</string>
+  <string name="wizard_permissions_msg_stock">Vaikka root-tason oikeuksien antaminen Orbotille ei ole pakollista, tulee Orbotista tehokkaampi työkalu jos laitteellasi on root-tason oikeudet. Käytä alla olevaa painiketta antaaksesi Orbotille supervoimat!</string>
+  <string name="wizard_permissions_no_root">Jos sinulla ei ole root-tason oikeuksia tai et tiedä, mitä tarkoitamme, käytä vain Orbotille suunniteltuja ohjelmia.</string>
+  <string name="wizard_permissions_consent">Ymmärrän ja haluan jatkaa ilman Superuser-tason oikeuksia</string>
+  <string name="wizard_permission_enable_root">Anna root-tason oikeudet Orbotille</string>
+  <string name="wizard_configure">Konfiguroi Torimointi</string>
+  <string name="wizard_configure_msg">Orbot mahdollistaa kaiken sovellusliikenteen reitittämisen Tor-sovelluksen kautta TAI valita sovelluksesi yksilöllisesti.</string>
+  <string name="wizard_configure_all">Välitä kaikkien sovellusten tiedonsiirto Tor-verkon kautta</string>
+  <string name="wizard_configure_select_apps">Valitse Tor-verkkoa käyttävät sovellukset</string>
+  <string name="wizard_tips_tricks">Orbotia käyttävät sovellukset</string>
+  <string name="wizard_tips_msg">Alempana näkyvät sovellukset on suunniteltu toimimaan Orbotin kanssa. Paina jokaista nappia, jos haluat asentaa ne nyt. Voit myös löytää ne myöhemmin Googlen Play-kaupasta, GuardianProject.info:n nettisivulta tai F-Droid.org:in kautta.</string>
+  <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="wizard_tips_twitter">Aseta Twitter-välityspalvelinisännäksi \"localhost\" ja portiksi 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Tee tarina ja jätä se torin turvallisuuteen!</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>
+  <string name="wizard_proxy_help_msg">Jos käyttämäsi Android-sovellus tukee HTTP- tai SOCKS-välityspalvelimen käyttöä, voit määrittää sen yhdistämään Orbotiin ja käyttämään Toria.\n\n\n Isäntänimi on 127.0.0.1 tai \"localhost\". HTTP-portti on 8118. SOCKS-portti on 9050. SOCKS4A- tai SOCKS5-protokollia tulisi käyttää, mikäli mahdollista.\n \n\n\n Voit lukea lisää välityspalvelinten käytöstä Androidilla usein kysytyistä kysymyksistä osoitteessa: http://tinyurl.com/proxyandroid\n</string>
+  <string name="wizard_final">Orbot on valmis!</string>
+  <string name="wizard_final_msg">Miljoonat ihmiset ympäri maailman käyttävät Toria eri syistä.\n\nJornalistit ja bloggaajat, ihmisoikeuksien puolustajat, poliisit, sotilaat, yritykset, sorrettujen valtioiden kansalaiset, ja tavalliset kansalaiset... ja nyt sinäkin olet valmis siihen!</string>
+  <string name="wizard_exit_at_first_screen_toast">Määritä Orbot ennen kuin alat käyttää sitä!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Tämä avaa selaimesi osoitteeseen https://check.torproject.org nähdäkseen, onko Orbot varmaan konfiguroitu ja onko sinut yhdistetty Tor-sovellukseen.</string>
+  <string name="pref_hs_group">Piilopalvelun isännöinti</string>
+  <string name="pref_general_group">Yleiset</string>
+  <string name="pref_start_boot_title">Aloita Orbot käynnistettäessä</string>
+  <string name="pref_start_boot_summary">Käynnistä Orbot ja yhdistä Toriin automaattisesti, kun Anroid-laitteesi käynnistyy</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot tuo Torin Androidille!\n\nTor auttaa sinua suojautumaan sisältösuodattimilta sekä verkkoliikenteen seurannalta ja valvonnalta, jotka uhkaavat yksityisyyttä, salaista tietoa ja henkilökohtaisia suhteita.\n\nTämä velho auttaa sinua määrittämään Orbotin ja Torin laitteellasi.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Varoitus</string>
+  <string name="wizard_warning_msg">Pelkkä Orbotin asentaminen ei automaattisesti tee verkkoliikenteestäsi anonyymiä. Sinun täytyy määrittää Orbot kunnolla, jotta laitteesi ja muut sovellukset käyttävät Toria onnistuneesti.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Käyttöoikeudet</string>
+  <string name="wizard_permissions_root_msg1">Voit antaa Orbotille Superuser-oikeudet mahdollistaaksesi joitakin lisäominaisuuksia, kuten läpinäkyvän tiedonvälityksen.</string>
+  <string name="wizard_permissions_root_msg2">Jos et halua tehdä tätä, varmista, että käytät Orbotin kanssa toimivaksi suunniteltuja sovelluksia.</string>
+  <string name="wizard_permissions_no_root_msg">Laitteesi ei vaikuta olevan rootattu tai tarjoavan root- tai \'Superuser\'-oikeuksia.\n\nKokeile \'Sovellukset\'-tilaa päänäytöltä.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Löydä kaikki Guardian-projektin sovellukset Googlen Play-kaupasta</string>
+  <string name="wizard_tips_fdroid">Löydä kaikki Guardian Projectin sovellukset F-Droidista</string>
+  <string name="wizard_tips_fdroid_org">Löydä kaikki Guardian Projectin sovellukset osoitteesta https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Läpinäkyvä tiedonvälitys</string>
+  <string name="wizard_transproxy_msg">Tämä sallii sovellustesi tietoliikenteen menemisen automaattisesti Torin läpi</string>
+  <string name="wizard_transproxy_hint">(Rastita tämä ruutu, jos et tiedä, mitä tarkoitamme)</string>
+  <string name="wizard_transproxy_none">Ei mikään</string>
+  <string name="pref_transparent_tethering_title">Tor-välityspalvelimena oleminen</string>
+  <string name="pref_transparent_tethering_summary">Salli Torin läpinäkyvä tiedonvälitys Wifille ja USB-välityspalvelimena oleville laitteille (vaatii uudelleenkäynnistyksen)</string>
+  <string name="button_grant_superuser">Pyydä Superuser-oikeuksia</string>
+  <string name="pref_select_apps">Valitse sovellukset</string>
+  <string name="pref_select_apps_summary">Valitse Torin läpi reititettävät sovellukset</string>
+  <string name="pref_node_configuration">Tor-solmukohdan konfigurointi</string>
+  <string name="pref_node_configuration_summary">Nämä ovat lisäasetuksia, jotka voivat vähentää anonyymiyttäsi</string>
+  <string name="pref_entrance_node">Tor-sisääntulosolmu</string>
+  <string name="pref_entrance_node_summary">Sormenjäljet, lovet, maat ja osoitteet ensimmäiseen hyppyyn</string>
+  <string name="pref_entrance_node_dialog">Kirjoita sisääntulosolmujen nimet</string>
+  <string name="button_proxy_all">Välitä kaikki</string>
+  <string name="button_proxy_none">Älä välitä mitään</string>
+  <string name="button_invert_selection">Käännä valinta</string>
+  <string name="pref_proxy_title">Lähtevän liikenteen välityspalvelin (valinnainen)</string>
+  <string name="pref_proxy_type_title">Lähtevän liikenteen välityspalvelimen tyyppi</string>
+  <string name="pref_proxy_type_summary">Välityspalvelimen protokolla: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Kirjoita välityspalvelintyyppi</string>
+  <string name="pref_proxy_host_title">Ulosmenovälityspalvelimen isäntä</string>
+  <string name="pref_proxy_host_summary">Välityspalvelimen verkko-osoite</string>
+  <string name="pref_proxy_host_dialog">Kirjoita välityspalvelimen isäntä</string>
+  <string name="pref_proxy_port_title">Ulosmenovälityspalvelimen portti</string>
+  <string name="pref_proxy_port_summary">Välityspalvelimen portti</string>
+  <string name="pref_proxy_port_dialog">Kirjoita välityspalvelimen portti</string>
+  <string name="pref_proxy_username_title">Ulosmenovälityspalvelimen käyttäjänimi</string>
+  <string name="pref_proxy_username_summary">Välityspalvelimen käyttäjätunnus (valinnainen)</string>
+  <string name="pref_proxy_username_dialog">Kirjoita välityspalvelimen käyttäjätunnus</string>
+  <string name="pref_proxy_password_title">Ulosmenovälityspalvelimen salasana</string>
+  <string name="pref_proxy_password_summary">Välityspalvelimen salasana (valinnainen)</string>
+  <string name="pref_proxy_password_dialog">Kirjoita välityspalvelimen salasana</string>
+  <string name="status">Tila</string>
+  <string name="setting_up_full_transparent_proxying_">Täyttä läpinäkyvää tiedonvälitystä otetaan käyttöön...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Sovelluspohjaista läpinäkyvää tiedonvälitystä otetaan käyttöön...</string>
+  <string name="transparent_proxying_enabled">Läpinäkyvä tiedonvälitys SALLITTU</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy on otettu käyttöön Tor-välityspalvelimimena olemista varten!</string>
+  <string name="warning_error_starting_transparent_proxying_">VAROITUS: virhe aloittaessa läpinäkyvää tiedonvälitystä!</string>
+  <string name="transproxy_rules_cleared">TransProxyn säännöt tyhjennetty</string>
+  <string name="couldn_t_start_tor_process_">Tor-prosessin käynnistäminen epäonnistui:</string>
+  <string name="privoxy_is_running_on_port_">Polipo on käynnissä portissa:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Porttipohjaista läpinäkyvää tiedonvälitystä otetaan käyttöön...</string>
+  <string name="bridge_error">Siltavirhe</string>
+  <string name="bridge_requires_ip">Jos haluat käyttää siltaominaisuutta, kirjoita vähintään yhden sillan IP-osoite.</string>
+  <string name="send_email_for_bridges">Lähetä sähköpostia osoitteeseen bridges at torproject.org gmail-osoitteesta siten, että viestin ainoa rivi on \"get bridges\".</string>
+  <string name="error">Virhe</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">ReachableAccess-asetuksesi aiheuttivat virheen!</string>
+  <string name="your_relay_settings_caused_an_exception_">Releasetuksesi aiheuttivat virheen!</string>
+  <string name="exit_nodes">Päätesolmut</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Sormenjäljet, lovet, maat ja osoitteet viimeiselle hypylle</string>
+  <string name="enter_exit_nodes">Kirjoita päätesolmut</string>
+  <string name="exclude_nodes">Vältä solmuja</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Vältettävät sormenjäljet, lovet, maat ja osoitteet</string>
+  <string name="enter_exclude_nodes">Kirjoita vältettävät solmut</string>
+  <string name="strict_nodes">Tarkat solmukohdat</string>
+  <string name="use_only_these_specified_nodes">Käytä *vain* näitä solmuja</string>
+  <string name="bridges">Sillat</string>
+  <string name="use_bridges">Käytä siltoja</string>
+  <string name="bridges_obfuscated">Hämärät sillat</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Salli vaihtoehtoiset sisääntulosolmut Tor-verkkoon</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Salli hämärien siltojen konfigurointi</string>
+  <string name="ip_address_and_port_of_bridges">Siltojen IP-osoitteet ja portit</string>
+  <string name="enter_bridge_addresses">Kirjoita siltaosoitteet</string>
+  <string name="relays">Releet</string>
+  <string name="relaying">Releytys</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Salli laitteen käyttö välireleenä</string>
+  <string name="relay_port">Releportti</string>
+  <string name="listening_port_for_your_tor_relay">Tor-releesi kuunteluportti</string>
+  <string name="enter_or_port">Kirjoita OR-portti</string>
+  <string name="relay_nickname">Releen kutsumanimi</string>
+  <string name="the_nickname_for_your_tor_relay">Kutsumanimi Tor-releellesi</string>
+  <string name="enter_a_custom_relay_nickname">Kirjoita mukautettu relenimi</string>
+  <string name="reachable_addresses">Saavutettavissa olevat osoitteet</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Aja asiakkaana rajoitetun palomuurin takaa</string>
+  <string name="reachable_ports">Saavutettavissa olevat portit</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Rajoitetun palomuurin takaa saavutettavat portit</string>
+  <string name="enter_ports">Kirjoita portit</string>
+  <string name="enable_hidden_services">Piilopalvelun isännöinti</string>
+  <string name="run_servers_accessible_via_the_tor_network">salli laitteensisäisen palvelimen käyttö osana Tor-verkkoa</string>
+  <string name="enter_localhost_ports_for_hidden_services">kirjoita sisäiset portit piilopalveluille</string>
+  <string name="hidden_service_ports">Piilopalveluiden portit</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">piilopalvelusi nimiosoite (luodaan automaattisesti)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">salli virheenjäljityslokin tulo tulostevirtaan (käytä adb:tä tai aLogCat:ia tarkastellaksesi)</string>
+  <string name="project_home">Projektin kotisivu(t):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor-lisenssi</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3:n osapuolen ohjelmisto:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Sovellus haluaa avata piilopalveluportin %S Tor-verkkoon. Tämä on turvallista, jos luotat sovellukseen.</string>
+  <string name="found_existing_tor_process">löytyi olemassaoleva Tor-prosessi...</string>
+  <string name="something_bad_happened">Jotain pahaa tapahtui. Tarkista loki</string>
+  <string name="hidden_service_on">piilopalvelun sijainti:</string>
+  <string name="unable_to_read_hidden_service_name">piilopalvelunimen lukeminen epäonnistui</string>
+  <string name="unable_to_start_tor">Torin käynnistys epäonnistui:</string>
+  <string name="unable_to_reset_tor">Toria ei voitu nollata, käynnistä laitteesi uudelleen!</string>
+  <string name="pref_use_sys_iptables_title">Käytä Ip-oletustauluja</string>
+  <string name="pref_use_sys_iptables_summary">käytä sisäänrakennettua Ip-taulubinääriä Orbotin mukana tulleen sijasta</string>
+  <string name="error_installing_binares">Tor-binääritiedostojen asentaminen tai päivitys epäonnistui.</string>
+  <string name="pref_use_persistent_notifications">Pidä kuvake aina työkalupalkissa, kun Orbot on yhdistetty</string>
+  <string name="pref_use_persistent_notifications_title">Ilmoitukset aina käytössä</string>
+  <string name="pref_use_expanded_notifications">Näytä laajennettu ilmoitus (Torin ulostulon maa ja IP)</string>
+  <string name="pref_use_expanded_notifications_title">Laajennetut ilmoitukset</string>
+  <string name="notification_using_bridges">Sillat käytössä!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Kieli</string>
+  <string name="set_locale_summary">Valitse maa-asetus ja kieli Orbit-sovellukselle</string>
+  <string name="wizard_locale_title">Valitse kieli</string>
+  <string name="wizard_locale_msg">Jätä oletusarvoon tai vaihda nykyiseen kieleen</string>
+  <string name="powered_by">perustuu Toriin</string>
+  <string name="btn_save_settings">Tallenna asetukset</string>
+  <string name="no_internet_connection_tor">Ei internet-yhteyttä; Tor on valmiustilassa...</string>
+  <string name="bandwidth_">Kaistanleveys:</string>
+  <string name="down">alas</string>
+  <string name="up">ylös</string>
+  <string name="pref_disable_network_title">Ei verkon automaattilepotilaa</string>
+  <string name="pref_disable_network_summary">Laita Tor nukkumaan, kun internet-yhteyttä ei ole saatavilla</string>
+  <string name="newnym">Vaihdoit Tor-identiteettisi uuteen!</string>
+  <string name="menu_use_chatsecure">Käytä ChatSecurea</string>
+  <string name="permission_manage_tor_label">Hallinnoi Toria</string>
+  <string name="permission_manage_tor_description">Anna tämän sovelluksen ohjata Tor-palvelua</string>
+  <string name="install_apps_">Asennetaanko sovelluksia?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Ei verkkoyhteyttä. Tor siirtyy valmiustilaan...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Verkkoyhteys toimii. Herätetään Tor...</string>
+  <string name="updating_settings_in_tor_service">päivitetään Tor-palvelun asetuksia</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Portti, jossa Torin SOCKS-proxy on (oletus: 9050, 0 = poista käytöstä)</string>
+  <string name="pref_socks_dialog">SOCKS-portin valinta</string>
+  <string name="pref_transport_title">Tor TransProxyn portti</string>
+  <string name="pref_transport_summary">Portti, jossa Torin läpinäkyvä välityspalvelin on (oletus: 9040, 0 = poista käytöstä)</string>
+  <string name="pref_transport_dialog">TransProxy-portin valinta</string>
+  <string name="pref_dnsport_title">Tor DNS-portti</string>
+  <string name="pref_dnsport_summary">Portti, jossa Torin DNS on (oletus: 5400, 0 = poista käytöstä)</string>
+  <string name="pref_dnsport_dialog">DNS-portin valinta</string>
+  <string name="pref_torrc_title">Torrc:n mukautetut asetukset</string>
+  <string name="pref_torrc_summary">VAIN ASIANTUNTIJAT: syötä torrc:n määritysrivejä suoraan</string>
+  <string name="pref_torrc_dialog">Mukautettu torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus - Benetechin ihmisoikeuksien dokumentaatiosovellus</string>
+  <string name="your_tor_public_ips_">Julkiset Tor-IP:si:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Poista tämä sovellus käytöstä kohdassa Android->Asetukset->Sovellukset, jos Orbotin kanssa on ongelmia:</string>
+  <string name="app_conflict">Sovellusristiriita</string>
+  <string name="pref_transproxy_refresh_title">Transproxyn automaattinen päivitys</string>
+  <string name="pref_transproxy_refresh_summary">Uudista Transproxy-säännöt, kun verkon tila muuttuu</string>
+  <string name="pref_transproxy_flush_title">Transproxyn PAKOTETTU POISTO</string>
+  <string name="pref_transproxy_flush_summary">Kosketa tätä tyhjentääksesi transproxyn verkkosäännöt VÄLITTÖMÄSTI</string>
+  <string name="transparent_proxy_rules_flushed_">Läpinäkyvän välityspalvelimen säännöt tyhjennetty!</string>
+  <string name="you_do_not_have_root_access_enabled">Sinulla ei ole ROOT-oikeuksia käytössä</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Saatat joutua pysäyttämään ja käynnistämään Orbotin, jotta asetusten muutos tulee käyttöön</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">Mbps</string>
+  <string name="kb">kt</string>
+  <string name="mb">Mt</string>
+  <string name="bridges_updated">Sillat päivitetty</string>
+  <string name="restart_orbot_to_use_this_bridge_">Käynnistä Orbot uudelleen ottaaksesi muutokset käyttöön</string>
+  <string name="menu_qr">QR-koodit</string>
+  <string name="bridge_mode">Siltatila</string>
+  <string name="get_bridges_email">Sähköposti</string>
+  <string name="get_bridges_web">Verkkosivu</string>
+  <string name="activate">Ota käyttöön</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Voit siirtää kaikki sovellukset laitteellasi kulkemaan Tor-verkon kautta Androidin VPN-toiminnolla.\n\n*VAROITUS* Tämä on uusi, kokeellinen ominaisuus, joka ei välttämättä käynnisty automaattisesti tai voi pysähtyä. Sitä EI pitäisi käyttää anonymiyteen, AINOASTAAN palomuurien ja suodatinten ohittamiseen.</string>
+  <string name="send_email">Lähetä sähköpostia</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Voit saada sillan osoitteen sähköpostin kautta, verkkosivulta tai skannaamalla sillan QR-koodin. Valitse \'Sähköposti\' tai \'Verkkosivu\' alta pyytääksesi sillan osoitetta.\n\nKun sinulla on osoite, kopioi & liitä se \"Sillat\" -kohtaan Orbotin asetuksissa ja käynnistä uudelleen.</string>
+  <string name="standard_browser">Normaali selain</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">HUOMAA: Vain standardit Tor-sillat toimivat Intel X86/ATOM -laitteilla.</string>
+</resources>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
new file mode 100644
index 0000000..3a11d06
--- /dev/null
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot est une appli libre de serveur mandataire permettant aux applis d\'utiliser Internet avec une sécurité accrue. Orbot utilise Tor pour chiffrer votre trafic Internet et le cache ensuite en le relayant au travers d\'ordinateurs de par le monde. Tor est un logiciel libre et un réseau ouvert qui vous aide à vous défendre contre une forme de surveillance réseau qui menace la liberté personnelle et la protection des données personnelles, les activités professionnelles confidentielles et les relations, et l\'analyse du trafic des gouvernements.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">démarrer et arrêter Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot démarre...</string>
+  <string name="status_activated">Connecté au réseau Tor</string>
+  <string name="status_disabled">Orbot est désactivé</string>
+  <string name="status_shutting_down">TorService est en cours d\'extinction</string>
+  <string name="tor_process_starting">Démarrage du client Tor...</string>
+  <string name="tor_process_complete">terminé.</string>
+  <string name="tor_process_waiting">attente.</string>
+  <string name="not_anonymous_yet">AVERTISSEMENT : votre trafic n\'est pas encore anonyme ! Veuillez configurer vos applications pour qu\'elles utilisent le serveur mandataire HTTP 127.0.0.1:8118 ou le serveur mandataire SOCKS4A ou SOCKS5 à 127.0.0.1:9050</string>
+  <string name="menu_home">Accueil</string>
+  <string name="menu_browse">Parcourir</string>
+  <string name="menu_settings">Paramètres</string>
+  <string name="menu_log">Journal</string>
+  <string name="menu_info">Aide</string>
+  <string name="menu_apps">RPV</string>
+  <string name="menu_start">Démarrer</string>
+  <string name="menu_stop">Arrêter</string>
+  <string name="menu_about">À propos</string>
+  <string name="menu_promo_apps">Obtenir des applis...</string>
+  <string name="main_layout_download">Télchargement</string>
+  <string name="main_layout_upload">Téléversement</string>
+  <string name="button_help">Aide</string>
+  <string name="button_close">Fermer</string>
+  <string name="button_about">À propos</string>
+  <string name="button_clear_log">Effacer le journal</string>
+  <string name="menu_verify">Vérifier</string>
+  <string name="menu_exit">Quitter</string>
+  <string name="menu_scan">Balayer un code QR de pont</string>
+  <string name="menu_share_bridge">Partager un code QR de pont</string>
+  <string name="press_to_start">- appuyer longuement pour démarrer -</string>
+  <string name="pref_trans_proxy_group">Relayage transparent (root exigé)</string>
+  <string name="pref_trans_proxy_title">Relayage transparent</string>
+  <string name="pref_trans_proxy_summary">Torifaction automatique des applis</string>
+  <string name="pref_transparent_all_title">Tout passer par Tor</string>
+  <string name="pref_transparent_all_summary">Relayer le trafic de toutes les applis par Tor</string>
+  <string name="pref_transparent_port_fallback_title">Repli pour le relais de port</string>
+  <string name="pref_transparent_port_fallback_summary">AVERTISSEMENT : contourne les ports habituels (80, 443, etc). *À N\'UTILISER QUE* si les modes « Tout » ou « Appli » ne fonctionnent pas.</string>
+  <string name="pref_transparent_port_title">Liste des ports</string>
+  <string name="pref_transparent_port_summary">Liste des ports à relayer. *À N\'UTILISER QUE* si les modes « Tout » ou « Appli » ne fonctionnent pas.</string>
+  <string name="pref_transparent_port_dialog">Saisir les ports à relayer</string>
+  <string name="pref_has_root">Demander l\'accès Root</string>
+  <string name="pref_has_root_summary">Demander l\'accès Root pour un relayage transparent</string>
+  <string name="status_install_success">L\'exécutable de Tor a été installé avec succès !</string>
+  <string name="status_install_fail">Le fichier exécutable de Tor n\'a pu pas être installé. Veuillez vérifier le journal et le signaler à tor-assistants at torproject.org</string>
+  <string name="title_error">Erreur d\'application</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">À propos d\'Orbot</string>
+  <string name="btn_next">Suivant</string>
+  <string name="btn_back">Précédent</string>
+  <string name="btn_finish">Fin</string>
+  <string name="btn_okay">OK</string>
+  <string name="btn_cancel">Annuler</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Quelques détails sur Orbot</string>
+  <string name="wizard_details_msg">Orbot est une application à code source ouvert incluant Tor, LibEvent et Polipo. Elle fournit un mandataire local HTTP (8118) et un mandataire SOCKS (9050) vers le réseau Tor. Orbot a aussi la capacité, sur un appareil rooté, d\'envoyer tout le trafic Internet par Tor.</string>
+  <string name="wizard_permissions_root">Permission accordée</string>
+  <string name="wizard_permissions_stock">Permissions d\'Orbot</string>
+  <string name="wizard_premissions_msg_root">Excellent ! Nous avons détecté les permissions root sont activées pour Orbot. Nous utiliserons ce pouvoir avec discernement.</string>
+  <string name="wizard_permissions_msg_stock">Bien que cela ne soit pas exigé, Orbot peut devenir un outil plus puissant si votre appareil à l\'accès root. Utilisez le bouton ci-dessous pour accorder à Orbot des superpouvoirs !</string>
+  <string name="wizard_permissions_no_root">Si vous n\'avez pas l\'accès root ou n\'avez aucune idée de quoi l\'on parle, assurez-vous d\'utiliser des applis conçues pour fonctionner avec Orbot.</string>
+  <string name="wizard_permissions_consent">Je comprends et je souhaite continuer sans superpouvoir</string>
+  <string name="wizard_permission_enable_root">Accorder les droits Root à Orbot</string>
+  <string name="wizard_configure">Configurer la torification</string>
+  <string name="wizard_configure_msg">Orbot vous donne l\'option de faire passer tout le trafic applicatif par Tor OU de choisir les applications individuellement.</string>
+  <string name="wizard_configure_all">Relayer toutes les applis par Tor</string>
+  <string name="wizard_configure_select_apps">Choisir des applis pour Tor</string>
+  <string name="wizard_tips_tricks">Applis concues pour Orbot</string>
+  <string name="wizard_tips_msg">Les applis ci-dessous ont été développées pour fonctionner avec Orbot. Cliquez sur chaque bouton pour les installer maintenant, ou trouvez plus tard dans Google Play Store, sur le site Web GuardianProject.info ou avec F-Droid.org.</string>
+  <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="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="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>
+  <string name="wizard_final">Orbot est prêt !</string>
+  <string name="wizard_final_msg">Des millions de personnes de par le monde utilisent Tor pour une grande variété de raisons.\n\nDes journalistes et des blogueurs, des défenseurs des droits humains, des officiers des forces de l\'ordre, des soldats, des sociétés, des citoyens de régimes répressifs, et de simples citoyens... et maintenant vous êtes aussi prêt à l\'utiliser !</string>
+  <string name="wizard_exit_at_first_screen_toast">Veuillez configurer Orbot avant de pouvoir commencer à l\'utiliser !</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Vous vous êtes connecté au réseau Tor avec succès - mais cela NE SIGNIFIE PAS que votre appareil est sécurisé. Vous pouvez utiliser le bouton « Navigateur » pour tester votre connexion. \n\n Visitez https://guardianproject.info/apps/orbot ou envoyez un courriel à help at guardianproject.info pour en savoir davantage.</string>
+  <string name="tor_check">Ceci ouvrira votre navigateur Web sur https://check.torproject.org afin de déterminer si Orbot est convenablement configuré et si vous êtes connecté à Tor.</string>
+  <string name="pref_hs_group">Hébergement de services cachés</string>
+  <string name="pref_general_group">Général</string>
+  <string name="pref_start_boot_title">Démarrer Orbot à l\'amorçage</string>
+  <string name="pref_start_boot_summary">Démarrer Orbot automatiquement et se connecter à Tor lors de l\'amorçage de votre appareil Android</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot, c\'est Tor sur Android !\n\nTor vous aide à vous défendre contre le filtrage du contenu, l\'analyse du trafic et la surveillance du réseau qui menacent la vie privée, les informations confidentielles et les relations interpersonnelles.\n\nCet assistant vous aidera à configurer Orbot et Tor sur votre appareil.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Avertissement</string>
+  <string name="wizard_warning_msg">La simple installation d\'Orbot n\'anonymisera pas automatiquement votre trafic mobile.\n\nVous devez configurer Orbot adéquatement, ainsi que votre appareil et les autres applis pour utiliser Tor avec succès.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permissions</string>
+  <string name="wizard_permissions_root_msg1">Vous pouvez optionnellement accorder à Orbot un accès « superutilisateur » pour activer des options avancées, comme le relayage transparent.</string>
+  <string name="wizard_permissions_root_msg2">Si vous ne voulez pas le faire, veuillez vous assurer d\'utiliser des applis conçues pour fonctionner avec Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Votre appareil ne semble pas être rooté ou ne pas fournir l\'accès root ou super-utilisateur.\n\nVeuillez plutôt essayer le mode « Applis » de l\'écran principal.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox : navigateur à confidentialité améliorée fonctionnant sur Tor</string>
+  <string name="wizard_tips_play">Trouver toutes les applis du Projet Guardian sur Google Play</string>
+  <string name="wizard_tips_fdroid">Trouver toutes les applis du Projet Guardian sur F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Trouver toutes les applis du Projet Guardian sur https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Relayage transparent</string>
+  <string name="wizard_transproxy_msg">Ceci permet à vos applis d\'utiliser automatiquement le réseau Tor sans aucune configuration.</string>
+  <string name="wizard_transproxy_hint">(Cochez cette case si vous n\'avez aucune idée de ce dont nous parlons)</string>
+  <string name="wizard_transproxy_none">Aucun</string>
+  <string name="pref_transparent_tethering_title">Fonction modem avec Tor</string>
+  <string name="pref_transparent_tethering_summary">Activer le relayage transparent pour les périphériques utilisant la fonction modem soit par Wi-Fi ou par USB (redémarrage nécessaire)</string>
+  <string name="button_grant_superuser">Demander l\'accès superutilisateur</string>
+  <string name="pref_select_apps">Choisir les applis</string>
+  <string name="pref_select_apps_summary">Choisir les applis à acheminer par Tor</string>
+  <string name="pref_node_configuration">Configuration de nœud </string>
+  <string name="pref_node_configuration_summary">Ces paramètres avancés peuvent réduire votre anonymat</string>
+  <string name="pref_entrance_node">Nœuds d\'entrée</string>
+  <string name="pref_entrance_node_summary">Empreintes, pseudos, pays et adresses pour le premier saut</string>
+  <string name="pref_entrance_node_dialog">Saisir les nœuds d\'entrée</string>
+  <string name="pref_allow_background_starts_title">Permet des lancements en arrière-plan</string>
+  <string name="pref_allow_background_starts_summary">Laissez n\'importe quelle appli dire à Orbot de démarrer Tor et les services connexes</string>
+  <string name="button_proxy_all">Tout relayer</string>
+  <string name="button_proxy_none">Ne rien relayer</string>
+  <string name="button_invert_selection">Inverser la sélection</string>
+  <string name="pref_proxy_title">Mandataire pour le réseau sortant (optionnel)</string>
+  <string name="pref_proxy_type_title">Type de mandataire sortant</string>
+  <string name="pref_proxy_type_summary">Protocole à utiliser pour le serveur mandataire : HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Saisir le type de mandataire</string>
+  <string name="pref_proxy_host_title">Hôte du mandataire sortant</string>
+  <string name="pref_proxy_host_summary">Nom d\'hôte du serveur mandataire</string>
+  <string name="pref_proxy_host_dialog">Saisir l\'hôte mandataire</string>
+  <string name="pref_proxy_port_title">Port du mandataire sortant</string>
+  <string name="pref_proxy_port_summary">Port du serveur mandataire</string>
+  <string name="pref_proxy_port_dialog">Saisir le port du mandataire</string>
+  <string name="pref_proxy_username_title">Nom d\'utilisateur du mandataire sortant</string>
+  <string name="pref_proxy_username_summary">Nom d\'utilisateur du mandataire (optionnel)</string>
+  <string name="pref_proxy_username_dialog">Saisir le nom d\'utilisateur du mandataire</string>
+  <string name="pref_proxy_password_title">Mot de passe du mandataire sortant</string>
+  <string name="pref_proxy_password_summary">Mot de passe du mandataire (optionnel)</string>
+  <string name="pref_proxy_password_dialog">Saisir le mot de passe du mandataire</string>
+  <string name="status">État</string>
+  <string name="setting_up_full_transparent_proxying_">Configuration le relayage entièrement transparent...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Configuration d\'un relayage transparent par appli...</string>
+  <string name="transparent_proxying_enabled">Relayage transparent ACTIVÉ</string>
+  <string name="transproxy_enabled_for_tethering_">Relais transparent activé pour pour la fonction modem !</string>
+  <string name="warning_error_starting_transparent_proxying_">AVERTISSEMENT : erreur lors du démarrage du relayage transparent !</string>
+  <string name="transproxy_rules_cleared">Règles du relais transparent effacées</string>
+  <string name="couldn_t_start_tor_process_">Impossible de démarrer le processus Tor : </string>
+  <string name="privoxy_is_running_on_port_">Polipo tourne sur le port : </string>
+  <string name="setting_up_port_based_transparent_proxying_">Configuration du relayage transparent par port...</string>
+  <string name="bridge_error">Erreur de pont</string>
+  <string name="bridge_requires_ip">Afin de pouvoir utiliser la fonction pont, vous devez au moins saisir l\'adresse IP d\'un pont.</string>
+  <string name="send_email_for_bridges">Envoyez un courriel à bridges at torproject.org avec la ligne « get bridges », seule, dans le corps du courriel à partir d\'un compte Gmail. </string>
+  <string name="error">Erreur</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Vos paramètres ReachableAddresses (adresses accessibles) ont causé une exception !</string>
+  <string name="your_relay_settings_caused_an_exception_">Vos paramètres de relais ont causé une exception !</string>
+  <string name="exit_nodes">Nœuds de sortie</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Empreintes, pseudos, pays et adresses pour le dernier saut</string>
+  <string name="enter_exit_nodes">Saisir les noeuds de sortie</string>
+  <string name="exclude_nodes">Nœuds à exclure</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Empreintes, pseudos, pays et adresses à exclure</string>
+  <string name="enter_exclude_nodes">Saisir les nœuds à exclure</string>
+  <string name="strict_nodes">Nœuds stricts</string>
+  <string name="use_only_these_specified_nodes">Utiliser *uniquement * ces nœuds spécifiés</string>
+  <string name="bridges">Ponts</string>
+  <string name="use_bridges">Utiliser des ponts</string>
+  <string name="bridges_obfuscated">Ponts obscurcis</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Activer des nœuds alternatifs d\'entrée vers le réseau Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Activer si les ponts configurés sont des ponts obscurcis</string>
+  <string name="ip_address_and_port_of_bridges">Adresse IP et port des ponts</string>
+  <string name="enter_bridge_addresses">Saisir les adresses des ponts</string>
+  <string name="relays">Relais</string>
+  <string name="relaying">Relayage</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Configurez votre appareil pour être un relais de non-sortie</string>
+  <string name="relay_port">Port du relais</string>
+  <string name="listening_port_for_your_tor_relay">Port d\'écoute pour votre relais Tor</string>
+  <string name="enter_or_port">Saisir le port OR</string>
+  <string name="relay_nickname">Pseudo du relais</string>
+  <string name="the_nickname_for_your_tor_relay">Le pseudo de votre relais Tor</string>
+  <string name="enter_a_custom_relay_nickname">Saisir un pseudo personnalisé pour le relais</string>
+  <string name="reachable_addresses">Adresses accessibles</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Exécuter en tant que client derrière un pare-feu avec des politiques restrictives</string>
+  <string name="reachable_ports">Ports accessibles</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Ports accessibles derrière un pare-feu restrictif</string>
+  <string name="enter_ports">Saisir les ports</string>
+  <string name="enable_hidden_services">Hébergement de services cachés</string>
+  <string name="run_servers_accessible_via_the_tor_network">permettre aux serveurs sur l\'appareil d\'être accessibles par le réseau Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">saisir les ports de l\'hôte local pour les services cachés</string>
+  <string name="hidden_service_ports">Ports des services cachés</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">le nom adressable pour votre service caché (généré automatiquement)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">activer le journal de débogage vers la sortie (vous devez utiliser adb ou aLogCat pour le visualiser)</string>
+  <string name="project_home">Page(s) d\'accueil du projet :</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">La licence de Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Logiciels tiers :</string>
+  <string name="tor_version">Tor : https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21 : http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9 : https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21 : http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q : http://www.openssl.org</string>
+  <string name="hidden_service_request">Une appli veut ouvrir le port %S du serveur caché au réseau Tor. ceci est sécuritaire si vous faites confiance à l\'appli.</string>
+  <string name="found_existing_tor_process">un processus existant de Tor a été trouvé...</string>
+  <string name="something_bad_happened">Quelque chose n\'a pas été. Vérifiez le journal</string>
+  <string name="hidden_service_on">service caché sur :</string>
+  <string name="unable_to_read_hidden_service_name">impossible de lire le nom du service caché</string>
+  <string name="unable_to_start_tor">Impossible de démarrer Tor :</string>
+  <string name="unable_to_reset_tor">Redémarrez votre appareil, impossible de réinitialiser Tor !</string>
+  <string name="pref_use_sys_iptables_title">Utiliser les Iptables par défaut</string>
+  <string name="pref_use_sys_iptables_summary">Utiliser le binaire iptables intégré à la place du binaire intégré avec Orbot</string>
+  <string name="error_installing_binares">Les fichiers binaires de Tor n\'ont pas pu être installés ou mis à niveau.</string>
+  <string name="pref_use_persistent_notifications">Toujours conserver l\'icône dans la barre des tâches quand Orbot est connecté.</string>
+  <string name="pref_use_persistent_notifications_title">Toujours activer les notifications</string>
+  <string name="pref_use_expanded_notifications">Montrer des notifications étendues avec le pays de sortie de Tor et l\'IP</string>
+  <string name="pref_use_expanded_notifications_title">Notifications étendues</string>
+  <string name="notification_using_bridges">Les ponts sont activés !</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Langue</string>
+  <string name="set_locale_summary">Choisir les paramètres régionaux pour Orbot</string>
+  <string name="wizard_locale_title">Choisir la langue</string>
+  <string name="wizard_locale_msg">Laisser à la valeur par défaut ou changer la langue actuelle</string>
+  <string name="powered_by">propulsé par Tor</string>
+  <string name="btn_save_settings">Enregistrer les paramètres</string>
+  <string name="no_internet_connection_tor">Pas de connexion Internet ; Tor est en attente...</string>
+  <string name="bandwidth_">Bande passante :</string>
+  <string name="down">aval</string>
+  <string name="up">amont</string>
+  <string name="pref_disable_network_title">Pas de mise en veille automatique du réseau</string>
+  <string name="pref_disable_network_summary">Mettre Tor en veille quand aucune connexion Internet n\'est disponible</string>
+  <string name="newnym">Vous avez basculé vers une nouvelle identité Tor !</string>
+  <string name="menu_verify_browser">Navigateur</string>
+  <string name="menu_use_chatsecure">Utiliser ChatSecure</string>
+  <string name="permission_manage_tor_label">Gérer Tor</string>
+  <string name="permission_manage_tor_description">Autoriser cette appli à contrôler le service Tor</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Il semble qu\'Orfox n\'est pas installé. Voulez-vous de l\'aide à ce sujet ou devrions-nous juste ouvrir le navigateur ?</string>
+  <string name="install_apps_">Installer les applis ?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Pas de connectivité réseau. Mise au repos de Tor...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">La connectivité réseau est bonne. Réveil de Tor...</string>
+  <string name="updating_settings_in_tor_service">mise à jour des paramètres dans le service Tor</string>
+  <string name="pref_socks_title">SOCKS Tor</string>
+  <string name="pref_socks_summary">Port sur lequel Tor offre son mandataire SOCKS (par défaut : 9050 ou 0 pour le désactiver)</string>
+  <string name="pref_socks_dialog">Configuration du part SOCKS</string>
+  <string name="pref_transport_title">Port Transproxy de Tor</string>
+  <string name="pref_transport_summary">Port sur lequel Tor offre son mandataire transparent (par défaut : 9040 ou 0 pour le désactiver)</string>
+  <string name="pref_transport_dialog">Configuration du port TransProxy</string>
+  <string name="pref_dnsport_title">Port DNS de Tor</string>
+  <string name="pref_dnsport_summary">Port sur lequel Tor offre son DNS (par défaut : 5400 ou 0 pour le désactiver)</string>
+  <string name="pref_dnsport_dialog">Configuration du port DNS</string>
+  <string name="pref_torrc_title">Configuration personnalisée de Torrc</string>
+  <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="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>
+  <string name="pref_transproxy_refresh_title">Rafraîchissement automatique de Transproxy</string>
+  <string name="pref_transproxy_refresh_summary">Appliquer de nouveau les règles de Transproxy lors des changements d\'état du réseau</string>
+  <string name="pref_transproxy_flush_title">Transproxy ENLEVER DE FORCE</string>
+  <string name="pref_transproxy_flush_summary">Toquer ici pour vider toutes les règles réseau de transproxy MAINTENANT</string>
+  <string name="transparent_proxy_rules_flushed_">Les règles du mandataire transparent ont été vidées !</string>
+  <string name="you_do_not_have_root_access_enabled">L\'accès ROOT n\'est pas activé</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Vous pourriez avoir à arrêter et démarrer Orbot pour que les changements de paramètres soient activés.</string>
+  <string name="menu_vpn">RPV</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">Ko</string>
+  <string name="mb">Mo</string>
+  <string name="bridges_updated">Ponts mis à jour</string>
+  <string name="restart_orbot_to_use_this_bridge_">Veuillez redémarrer Orbot pour activer les changements</string>
+  <string name="menu_qr">Codes QR</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Si votre réseau mobile bloque Tor activement, vous pouvez utiliser un pont pour accéder au réseau.\n\nCHOISIR un des types de ponts ci-dessus pour activer les ponts.</string>
+  <string name="bridge_mode">Mode pont</string>
+  <string name="get_bridges_email">Courriel</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Activer</string>
+  <string name="apps_mode">Mode RPV des applis</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Vous pouvez activer le relais de toutes les applis par le réseau Tor en utilisant la fonction de RPV d\'Android.\n\n*AVERTISSEMENT* Cette fonction est nouvelle et expérimentale et pourrait parfois ne pas démarrer automatiquement, et même s\'arrêter. Elle ne devrait PAS être utilisée pour l\'anonymat, et être SEULEMENT utilisée pour passer les pare-feu et les filtres.</string>
+  <string name="send_email">Envoyer un courriel</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Vous pouvez obtenir une adresse de pont par courriel, par le Web ou en balayant le code QR d\'un pont. Choisissez *Courriel* ou *Web* ci-dessous pour demander une adresse de pont.\n\nUne fois que vous avez une adresse, copiez & collez-la dans le champ « Ponts » des paramètres d\'Orbot et redémarrez.</string>
+  <string name="install_orweb">Installer Orfox</string>
+  <string name="standard_browser">Navigateur standard</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Note : seuls les ponts Tor standards fonctionnent sur les appareils Intel X86/ATOM</string>
+  <string name="vpn_default_world">Monde</string>
+</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
new file mode 100644
index 0000000..fa05133
--- /dev/null
+++ b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot est une application proxy gratuite qui améliore l\'utilisation plus sécurisée des applications. Orbot utilise Tor pour crypter votre trafic internet et le cacher en passant par une série d\'ordinateur partout dans le monde. Tor est un logiciel gratuit et un réseau ouvert qui vous aide à vous défendre contre les surveillances de réseau qui font peur à la liberté personnelle et la vie privée, les activités confidentielles des entreprises et des relations, et l\'état de la sécurité connu sous le nom d\'analyse de trafic.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">Démarrer et arrêter Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Démarrage de Orbot...</string>
+  <string name="status_activated">Connecté au réseau Tor</string>
+  <string name="status_disabled">Orbot est désactivé</string>
+  <string name="status_shutting_down">Le service Tor est en cours de fermeture</string>
+  <string name="tor_process_starting">Démarrage du client Tor...</string>
+  <string name="tor_process_complete">terminé.</string>
+  <string name="tor_process_waiting">en attente.</string>
+  <string name="not_anonymous_yet">ATTENTION : Votre trafic n\'est pas encore anonyme ! Veuillez configurer votre application pour utiliser le proxy HTTP 127.0.0.1:8118 ou le proxy SOCKS4A ou SOCKS5A 172.0.0.1:9050</string>
+  <string name="menu_home">Accueil</string>
+  <string name="menu_browse">Naviguer</string>
+  <string name="menu_settings">Paramètres</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Aide</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Démarrer</string>
+  <string name="menu_stop">Arrêter</string>
+  <string name="menu_about">A propos</string>
+  <string name="menu_promo_apps">Obtenir des applications</string>
+  <string name="main_layout_download">Télécharger</string>
+  <string name="main_layout_upload">Envoyer</string>
+  <string name="button_help">Aide</string>
+  <string name="button_close">Fermer</string>
+  <string name="button_about">A propos</string>
+  <string name="button_clear_log">Effacer la log</string>
+  <string name="menu_verify">Vérifier</string>
+  <string name="menu_exit">Quitter</string>
+  <string name="menu_scan">Analyser BridgeQR</string>
+  <string name="menu_share_bridge">Partager BridgeQR</string>
+  <string name="press_to_start">- appui long pour commencer -</string>
+  <string name="pref_trans_proxy_group">Passage du trafic Internet de manière transparente (Requiert le Root)</string>
+  <string name="pref_trans_proxy_title">Passage du trafic Internet de manière transparente</string>
+  <string name="wizard_title">Orbot</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Passage du trafic Internet de manière transparente</string>
+  <string name="default_bridges"></string>
+  <string name="menu_vpn">VPN</string>
+</resources>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
new file mode 100644
index 0000000..8496d4b
--- /dev/null
+++ b/app/src/main/res/values-gl/strings.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot é unha aplicación de proxy libre que permite a outras aplicacións usar a internet dun xeito máis seguro. Orbot usa Tor para encriptar o teu tráfico de internet ocultando e rebotándoo a través dunha serie de ordenadores ao redor do mundo. Tor é software libre e unha rede aberta que axuda a defenderte contra unha forma de vixiancia na rede que ameaza a liberdade e privacidade persoal, actividades confidenciáis de negocios e relacións, e estado de seguridade coñecido como análise de tráfico.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">iniciar e deter Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot está a se iniciar...</string>
+  <string name="status_activated">Conectado á rede Tor</string>
+  <string name="status_disabled">Orbot está desactivado</string>
+  <string name="tor_process_starting">Iniciando cliente Tor...</string>
+  <string name="tor_process_complete">completado.</string>
+  <string name="tor_process_waiting">á espera.</string>
+  <string name="not_anonymous_yet">AVISO: o teu tráfico aínda non é anónimo! Por favor, configura os teus aplicativos para uxar o proxy HTTP 127.0.0.1:8118 ou SOCKS4A ou o proxy SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Inicio</string>
+  <string name="menu_browse">Examinar</string>
+  <string name="menu_settings">Axustes</string>
+  <string name="menu_log">Rexistro (log)</string>
+  <string name="menu_info">Axuda</string>
+  <string name="menu_start">Iniciar</string>
+  <string name="menu_stop">Deter</string>
+  <string name="menu_about">Sobre</string>
+  <string name="main_layout_download">Descargar</string>
+  <string name="main_layout_upload">Cargar</string>
+  <string name="button_help">Axuda</string>
+  <string name="button_close">Pechar</string>
+  <string name="button_about">Sobre</string>
+  <string name="button_clear_log">Limpar rexistro</string>
+  <string name="menu_verify">Comprobar</string>
+  <string name="menu_exit">Saír </string>
+  <string name="press_to_start">- toque longo para comezar-</string>
+  <string name="pref_trans_proxy_group">Proxyficación transparente (cómpre ser root)</string>
+  <string name="pref_trans_proxy_title">Proxyficación transparente</string>
+  <string name="pref_trans_proxy_summary">Torificación Automática dos Aplicativos</string>
+  <string name="pref_transparent_all_title">Tor para todo</string>
+  <string name="pref_transparent_all_summary">Pasar todo o tráfico dos aplicativos por Tor</string>
+  <string name="pref_transparent_port_fallback_title">Porto de Reserva do Proxy</string>
+  <string name="pref_transparent_port_fallback_summary">ATENCIÓN: Evita os portos comúns (80, 443, etc). * USAR SÓ* se os modos  \'Todo\' ou \'Aplicación\' non funcionan.</string>
+  <string name="pref_transparent_port_title">Lista de Portos</string>
+  <string name="pref_transparent_port_summary">Lista de portos a pasar. *USAR SÓ* se os modos \'Todo\' ou \'Aplicación\' non funcionan</string>
+  <string name="pref_transparent_port_dialog">Introduza os portos a pasar</string>
+  <string name="pref_has_root">Requerir Acceso de Superusuario</string>
+  <string name="pref_has_root_summary">Requerir acceso de root para proxy transparente</string>
+  <string name="status_install_success">Se instalaron con éxito os binarios de Tor!</string>
+  <string name="status_install_fail">Non se puideron instalar os ficheiros binarios de Tor. Por favor, comprobe o rexistro e notifíqueo a tor-assistants at torproject.org</string>
+  <string name="title_error">Erro de Aplicativo</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Acerca de Orbot</string>
+  <string name="btn_next">Seguinte</string>
+  <string name="btn_back">Atrás</string>
+  <string name="btn_finish">Rematar</string>
+  <string name="btn_okay">Aceptar</string>
+  <string name="btn_cancel">Cancelar</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Algúns detalles sobre Orbot</string>
+  <string name="wizard_permissions_root">Permiso Concedido</string>
+  <string name="wizard_permissions_stock">Permisos de Orbot</string>
+  <string name="wizard_premissions_msg_root">Excelente! Detectamos que ten permisos de root habilitados para Orbot. Empregaremos este poder sabiamente.</string>
+  <string name="wizard_permissions_msg_stock">Aínda que non é necesario, Orbot pode ser unha ferramenta máis poderosa se o seu dispositivo ten acceso de root. Use o botón de abaixo para dar superpoderes a Orbot!</string>
+  <string name="wizard_permissions_no_root">Se non ten acceso de root ou non tén nin idea de  qué lle estamos a falar, asegúrese de usar aplicativos que funcionen con Orbot.</string>
+  <string name="wizard_permissions_consent">Entendo e gostaríame continuar sen Superusuario</string>
+  <string name="wizard_permission_enable_root">Conceder Root a Orbot</string>
+  <string name="wizard_configure">Configurar Torificación</string>
+  <string name="wizard_configure_msg">Orbot dá-lle a opción de enrutar todo o tráfico dos aplicativos a través de Tor OU elexir ditos aplicativos individualmente.</string>
+  <string name="wizard_configure_all">Enviar Todos os Aplicativos Por Tor</string>
+  <string name="wizard_configure_select_apps">Elixir Aplicativos Individuais por Tor</string>
+  <string name="wizard_tips_tricks">Aplicativos habilitados para Tor</string>
+  <string name="wizard_tips_msg">Os aplicativos de abaixo foron programados para funcionar con Orbot. Prema en cada botón para instalar agora, ou os pode atopar despóis en Google Play, no sitio web GuardianProject.info ou en F-Droid.org.</string>
+  <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="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>
+  <string name="wizard_final">Orbot está listo!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Isto abrirá no seu navegador https://check.torproject.org para ver se Obrbot está configurado probablemente e se está conectado a Tor.</string>
+  <string name="pref_hs_group">Aloxamento Oculto de Servizo</string>
+  <string name="pref_general_group">Xeral</string>
+  <string name="pref_start_boot_title">Inciar Orbot no Arranque</string>
+  <string name="pref_start_boot_summary">Iniciar Orbot automáticamente cando o seu dispositivo Android arranque</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Aviso</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permisos</string>
+  <string name="wizard_permissions_root_msg1">Opcionalmente pode darlle a Orbot acceso de \'Superusuario\' para habilitar características avanzadas, como o Proxy Transparente.</string>
+  <string name="wizard_permissions_root_msg2">Se non quere facer isto, por favor asegúrese de usar aplicativos feitos para traballar con Orbot</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Atope todos os aplicativos de Guardian Project apps en Google Play</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxy Transparente</string>
+  <string name="wizard_transproxy_msg">Isto permite que os seus aplicativos funcionen a través de rede Tor sen ningunha configuración.</string>
+  <string name="wizard_transproxy_hint">(Marque esta caixa se non ten nin idea do que lle estamos a falar)</string>
+  <string name="wizard_transproxy_none">Ningunha</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Habilitar Proxy Transparente Tor para dispositivos enlazados por Wifi ou USB (require reiniciar)</string>
+  <string name="button_grant_superuser">Pedir Acceso de Superusuario</string>
+  <string name="pref_select_apps">Seleccionar Aplicativos</string>
+  <string name="pref_select_apps_summary">Elixir Aplicativos a Enrutar a Través de Tor</string>
+  <string name="pref_node_configuration">Configuración de Nodo</string>
+  <string name="pref_node_configuration_summary">Estes son axuste avanzados que poden reducir o seu anonimato</string>
+  <string name="pref_entrance_node">Nodos de Entrada</string>
+  <string name="pref_entrance_node_summary">Huellas, alias, países e direccións para o primeiro salto</string>
+  <string name="pref_entrance_node_dialog">Introduzca Nodos de Entrada</string>
+  <string name="pref_proxy_title">Proxy para a Rede de Saída (Opcional)</string>
+  <string name="pref_proxy_type_title">Tipo de Proxy de Saída</string>
+  <string name="pref_proxy_type_summary">Protocolo a usar para o servidor proxy: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Introduzca Tipo de Proxy</string>
+  <string name="pref_proxy_host_title">Host de Proxy de Saída</string>
+  <string name="pref_proxy_host_summary">Nome do Host Proxy Servidor</string>
+  <string name="pref_proxy_host_dialog">Introduzca o Host Proxy</string>
+  <string name="pref_proxy_port_title">Porto do Proxy de Saída</string>
+  <string name="pref_proxy_port_summary">Porto do Servidor Proxy</string>
+  <string name="pref_proxy_port_dialog">Introduzca o porto do Proxy</string>
+  <string name="pref_proxy_username_title">Nome de usuario do Proxy de Saída</string>
+  <string name="pref_proxy_username_summary">Nome de Usuario do Proxy (Opcional)</string>
+  <string name="pref_proxy_username_dialog">Introduza o Nome de Usuario do Proxy</string>
+  <string name="pref_proxy_password_title">Contrasinal do Proxy de Saída</string>
+  <string name="pref_proxy_password_summary">Contrasinal do Proxy (Opcional)</string>
+  <string name="pref_proxy_password_dialog">Introduza Contrasinal do Proxy</string>
+  <string name="status">Estado</string>
+  <string name="setting_up_full_transparent_proxying_">Preparando proxy transparente completo...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Preparando proxy transparente baseado en aplicativo...</string>
+  <string name="transparent_proxying_enabled">Proxy Transparente HABILITADO</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy habilitado para Enlazamento!</string>
+  <string name="warning_error_starting_transparent_proxying_">ATENCIÓN: erro arrancando o proxy transparente!</string>
+  <string name="transproxy_rules_cleared">Regras TransProxy limpadas</string>
+  <string name="couldn_t_start_tor_process_">No se pudio inciar o proceso Tor:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Preparando proxy transparente baseado en porto...</string>
+  <string name="bridge_error">Erro de Ponte</string>
+  <string name="bridge_requires_ip">Para usar a característica de ponte, debe introducir cando menos unha dirección IP de ponte.</string>
+  <string name="send_email_for_bridges">Envíe un email a bridges at torproject.org só coa liña \"get bridges\" no corpo do correo dende unha conta de gmail.</string>
+  <string name="error">Erro</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">O seu axuste de ReachableAddresses causou unha excepción!</string>
+  <string name="your_relay_settings_caused_an_exception_">Os seus axustes de relay causou unha excepción!</string>
+  <string name="exit_nodes">Nodos de Saída</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Huellas, alias, países e direccións para o último salto</string>
+  <string name="enter_exit_nodes">Introduza Nodos de Saída</string>
+  <string name="exclude_nodes">Excluir Nodos</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Huellas, alias, países e direccións a excluír</string>
+  <string name="enter_exclude_nodes">Introduza Nodos Excluídos</string>
+  <string name="strict_nodes">Nodos Estritos</string>
+  <string name="use_only_these_specified_nodes">Usar *só* este nodos específicos</string>
+  <string name="bridges">Pontes</string>
+  <string name="use_bridges">Usar Pontes</string>
+  <string name="bridges_obfuscated">Pontes Ofuscadas</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilitar nodos alternativos de entrada á rede Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilitar se oas pontes configuradas son pontes ofuscadas</string>
+  <string name="ip_address_and_port_of_bridges">Dirección IP e porto das pontes</string>
+  <string name="enter_bridge_addresses">Introduza Direccións das Pontes</string>
+  <string name="relays">Reenvíos</string>
+  <string name="relaying">Reenvío</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Habilite o seu dispositivo para ser un reenvío non de saída</string>
+  <string name="relay_port">Porto de Reenvío</string>
+  <string name="listening_port_for_your_tor_relay">Porto de Escoita do seu reenvío Tor</string>
+  <string name="enter_or_port">Introduza o porto OR</string>
+  <string name="relay_nickname">Alias de Reenvío</string>
+  <string name="the_nickname_for_your_tor_relay">Seu alias para reenvío de Tor</string>
+  <string name="enter_a_custom_relay_nickname">Introduza un alias personalizado de reenvío</string>
+  <string name="reachable_addresses">Direccións Alcanzábeis</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Executar como un cliente detrás dun firewall con políticas restritivas</string>
+  <string name="reachable_ports">Portos Alcanzábeis</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Portos alcanzábeis detrás dun firewall restritivo</string>
+  <string name="enter_ports">Inserir portos</string>
+  <string name="enable_hidden_services">Aloxamento de Servizo Oculto</string>
+  <string name="run_servers_accessible_via_the_tor_network">permitir ao servidor no dispositivo estar accesible na rede Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">introduza os portos localis para servizos ocultos</string>
+  <string name="hidden_service_ports">Portos de Servicios Ocultos</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">nome para referirse ao seu servizo oculto (xenerado automáticamente)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">habilitar rexistro de depuración na saída (debe usar adb ou aLogCat para ver)</string>
+  <string name="project_home">Páxina(s) de Inicio do Proxecto:</string>
+  <string name="the_tor_license">A Licencia de Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Software de Terceiros:</string>
+  <string name="hidden_service_request">Un aplicativo quere abrir o porto do servidor oculto %S na rede Tor. Isto é seguro se confía no aplicativo.</string>
+  <string name="found_existing_tor_process">atopado proceso Tor existente...</string>
+  <string name="something_bad_happened">Algo malo pasou. Comprobe o rexistro</string>
+  <string name="hidden_service_on">servizo oculto en:</string>
+  <string name="unable_to_read_hidden_service_name">imposible ler nome de servizo oculto</string>
+  <string name="unable_to_start_tor">Incapaz de arrancar Tor</string>
+  <string name="pref_use_sys_iptables_title">Usar iptables por Defecto</string>
+  <string name="pref_use_sys_iptables_summary">usar o binario de iptables instalado en lugar do empaquetado con Orbot</string>
+  <string name="error_installing_binares">Non se puideron instalar ou actualizar os binarios de Tor</string>
+  <string name="pref_use_persistent_notifications">Mostrar sempre a icona na barra de ferramentas cando Orbot estea conectado</string>
+  <string name="pref_use_persistent_notifications_title">Notificacións Sempre Acesas</string>
+  <string name="notification_using_bridges">Pontes habilitadas!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Elixir locale e idioma para Orbot</string>
+  <string name="wizard_locale_title">Escoller idioma</string>
+  <string name="wizard_locale_msg">Deixar por defecto ou cambiar ao idioma actual</string>
+  <string name="btn_save_settings">Gardar os axustes</string>
+  <string name="bandwidth_">Ancho de Banda:</string>
+  <string name="down">caído</string>
+  <string name="up">levantado</string>
+  <string name="pref_disable_network_title">Auto-Parado Sen Rede</string>
+  <string name="pref_disable_network_summary">Parar Tor cando non hai conexión a internet</string>
+  <string name="newnym">Cambiou a unha nova identidade Tor!</string>
+  <string name="menu_use_chatsecure">Usar ChatSecure</string>
+  <string name="permission_manage_tor_label">Xestionar Tor</string>
+  <string name="permission_manage_tor_description">Hablitar este aplicativo para controlar o servicio Tor</string>
+  <string name="install_apps_">Instalar aplicativos?</string>
+</resources>
diff --git a/app/src/main/res/values-gu-rIN/strings.xml b/app/src/main/res/values-gu-rIN/strings.xml
new file mode 100644
index 0000000..bfb4b94
--- /dev/null
+++ b/app/src/main/res/values-gu-rIN/strings.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="btn_cancel">રદ કરો</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">પ્રોક્સી ગોઠવણીઓ</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-gu/strings.xml b/app/src/main/res/values-gu/strings.xml
new file mode 100644
index 0000000..3965a3d
--- /dev/null
+++ b/app/src/main/res/values-gu/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_info">મદદ</string>
+  <string name="button_help">મદદ</string>
+  <string name="button_close">બંધ કરો</string>
+  <string name="btn_cancel">રદ્ કરો</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">પ્રોક્સી ગોઠવણીઓ</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
new file mode 100644
index 0000000..e5e33f9
--- /dev/null
+++ b/app/src/main/res/values-he/strings.xml
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot הינה אפליקציית פרוקסי חינמית המאפשרת לאפליקציות אחרות להשתמש באינטרנט בבטחה. Orbot נעזרת ב-Tor כדי להצפין את תעבורת האינטרנט שלך ולהסוותה באמצעותה ניתובה דרך מספר מחשבים ברחבי העולם. Tor היא תוכנה חופשית ורשת פתוחה המסייעת לך להתגונן מפני סוגים מסוימים של אמצעי ניטור ומעקב אחר רשת האינטרנט המאיימים על הפרטיות, החירות האישית, פעילויות עסקיות ומערכות יחסים חשאיות.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">התחל ועצור את Tor</string>
+  <string name="tor_proxy_service_process">שירות פרוקסי Tor</string>
+  <string name="status_starting_up">Orbot מתחיל…</string>
+  <string name="status_activated">מחובר לרשת Tor</string>
+  <string name="status_disabled">Orbot כבוי</string>
+  <string name="tor_process_starting">מתחיל לקוח Tor...</string>
+  <string name="tor_process_complete">הושלם.</string>
+  <string name="tor_process_waiting">מחכה.</string>
+  <string name="not_anonymous_yet">אזהרה: התעבורה שלך אינה אנונימית עדיין! בבקשה הגדר את האפליקציות שלך כך שיתאפשר שימוש בפרוקסי HTTP (קרי 127.0.0.1:8118) או SOCKS4A או SOCKS5 (קרי 127.0.0.1:9050)</string>
+  <string name="menu_home">בית</string>
+  <string name="menu_browse">דפדף</string>
+  <string name="menu_settings">הגדרות</string>
+  <string name="menu_log">רישום</string>
+  <string name="menu_info">עזרה</string>
+  <string name="menu_start">התחל</string>
+  <string name="menu_stop">עצור</string>
+  <string name="menu_about">אודות</string>
+  <string name="main_layout_download">הורדה</string>
+  <string name="main_layout_upload">העלאה</string>
+  <string name="button_help">עזרה</string>
+  <string name="button_close">סגור</string>
+  <string name="button_about">אודות</string>
+  <string name="button_clear_log">נקה רישום</string>
+  <string name="menu_verify">בדוק</string>
+  <string name="menu_exit">יציאה</string>
+  <string name="menu_scan">סרוק BridgeQR</string>
+  <string name="menu_share_bridge">שתף BridgeQR</string>
+  <string name="press_to_start">-נגיעה ארוכה להתחלה-</string>
+  <string name="pref_trans_proxy_group">פרוקסי שקוף (שורש נדרש)</string>
+  <string name="pref_trans_proxy_title">פרוקסי שקוף</string>
+  <string name="pref_trans_proxy_summary">עבודה אוטומטית עם אפליקציות דרך Tor</string>
+  <string name="pref_transparent_all_title">הכל דרך Tor</string>
+  <string name="pref_transparent_all_summary">תעבור דרך פרוקסי  עבור כל האפליקציות דרך Tor</string>
+  <string name="pref_transparent_port_fallback_title">מפלט פורט פרוקסי</string>
+  <string name="pref_transparent_port_fallback_summary">אזהרה: עקוף פורטים נפוצים (80,443 וכו\'). *השתמש רק* אם האופנים \'All\' או \'App\'  לא עובדים.</string>
+  <string name="pref_transparent_port_title">רשימת פורטים</string>
+  <string name="pref_transparent_port_summary">רשימת פורטים לפרוקסי. *השתמש רק* אם האופנים \'All\' או \'App\'  לא עובדים.</string>
+  <string name="pref_transparent_port_dialog">הזן פורטים לפרוקסי</string>
+  <string name="pref_has_root">דרושה גישת שורש</string>
+  <string name="pref_has_root_summary">בקש גישה עליונה עבור שימוש בפרוקסי שקוף</string>
+  <string name="status_install_success">קבצים ברי הרצה של Tor הותקנו בהצלחה!</string>
+  <string name="status_install_fail">הקבצים ברי ההרצה של Tor לא ניתנו להתקנה. בבקשה בדוק את הלוג והודע ל 
+tor-assistants at torproject.org</string>
+  <string name="title_error">שגיאת אפליקציה</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">אודות Orbot</string>
+  <string name="btn_next">הבא</string>
+  <string name="btn_back">הקודם</string>
+  <string name="btn_finish">סיים</string>
+  <string name="btn_okay">אישור</string>
+  <string name="btn_cancel">ביטול</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">פרטים מסוימים של Orbot </string>
+  <string name="wizard_details_msg">Orbot היא אפליקציית קוד פתוח הכוללת את Tor, LibEvent ו-Polipo. היא מתחבר לרשת Tor באמצעות שרת פרוקסי HTTP מקומי (8118) ושרת פרוקסי SOCKS (פורט 9050). Orbot יכולה בנוסף עם הרשאות רוט לנתב את כל תעבורת האינטרנט של המכשיר דרך Tor כברירת מחדל.</string>
+  <string name="wizard_permissions_root">ניתנה הרשאה</string>
+  <string name="wizard_permissions_stock">הרשאות Orbot</string>
+  <string name="wizard_premissions_msg_root">מצוין! גילינו כי יש לך הרשאות שורש מאופשרות בשביל Orbot. אנחנו נשתמש בכוח הזה בחוכמה.</string>
+  <string name="wizard_permissions_msg_stock">בזמן שזה לא נדרש, Orbot יכולה להפוך להיות כלי חזק יותר אם למכשיר שלך יש גישה עליונה. תשתמש בכפתור למטה כדי לקבל כוחות על של Orbot !</string>
+  <string name="wizard_permissions_no_root">אם אין לך גישה עליונה או אין לך מושג על מה אנחנו מדברים, רק תוודא שתשתמש באפליקציות שנועדו לעבוד עם Orbot.</string>
+  <string name="wizard_permissions_consent">הבנתי ואני מעדיף להמשיך בלי Superuser</string>
+  <string name="wizard_permission_enable_root">אפשר גישת שורש עבור Orbot</string>
+  <string name="wizard_configure">הגדר עבודה באמצעות Tor</string>
+  <string name="wizard_configure_msg">Orbot נותנת לך אפשרות לכוון את כל תעבורת האפליקציות דרך Tor או לבחור את האפליקציות שלך בנפרד.</string>
+  <string name="wizard_configure_all">השתמש בפרוקסי בכל האפליקציות דרך Tor</string>
+  <string name="wizard_configure_select_apps">בחר אפליקציות מסוימות עבור Tor</string>
+  <string name="wizard_tips_tricks">Orbot מתאפשר על ידי אפליקציות</string>
+  <string name="wizard_tips_msg">האפליקציות מתחת פותחו לעבודה עם Orbot. לחץ על כל כפתור להתקנה מיידית, או שאתה יכול למצוא אותם אחר כך ב Google Play, באתר GuardianProject.info או
+דרך  F-Droid.org</string>
+  <string name="wizard_tips_otrchat">ChatSecure - תוכנת מסרים מידיים מאובטחת לאנדרואיד</string>
+  <string name="wizard_tips_proxy">הגדרות פרוקסי - למד איך להגדיר אפליקציות לעבוד עם Orbot</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo אפליקציית מנוע חיפוש</string>
+  <string name="wizard_tips_twitter">קבע פרוקסי Twitter למארח \"localhost\" ולפורט 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - מערך שיעורים לעיתונאים על שימוש ב-Tor להגנה על עבודתם.</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_proxy_help_msg">אם אפליקצת האנדרואיד שאתה משתמש תומכת בפרוקסי מבוסס HTTP או SOCKS, תוכל להגדיר אותה לעבוד עם Orbot תחת Tor. \n\n\n ההגדרות הן: שם השרת הוא 127.0.0.1 או \"localhost\". עבור HTTP, הפורט הוא 8118. עבור SOCKS, הפורט הוא 9050. עליך להשתמש בSOCKS4A או SOCKS5 אם אפשר.\n \n\n\n תוכל ללמוד עוד אודות פרוקסי באנדרואיד תחת עמוד השאלות הנפוצות שלנו בכתובת: http://tinyurl.com/proxyandroid </string>
+  <string name="wizard_final">Orbot מוכן!</string>
+  <string name="wizard_final_msg">מיליוני אנשים ברחבי העולם משתמשים בTor מסיבות רבות.\n\n עיתונאים ובלוגרים, פעילי זכויות אדם, שוטרים, חיילים, תאגידים, אזרחי במשטרים מדוגאים וגם אזרחים פשוטים... ועכשיו גם אתה!</string>
+  <string name="wizard_exit_at_first_screen_toast">אנא הגדר את Orbot לפני שתוכל להתחיל להשתמש בה!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">דבר זה יוביל את דפדפן הרשת שלך למוד https://check.torproject.org כדי לראות אם Orbot הוגדרה כראוי וכן כי אתה מחובר לרשת Tor.</string>
+  <string name="pref_hs_group">איחסון שירותים נסתרים</string>
+  <string name="pref_general_group">כללי</string>
+  <string name="pref_start_boot_title">התחל את Orbot בהדלקת המכשיר</string>
+  <string name="pref_start_boot_summary">התחל את Orbot והתחבר לרשת Tor אוטומטית כאשר המכשיר נדלק</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">אזהרה</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">הרשאות</string>
+  <string name="wizard_permissions_root_msg1">אתה יכול להעניק לאפליקציה Orbot גישת \'Superuser\' כדי לאפשר מאפיינים מתקדמים כמו למשל, פרוקסי שקוף.</string>
+  <string name="wizard_permissions_root_msg2">אם אתה לא רוצה לעשות את זה, אנא הקפד להשתמש באפליקציות שיועדו לעבוד עם Orbot</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot-יישומים מופעלים</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: אפליקציית מסרים עם הצפנת Off-the-Record</string>
+  <string name="wizard_tips_play">מצא את כל אפליציות Guardian Project אצל Google Play</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">פרוקסי שקוף</string>
+  <string name="wizard_transproxy_msg">זה מאפשר לאפליקציות שלך לרוץ באופן אוטומטי דרך רשת Tor ללא כל תצורה.</string>
+  <string name="wizard_transproxy_hint">(סמן תיבה זו אם אין לך מושג על מה אנחנו מדברים)</string>
+  <string name="wizard_transproxy_none">כלום</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">מאפשר עבודה עם פרוקסי שקוף עבור רשת אלחוטית ומכשירי  USB Tethered (דורש אתחול מחדש)</string>
+  <string name="button_grant_superuser">דרוש אישור Superuser</string>
+  <string name="pref_select_apps">בחר אפלקציות</string>
+  <string name="pref_select_apps_summary">בחר אפלקציות</string>
+  <string name="pref_node_configuration">הגדרות Node</string>
+  <string name="pref_node_configuration_summary">קיימות הגדרות מתקדמות שיכולות להפחית את האנונימיות שלך</string>
+  <string name="pref_entrance_node">Entrance Nodes</string>
+  <string name="pref_entrance_node_summary">טביעות אצבע, כינויים, ארצות וכתובות עבור המעבר הראשון</string>
+  <string name="pref_entrance_node_dialog">הכנס Entrance Nodes</string>
+  <string name="button_proxy_all">העבר הכל דרך פרוקסי</string>
+  <string name="button_proxy_none">אל תשתמש בפרוקסי</string>
+  <string name="button_invert_selection">הפוך בחירה</string>
+  <string name="pref_proxy_type_title">Outbound Proxy Type</string>
+  <string name="pref_proxy_type_summary">פרוטוקול שימוש בשרת פרוקסי:  HTTP, HTTPS, Socks4,Socks5</string>
+  <string name="pref_proxy_type_dialog">סוג הפרוקסי</string>
+  <string name="pref_proxy_host_title">מארח של Outbound Proxy</string>
+  <string name="pref_proxy_host_summary">שם מארח שרת פרוקסי</string>
+  <string name="pref_proxy_host_dialog">הכנס מארח פרוקסי</string>
+  <string name="pref_proxy_port_title">פורט של Outbound Proxy</string>
+  <string name="pref_proxy_port_summary">פורט שרת פרוקסי</string>
+  <string name="pref_proxy_port_dialog">הכנס פורט של פרוקסי</string>
+  <string name="pref_proxy_username_title">שם משתמש של Outbound Proxy</string>
+  <string name="pref_proxy_username_summary">שם משתמש פרוקסי (רשות)</string>
+  <string name="pref_proxy_username_dialog">הזן שם משתמש פרוקסי</string>
+  <string name="pref_proxy_password_title">סיסמא של Outbound Proxy</string>
+  <string name="pref_proxy_password_summary">סיסמת פרוקסי (רשות)</string>
+  <string name="pref_proxy_password_dialog">הזן סיסמת פרוקסי</string>
+  <string name="status">סטטוס</string>
+  <string name="setting_up_full_transparent_proxying_">הכנה של הפרוקסי השקוף...</string>
+  <string name="setting_up_app_based_transparent_proxying_">הכנה של הפרוקסי השקוף מבוסס אפליקציות...</string>
+  <string name="transparent_proxying_enabled">פרוקסי שקוף מאופשר</string>
+  <string name="transproxy_enabled_for_tethering_">פרוקסי שקוף מאופשר ל Tathering!</string>
+  <string name="warning_error_starting_transparent_proxying_">אזהרה: שגיאה התחילה את הפרוקסי השקוף!</string>
+  <string name="transproxy_rules_cleared">כללי TransProxy טוהרו</string>
+  <string name="couldn_t_start_tor_process_">אין אפשרות להתחיל תהליך Tor:</string>
+  <string name="privoxy_is_running_on_port_">Polipo רץ על פורט:</string>
+  <string name="setting_up_port_based_transparent_proxying_">הכנה של הפרוקסי השקוף מבוסס פורט...</string>
+  <string name="bridge_error">שגיאת גשר</string>
+  <string name="error">שגיאה</string>
+  <string name="exit_nodes">צמתי יציאה</string>
+  <string name="enter_exit_nodes">הזן צמתי יציאה</string>
+  <string name="exclude_nodes">צמתים מוצאים</string>
+  <string name="enter_exclude_nodes">הזן צמתים מוצאים</string>
+  <string name="strict_nodes">צמתים קפדנים</string>
+  <string name="use_only_these_specified_nodes">השתמש *רק* בצמתים מצוינים אלו</string>
+  <string name="bridges">גשרים</string>
+  <string name="use_bridges">השתמש בגשרים</string>
+  <string name="bridges_obfuscated">גשרים מעורפלים</string>
+  <string name="ip_address_and_port_of_bridges">כתובת ה-IP ויציאה של הגשרים</string>
+  <string name="enter_bridge_addresses">הכנס כתובות גשר</string>
+  <string name="relays">ממסרים</string>
+  <string name="relaying">ממסור</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">אפשר למכשיר שלך להיות תחנת ממסר שאיננה יציאה</string>
+  <string name="relay_port">פורט הממסר</string>
+  <string name="listening_port_for_your_tor_relay">פורט מאזין עבור Tor relay</string>
+  <string name="enter_or_port"> הכנס יציאת OR</string>
+  <string name="relay_nickname">כינוי הממסר</string>
+  <string name="the_nickname_for_your_tor_relay">הכינוי לממסר Tor שלך</string>
+  <string name="enter_a_custom_relay_nickname">הזן כינוי עבור ממסר</string>
+  <string name="reachable_addresses">כתובות בהישג יד</string>
+  <string name="reachable_ports">פורטים בהישג יד</string>
+  <string name="enter_ports">הזן פורטים</string>
+  <string name="enable_hidden_services">אחסון שירותים נסתרים</string>
+  <string name="enter_localhost_ports_for_hidden_services">הזן פורטים של localhost עבור שירותים נסתרים</string>
+  <string name="hidden_service_ports">פורט השירותים הנסתרים</string>
+  <string name="project_home">אתרי הפרויקט:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">הרשיון של Tor</string>
+  <string name="https_torproject_org">https://torproject.org/</string>
+  <string name="third_party_software">תוכנה-צד-ג׳: </string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="found_existing_tor_process">נמצא תהליך Tor קיים…</string>
+  <string name="something_bad_happened">משהו רע התרחש. בדוק את היומן</string>
+  <string name="hidden_service_on">שירות נסתר ב:</string>
+  <string name="unable_to_read_hidden_service_name">לא מסוגל לקרוא שם שירות נסתר</string>
+  <string name="unable_to_start_tor">לא מסוגל להתחיל את Tor:</string>
+  <string name="unable_to_reset_tor">אתחל את המכשיר שלך, אין אפשרות להפעיל מחדש את Tor!</string>
+  <string name="pref_use_sys_iptables_title">השתמש בברירות המחדל של iptables</string>
+  <string name="pref_use_persistent_notifications">לשמור תמיד את האיקון בסרגל כלים כשאורבוט מחובר</string>
+  <string name="notification_using_bridges">גשרים מאופשרים!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">שפה</string>
+  <string name="set_locale_summary">בחר את המקומיות והשפה של Orbot</string>
+  <string name="wizard_locale_title">בחר שפה</string>
+  <string name="wizard_locale_msg">השאר ברירת מחדל או החלף לשפה הנוכחית</string>
+  <string name="powered_by">מופעל באמצעות Tor</string>
+  <string name="btn_save_settings">שמירת הגדרות</string>
+  <string name="no_internet_connection_tor">אין חיבור לאינטרנט; תור ממתין...</string>
+  <string name="bandwidth_">רוחב פס:</string>
+  <string name="down">מטה</string>
+  <string name="up">מעלה</string>
+  <string name="pref_disable_network_summary">כבה את Tor כאשר אין חיבור לאינטרנט</string>
+  <string name="newnym">החלפת אל זהות Tor חדשה!</string>
+  <string name="menu_use_chatsecure">הפעל את ChatSecure</string>
+  <string name="permission_manage_tor_label">נהל Tor</string>
+  <string name="permission_manage_tor_description">אפשר את אפליקציה זו כדי לשלוט בשירות Tor</string>
+  <string name="install_apps_">להתקין אפליקציה?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">אין חיבור לרשת. מכבה את Tor....</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">החיבור עובד טוב. מעיר את Tor...</string>
+  <string name="updating_settings_in_tor_service">מעדכן הגדרות Tor במכשיר</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_dialog">הגדרות SOCKS Port </string>
+  <string name="pref_transport_title">Tor TransProxy Port</string>
+  <string name="pref_transport_dialog">הגדרת הפורט של TransProxy</string>
+  <string name="pref_dnsport_title">Tor DNS Port</string>
+  <string name="your_tor_public_ips_">הIPs החיצוניים שלך עם Tor:</string>
+  <string name="you_do_not_have_root_access_enabled">אין לך גישת רוט מאופשרת</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">תצטרך לכבות ולהפעיל את Orbot על מנת להחיל את השינוי בהגדרות.</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="menu_qr">קוד QR</string>
+  <string name="get_bridges_email">דוא\"ל</string>
+  <string name="get_bridges_web">אתר</string>
+  <string name="activate">הפעל</string>
+  <string name="send_email">שלח דוא\"ל</string>
+  <string name="standard_browser">דפדפן רגיל</string>
+</resources>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
new file mode 100644
index 0000000..9156dfa
--- /dev/null
+++ b/app/src/main/res/values-hi/strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">औरबौट एक मुफ्त अैप</string>
+  <string name="menu_browse">ब्राउज़</string>
+  <string name="menu_settings">सेटिंग्स</string>
+  <string name="menu_info">मदद</string>
+  <string name="button_help">मदद</string>
+  <string name="button_close">बंद  करें </string>
+  <string name="wizard_title">Orbot</string>
+  <string name="btn_back">वापस</string>
+  <string name="btn_cancel">रद्द करें </string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">प्रोक्सी सेटींग</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">समन्य </string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">कोई नहीं</string>
+  <string name="status">स्थिति</string>
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
new file mode 100644
index 0000000..717ae74
--- /dev/null
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_home">Polazno</string>
+  <string name="menu_browse">Pretraži</string>
+  <string name="menu_settings">Postavke</string>
+  <string name="menu_info">Pomoć</string>
+  <string name="menu_about">O</string>
+  <string name="button_help">Pomoć</string>
+  <string name="button_close">Zatvori</string>
+  <string name="button_about">O</string>
+  <string name="menu_exit">Izlaz</string>
+  <string name="btn_back">Povratak</string>
+  <string name="btn_cancel">Odustani</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Postavke Proxya</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Općenito</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Upozorenje</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">Nepoznato</string>
+  <string name="status">Status</string>
+  <string name="error">Greška</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Spremi postavke</string>
+</resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
new file mode 100644
index 0000000..19ddf3e
--- /dev/null
+++ b/app/src/main/res/values-hr/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot je besplatna proxy aplikacija koja omogućuje ostalim aplikacijama da koriste internet sigurnije. Orbot koristi Tor za enkripciju Vašeg Internet prometa, a zatim ga skriva šaljući ga kroz seriju računala diljem svijeta. Tor je besplatan software i otvorena mreža koja pomaže u borbi protiv nadzora mreže koji ugrožava osobne slobode i privatnost, povjerljive poslovne aktivnosti i odnose, te pomaže u borbi protiv analize prometa.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">pokreni i zaustavi Tor</string>
+  <string name="tor_proxy_service_process">torproxyusluga</string>
+  <string name="status_starting_up">Orbot se pokreće...</string>
+  <string name="status_activated">Spojen na Tor mrežu</string>
+  <string name="status_disabled">Orbot je deaktiviran</string>
+  <string name="status_shutting_down">TorService se gasi</string>
+  <string name="tor_process_starting">Pokrećem Tor klijent...</string>
+  <string name="tor_process_complete">gotovo.</string>
+  <string name="tor_process_waiting">čekam.</string>
+  <string name="not_anonymous_yet">UPOZORENJE: Vaš promet još nije anoniman! Molimo konfigurirajte Vaše aplikacije da koriste HTTP proxy 127.0.0.1:8118 ili SOCKS4A ili SOCKS5 proxy 127.0.0.1:9050</string>
+  <string name="menu_home">Polazno</string>
+  <string name="menu_browse">Pretraži</string>
+  <string name="menu_settings">Postavke</string>
+  <string name="menu_log">Dnevnik</string>
+  <string name="menu_info">Pomoć</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Početak</string>
+  <string name="menu_stop">Zaustavi</string>
+  <string name="menu_about">O</string>
+  <string name="menu_promo_apps">Dohvati aplikacije...</string>
+  <string name="main_layout_download">Preuzimanje</string>
+  <string name="main_layout_upload">Slanje</string>
+  <string name="button_help">Pomoć</string>
+  <string name="button_close">Zatvori</string>
+  <string name="button_about">O</string>
+  <string name="button_clear_log">Očisti Dnevnik</string>
+  <string name="menu_verify">Provjeri</string>
+  <string name="menu_exit">Izlaz</string>
+  <string name="menu_scan">Skeniraj BridgeQR</string>
+  <string name="menu_share_bridge">Podijeli BridgeQR</string>
+  <string name="press_to_start">- dugi klik za početak -</string>
+  <string name="pref_trans_proxy_group">Transparentni Proxy (Zahtijeva Root)</string>
+  <string name="pref_trans_proxy_title">Transparentni Proxy</string>
+  <string name="pref_trans_proxy_summary">Automatska Torifikacija Aplikacija</string>
+  <string name="pref_transparent_all_title">Tor Sve</string>
+  <string name="pref_transparent_all_summary">Proxy promet svih aplikacija kroz Tor</string>
+  <string name="pref_transparent_port_fallback_title">Port Proxy Rezerva</string>
+  <string name="pref_transparent_port_fallback_summary">UPOZORENJE: Zaobilazi uobičajene portove (80, 443, itd.) *KORISTITE SAMO* ako \'Sve\' ili \'Aplikacije\' mod ne radi.</string>
+  <string name="pref_transparent_port_title">Popis portova</string>
+  <string name="pref_transparent_port_summary">Popis portova za proxy. *KORISTITE SAMO* ako \'Sve\' ili \'Aplikacije\' mod ne radi</string>
+  <string name="pref_transparent_port_dialog">Unesite port za proxy</string>
+  <string name="pref_has_root">Zatraži Root Pristup</string>
+  <string name="pref_has_root_summary">Zatraži root pristup za transparentni proxy</string>
+  <string name="status_install_success">Tor izvršne datoteke uspješno instalirane!</string>
+  <string name="status_install_fail">Tor izvršne datoteke nije bilo moguće instalirati. Molimo provjerite dnevnik i obavijestite tor-assistans at torproject.org</string>
+  <string name="title_error">Greška u Aplikaciji</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">O Orbot-u</string>
+  <string name="btn_next">Sljedeće</string>
+  <string name="btn_back">Natrag</string>
+  <string name="btn_finish">Završi</string>
+  <string name="btn_okay">U redu</string>
+  <string name="btn_cancel">Odustani</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Detalji o Orbot-u</string>
+  <string name="wizard_details_msg">Orbot je otvorena aplikacija koja sadrži Tor, LibEvent i Polipo. Pruža lokalni HTTP proxy (8118) i SOCKS proxy (9050) u Tor mrežu. Orbot ima mogućnost, na root-anom uređaju, slati sav promet kroz Tor.</string>
+  <string name="wizard_permissions_root">Dopuštenje Odobreno</string>
+  <string name="wizard_permissions_stock">Orbot Dopuštenja</string>
+  <string name="wizard_premissions_msg_root">Odlično! Uočili smo da imate root dopuštenja omogućena za Orbot. Koristit ćemo ovu moć mudro.</string>
+  <string name="wizard_permissions_msg_stock">Iako nije neophodan, Orbot može postati moćan alat ako vaš uređaj ima root pristup. Koristite gumb niže da bi odobrili Orbot-u supermoći!</string>
+  <string name="wizard_permissions_no_root">Ako nemate root pristup ili nemate pojma o čemu pričamo, osigurajte da koristite aplikacije koje rade s Orbot-om.</string>
+  <string name="wizard_permissions_consent">Razumijem i želim nastaviti bez Superuser-a</string>
+  <string name="wizard_permission_enable_root">Odobri Root za Orbot</string>
+  <string name="wizard_configure">Konfiguriraj Torifikaciju</string>
+  <string name="wizard_configure_msg">Orbot Vam daje opciju da usmjerite sav aplikacijski promet kroz Tor ILI odaberete aplikacije individualno.</string>
+  <string name="wizard_configure_all">Proxy Sve Aplikacije Kroz Tor</string>
+  <string name="wizard_configure_select_apps">Odaberi Individualne Aplikacije za Tor</string>
+  <string name="wizard_tips_tricks">Orbot-omogućene Aplikacije</string>
+  <string name="wizard_tips_msg">Aplikacije dolje su napravljene da rade sa Orbot-om. Kliknite svaki gumb da instalirate odmah ili ih kasnije možete naći na Google Play-u, na GuardianProject.info web stranici ili preko F-Droid.org.</string>
+  <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="wizard_tips_twitter">Namjesti Twitter proxy na host \"localhost\" i port 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - napravite priču i prepustite sigurnost Tor-u!</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>
+  <string name="wizard_proxy_help_msg">Ako Android aplikacija koju koristite podržava korištenje HTTP ili SOCKS proxy-a, možete ju konfigurirati da se spaja na Orbot i koristi Tor.\n\n\n Postavke su 127.0.0.1 ili \"localhost\". Za HTTP postavke porta su 8118. Za SOCKS, proxy je 9050. Trebali bi koristiti SOCKS4A ili SOCKS5 ako je moguće.\n\n\n Možete naučiti više o proxy-ranju na Androidu putem često postavljenih pitanja: http://tinyurl.com/proxyandroid</string>
+  <string name="wizard_final">Orbot je spreman!</string>
+  <string name="wizard_final_msg">Milijuni ljudi diljem svijeta koriste Tor iz raznih razloga.\n\nNovinari i blogeri, pravobranitelji, policijski službenici, vojnici, korporacije, građani represivnih režima i uobičajeni građani... a od sad i Vi!</string>
+  <string name="wizard_exit_at_first_screen_toast">Molimo konfigurirajte Orbot prije nego ga počnete koristiti!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Uspješno ste spojeni na Tor mrežu - ali ovo NE znači da je Vaš uređaj siguran. Možete koristiti gumb \'Preglednik\' kako bi testirali svoju vezu. \n\nPosjetite nas na https://guardianproject.info/apps/orbot ili nam pošaljite email na help at guardianproject.info kako bi naučili više.</string>
+  <string name="tor_check">Ovo će otvoriti Vaš web preglednik na https://check.torproject.org kako bi vidjeli je li Orbot konfiguriran i jeste li povezani na Tor.</string>
+  <string name="pref_hs_group">Hosting Skrivenih Usluga</string>
+  <string name="pref_general_group">Općenito</string>
+  <string name="pref_start_boot_title">Pokreni Orbot pri pokretanju</string>
+  <string name="pref_start_boot_summary">Automatski pokreni Orbot i poveži Tor kad se Android uređaj pokrene</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot donosi Tor na Android!\n\nTor pomaže u borbi protiv filtriranja prometa, analize prometa i nadzora mreže koji ugrožava privatnost, povjerljive informacije i osobne veze.\n\nOvaj čarobnjak će Vam pomoći u konfiguraciji Orbot-a i Tor-a na Vašem uređaju.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Upozorenje</string>
+  <string name="wizard_warning_msg">Samo instaliranje Orbot-a neće automatski anonimizirati Vaš mobilni promet.\n\nMorate ispravno konfigurirati Orbot, svoj uređaj i ostale aplikacije da uspješno koriste Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Dopuštenja</string>
+  <string name="wizard_permissions_root_msg1">Opcionalno, možete odobriti Orbot-u \'Superuser\' pristup da bi omogućili napredne značajke, kao što je Transparentni Proxy.</string>
+  <string name="wizard_permissions_root_msg2">Ako ne želite ovo, budite sigurni da koristite aplikacije koje su napravljene da rade s Orbotom</string>
+  <string name="wizard_permissions_no_root_msg">Čini se da Vaš uređaj nije root-an.\n\nMolimo probajte \'Aplikacije\' način rada na glavnom ekranu.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox: Preglednik s pojačanom privatnosti koji radi kroz Tor</string>
+  <string name="wizard_tips_play">Pronađi sve Guardian Projekt aplikacije na Google Play</string>
+  <string name="wizard_tips_fdroid">Pronađi sve Guardian Project aplikacije na F-Droid-u</string>
+  <string name="wizard_tips_fdroid_org">Pronađi sve Guardian Project aplikacije na https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparentni Proxy</string>
+  <string name="wizard_transproxy_msg">Ovo omogućava Vašim aplikacijama da automatski rade kroz Tor mrežu bez ikakve konfiguracije.</string>
+  <string name="wizard_transproxy_hint">(Stavite kvačicu ako nemate pojma o čemu pričamo)</string>
+  <string name="wizard_transproxy_none">Ništa</string>
+  <string name="pref_transparent_tethering_title">Tor Privezanje</string>
+  <string name="pref_transparent_tethering_summary">Omogući Tor Transparentni Proxy za Wifi i USB privezane uređaje (zahtijeva ponovno pokretanje)</string>
+  <string name="button_grant_superuser">Zatraži Pristup Superuser-u</string>
+  <string name="pref_select_apps">Odaberi Aplikacije</string>
+  <string name="pref_select_apps_summary">Odaberi Aplikacije koje će se usmjeriti kroz Tor</string>
+  <string name="pref_node_configuration">Konfiguracija Čvora</string>
+  <string name="pref_node_configuration_summary">Ovo su napredne postavke koje mogu smanjiti Vašu anonimnost</string>
+  <string name="pref_entrance_node">Ulazni Čvorovi</string>
+  <string name="pref_entrance_node_summary">Otisci prstiju, nadimci, države i adrese za prvi skok</string>
+  <string name="pref_entrance_node_dialog">Unesi Ulazne Čvorove</string>
+  <string name="pref_allow_background_starts_title">Dozvoli pokretanja u pozadini</string>
+  <string name="pref_allow_background_starts_summary">Dopusti bilo kojoj aplikaciji da kaže Orbot-u da pokrene Tor i povezane usluge</string>
+  <string name="button_proxy_all">Proxy-raj sve</string>
+  <string name="button_proxy_none">Ne proxy-raj ništa</string>
+  <string name="button_invert_selection">Izokreni odabrano</string>
+  <string name="pref_proxy_title">Izlazni Mrežni Proxy (Opcionalno)</string>
+  <string name="pref_proxy_type_title">Vrsta Izlaznog Proxy-a</string>
+  <string name="pref_proxy_type_summary">Protokol koji se koristi za proxy server: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Unesi Tip Proxyj-a</string>
+  <string name="pref_proxy_host_title">Domaćin Izlaznog Proxy-a</string>
+  <string name="pref_proxy_host_summary">Ime domaćina Proxy Poslužitelja</string>
+  <string name="pref_proxy_host_dialog">Unesi Domaćina Proxy-a</string>
+  <string name="pref_proxy_port_title">Port Izlaznog Proxy-a</string>
+  <string name="pref_proxy_port_summary">Port Proxy Poslužitelja</string>
+  <string name="pref_proxy_port_dialog">Unesite port za proxy.</string>
+  <string name="pref_proxy_username_title">Proxy izlazno korisničko ime</string>
+  <string name="pref_proxy_username_summary">Proxy korisničko ime (Opcionalno)</string>
+  <string name="pref_proxy_username_dialog">Unesite Proxy korisničko ime</string>
+  <string name="pref_proxy_password_title">Proxy izlazna lozinka</string>
+  <string name="pref_proxy_password_summary">Proxy lozinka (Opcionalno)</string>
+  <string name="pref_proxy_password_dialog">Unesite Proxy lozinku</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Postavljam potpuno transparentan proxy...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Postavljam transparentan proxy zasnovan na aplikaciji...</string>
+  <string name="transparent_proxying_enabled">Transparentni Proxy OMOGUĆENO</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy omogućen za Privezivanje!</string>
+  <string name="warning_error_starting_transparent_proxying_">UPOZORENJE: greška pri pokretanju transparentnog proxy-a!</string>
+  <string name="transproxy_rules_cleared">TransProxy pravila očišćena</string>
+  <string name="couldn_t_start_tor_process_">Nije moguće započeti Tor proces:</string>
+  <string name="privoxy_is_running_on_port_">Polipo je pokrenut na portu:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Postavljam transparentan proxy zasnovan na portu...</string>
+  <string name="bridge_error">Greška Mosta</string>
+  <string name="bridge_requires_ip">Da bi koristili mostove, morate unijeti bar jednu IP adresu mosta.</string>
+  <string name="send_email_for_bridges">Pošaljite email koristeći gmail račun na bridges at torproject.org samo s tekstom \"get bridges\" u sadržaju.</string>
+  <string name="error">Greška</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Vaše ReachableAddresses postavke su uzrokovale iznimku!</string>
+  <string name="your_relay_settings_caused_an_exception_">Vaše postavke releja su uzrokovale iznimku!</string>
+  <string name="exit_nodes">Izlazni Čvorovi</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Otisci prstiju, nadimci, države i adrese za zadnji skok</string>
+  <string name="enter_exit_nodes">Unesi Izlazne Čvorove</string>
+  <string name="exclude_nodes">Nemoj Uključiti Čvorove</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Otisci prstiju, nadimci, države i adrese koje ne treba uključiti</string>
+  <string name="enter_exclude_nodes">Unesi Čvorove koje treba isključiti</string>
+  <string name="strict_nodes">Striktni Čvorovi</string>
+  <string name="use_only_these_specified_nodes">Koristi *samo* ove navedene čvorove</string>
+  <string name="bridges">Mostovi</string>
+  <string name="use_bridges">Koristi Mostove</string>
+  <string name="bridges_obfuscated">Skriveni Mostovi</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Omogući naizmjenične ulazne čvorove u Tor Mrežu</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Omogućite ako su postavljeni mostovi skriveni mostovi</string>
+  <string name="ip_address_and_port_of_bridges">IP adresa i port mostova</string>
+  <string name="enter_bridge_addresses">Unesi Adrese Mostova</string>
+  <string name="relays">Releji</string>
+  <string name="relaying">Prenošenje</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Omogućite svom uređaju da bude ne-izlazni relej</string>
+  <string name="relay_port">Relej Port</string>
+  <string name="listening_port_for_your_tor_relay">Port za slušanje Vašeg Tor releja</string>
+  <string name="enter_or_port">Unesi OR port</string>
+  <string name="relay_nickname">Nadimak releja</string>
+  <string name="the_nickname_for_your_tor_relay">Nadimak za Vaš Tor relej</string>
+  <string name="enter_a_custom_relay_nickname">Unesi prilagođeni nadimak releja</string>
+  <string name="reachable_addresses">Dostupne Adrese</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Pokreni kao klijent iza firewall-a sa restriktivnim pravilima</string>
+  <string name="reachable_ports">Dostupni portovi</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Portovi dostupni iza restriktivnog firewall-a</string>
+  <string name="enter_ports">Unesi portove</string>
+  <string name="enable_hidden_services">Hosting Skrivenih Usluga</string>
+  <string name="run_servers_accessible_via_the_tor_network">dopusti poslužitelju na uređaju da bude dostupan preko Tor mreže</string>
+  <string name="enter_localhost_ports_for_hidden_services">unesi localhost portove za skrivene usluge</string>
+  <string name="hidden_service_ports">Portovi za skrivene usluge</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">adresirano ime za vašu skrivenu uslugu (generirano automatski)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">omogući izlaznost dnevnika o otkrivanju greške (mora koristiti adb ili aLogCat za pregled)</string>
+  <string name="project_home">Dom(ovi) Projekta:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor licenca</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Software treće strane:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Aplikacija želi otvoriti port %S skrivenog poslužitelja Tor mreži. Ovo je sigurno ako vjerujete aplikaciji.</string>
+  <string name="found_existing_tor_process">pronađeni postojeći Tor procesi...</string>
+  <string name="something_bad_happened">Nešto loše se dogodilo. Provjerite dnevnik</string>
+  <string name="hidden_service_on">skrivena usluga na:</string>
+  <string name="unable_to_read_hidden_service_name">nije moguće pročitati ime skrivene usluge</string>
+  <string name="unable_to_start_tor">Nije moguće pokrenuti Tor:</string>
+  <string name="unable_to_reset_tor">Ponovno pokrenit svoj uređaj, nije moguće ponovno pkrenuti Tor!</string>
+  <string name="pref_use_sys_iptables_title">Koristi Zadane Iptablice</string>
+  <string name="pref_use_sys_iptables_summary">koristi ugrađene iptablice umjesto onih zapakiranih s Orbot-om</string>
+  <string name="error_installing_binares">Nije bilo moguće instalirati ili nadograditi Tor datoteke .</string>
+  <string name="pref_use_persistent_notifications">Uvjek drži ikonu na alatnoj traci kad je Orbot spojen</string>
+  <string name="pref_use_persistent_notifications_title">Obavijesti o stalnoj pokrenutosti</string>
+  <string name="pref_use_expanded_notifications">Prikaži proširene obavijesti s Tor izlaznom državom i IP-em</string>
+  <string name="pref_use_expanded_notifications_title">Proširene obavijesti</string>
+  <string name="notification_using_bridges">Mostovi omogućeni!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Jezik</string>
+  <string name="set_locale_summary">Odaberi lokaciju i jezik za Orbot</string>
+  <string name="wizard_locale_title">Odaberi Jezik</string>
+  <string name="wizard_locale_msg">Ostavi zadano ili promjeni na trenutni jezik</string>
+  <string name="powered_by">pogoni Tor</string>
+  <string name="btn_save_settings">Spremi postavke</string>
+  <string name="no_internet_connection_tor">Nema internet veze; Tor je u stanju pripravnosti...</string>
+  <string name="bandwidth_">Bandwidth:</string>
+  <string name="down">dolje</string>
+  <string name="up">gore</string>
+  <string name="pref_disable_network_title">Nema mrežnog auto-spavanja</string>
+  <string name="pref_disable_network_summary">Stavi Tor na spavanje kad internet nije dostupan</string>
+  <string name="newnym">Prebacili ste se na nov Tor identitet!</string>
+  <string name="menu_verify_browser">Preglednik</string>
+  <string name="menu_use_chatsecure">Koristi ChatSecure</string>
+  <string name="permission_manage_tor_label">Upravljaj Tor-om</string>
+  <string name="permission_manage_tor_description">Omogući ovoj palikaciji da upravlja Tor-om</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Čini se da nemate Orfox instaliran. Želite li pomoć s tim ili da samo otvorimo preglednik?</string>
+  <string name="install_apps_">Instaliraj aplikacije?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Nema mrežne povezivosti. Stavljam Tor na spavanje...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Mrežan povezanost je dobra. Budim Tor...</string>
+  <string name="updating_settings_in_tor_service">ažuriram postavke u Tor usluzi</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Port na kojem Tor pruža svoj SOCKS proxy (zadano: 9050, 0 za onemogućavanje)</string>
+  <string name="pref_socks_dialog">Konfiguracija SOCKS porta </string>
+  <string name="pref_transport_title">Tor TransProxy Port</string>
+  <string name="pref_transport_summary">Port na kojem Tor pruža Transparentni Proxy (zadano: 9040, 0 za onemogućivanje)</string>
+  <string name="pref_transport_dialog">Konfiguracija TransProxy porta</string>
+  <string name="pref_dnsport_title">Tor DNS Port</string>
+  <string name="pref_dnsport_summary">Port na kojem Tor pruža DNS (zadano 5400, 0 za onemogućivanje)</string>
+  <string name="pref_dnsport_dialog">Postavljanje DNS porta</string>
+  <string name="pref_torrc_title">Torrc prilagođena konfiguracija</string>
+  <string name="pref_torrc_summary">SAMO ZA STRUČNJAKE: unesite direktno torrc konfiguracijske linije</string>
+  <string name="pref_torrc_dialog">Prilagođeni Torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus - Benetech aplikacija za dokumentaciju ljudskih prava</string>
+  <string name="your_tor_public_ips_">Vaši javni Tor IP-evi:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Onemogućite ovu palikaciju u Android->Postavke->Aplikacije ako imate problema s Orbot-om:</string>
+  <string name="app_conflict">Konflikt aplikacija</string>
+  <string name="pref_transproxy_refresh_title">Automatsko osvježavanje Transproxy-a</string>
+  <string name="pref_transproxy_refresh_summary">Ponovno primjeni Transproxy pravila kad se promjeni mrežno stanje</string>
+  <string name="pref_transproxy_flush_title">Transproxy PRISILNO UKLANJANJE</string>
+  <string name="pref_transproxy_flush_summary">Dotaknite ovdje da bi očistili sva transproxy mrežna pravila ODMAH</string>
+  <string name="transparent_proxy_rules_flushed_">Pravila transparentnog proxy-a očišćena!</string>
+  <string name="you_do_not_have_root_access_enabled">Nema omogućen root pristup</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Možda će te morati zaustaviti i pokrenuti Orbot da bi se omogućile promjenjene postavke.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Mostova ažurirano</string>
+  <string name="restart_orbot_to_use_this_bridge_">Ponovno pokrenite Orbot da bi omogućili promjene</string>
+  <string name="menu_qr">QR kodovi</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Ako Vaš mreža aktivno blokira Tor, možete koristiti Most kako bi pristupili mreži. ODABERITE jedan od gorenavedenih tipova mosta kako bi ih omogućili.</string>
+  <string name="bridge_mode">Način rada Most</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Aktiviraj</string>
+  <string name="apps_mode">VPN način rada aplikacija</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Možete omogućiti svim aplikacijama na svom uređaju da se pokreću kroz Tor koristeći VPN značajku Android-a.\n\n*UPOZORENJE* Ovo je nova, eksperimentalna značajka i u nekim slučajevima se možda neće automatski pokrenuti, ili će se zaustaviti. NE bi ju trebalo koristiti za anonimnost, nego SAMO za prolaženje kroz vatrozide i filtere.</string>
+  <string name="send_email">Pošalji email</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Možete dobiti adrese mostova kroz email, web ili skeniranjem QR koda. Odaberite \'Email\' ili \'Web\' niže da zatražite adresu mosta.\n\nJednom kad imate adresu, kopirajte i zalijepite ju u \"Mostovi\" postavku Orbot-a i ponovno ga pokrenite.</string>
+  <string name="install_orweb">Instaliraj Orfox</string>
+  <string name="standard_browser">Standardni preglendik</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NAPOMENA: samo standardni Tor mostovi rade na Intel X86/ATOM uređajima</string>
+  <string name="vpn_default_world">Svijet</string>
+</resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
new file mode 100644
index 0000000..6b4e264
--- /dev/null
+++ b/app/src/main/res/values-hu/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Az Orbot egy ingyenes proxy alkalmazás, ami képessé tesz alkalmazásokat, hogy biztonságosabban használhassák az internetet. Az Orbot Tor-t használ, hogy titkosítsa az internetforgalmadat és elrejtse azáltal, hogy pattogtatja számítógépek sorozatain keresztül a világ körül. A Tor ingyenes szoftver és nyitott hálózat, ami segít megvédeni a hálózati felügyelettől, ami fenyegeti a személyi szabadságot és magánéletet, a bizalmas céges tevékenységeket és kapcsolatokat, és állambiztonság címén a forgalomelemzéstől.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">a Tor indítása, leállítása</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Az Orbot indul...</string>
+  <string name="status_activated">Csatlakozva a Tor hálózathoz</string>
+  <string name="status_disabled">Az Orbot deaktiválva</string>
+  <string name="status_shutting_down">A TorService leáll</string>
+  <string name="tor_process_starting">A Tor kliens indítása...</string>
+  <string name="tor_process_complete">kész.</string>
+  <string name="tor_process_waiting">várakozik.</string>
+  <string name="not_anonymous_yet">FIGYELEM: A forgalmad még nem névtelen! Állítsd be az alkalmazásaidat, hogy HTTP proxyt használjanak a 127.0.0.1:8118 címen vagy SOCKS4A vagy SOCKS5 proxyt a 127.0.0.1:9050 címen</string>
+  <string name="menu_home">Kezdőlap</string>
+  <string name="menu_browse">Böngészés</string>
+  <string name="menu_settings">Beállítások</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Súgó</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Indítás</string>
+  <string name="menu_stop">Leállítás</string>
+  <string name="menu_about">Névjegy</string>
+  <string name="menu_promo_apps">Alkalmazások beszerzése...</string>
+  <string name="main_layout_download">Letöltés</string>
+  <string name="main_layout_upload">Feltöltés</string>
+  <string name="button_help">Súgó</string>
+  <string name="button_close">Bezár</string>
+  <string name="button_about">Névjegy</string>
+  <string name="button_clear_log">Log törlése</string>
+  <string name="menu_verify">Ellenőrzés</string>
+  <string name="menu_exit">Kilépés</string>
+  <string name="menu_scan">BridgeQR szkennelése</string>
+  <string name="menu_share_bridge">BridgeQR megosztása</string>
+  <string name="press_to_start">- hosszú nyomás az indításhoz -</string>
+  <string name="pref_trans_proxy_group">Transzparens Proxyzás (Root szükséges)</string>
+  <string name="pref_trans_proxy_title">Transzparens Proxyzás</string>
+  <string name="pref_trans_proxy_summary">Alkalmazások automatikus Tor-izálása</string>
+  <string name="pref_transparent_all_title">Minden Tor-olása</string>
+  <string name="pref_transparent_all_summary">Minden forgalom átproxyzása a Tor-on</string>
+  <string name="pref_transparent_port_fallback_title">Port Proxy visszacsatolás</string>
+  <string name="pref_transparent_port_fallback_summary">FIGYELEM: Kikerüli a szokásos portokat (80, 443, stb). *CSAK AKKOR HASZNÁLD* ha a \'Minden\' vagy \'Alkalmazás\' mód nem működik.</string>
+  <string name="pref_transparent_port_title">Port Lista</string>
+  <string name="pref_transparent_port_summary">A proxyzandó portok listája. *CSAK AKKOR HASZNÁLD* ha a \'Minden\' vagy \'Alkalmazás\' mód nem működik.</string>
+  <string name="pref_transparent_port_dialog">Add meg a proxyzandó portokat</string>
+  <string name="pref_has_root">Root hozzáférés szükséges</string>
+  <string name="pref_has_root_summary">Root hozzáférés szükséges a transzparens proxyzáshoz</string>
+  <string name="status_install_success">A Tor binárisok sikeresen telepítve lettek!</string>
+  <string name="status_install_fail">A Tor bináris állományok telepítése sikertelen. Ellenőrizd a naplót és értesítsd a tor-assistants at torproject.org -ot</string>
+  <string name="title_error">Alkalmazás hiba</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Az Orbot-ról</string>
+  <string name="btn_next">Tovább</string>
+  <string name="btn_back">Vissza</string>
+  <string name="btn_finish">Befejezés</string>
+  <string name="btn_okay">OK</string>
+  <string name="btn_cancel">Mégsem</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Néhány Orbot adat</string>
+  <string name="wizard_details_msg">Az Orbot egy nyílt-forráskódú alkalmazás, ami tartalmazza a Tor-t, LibEvent-et és Polipo-t. Szolgáltat egy helyi HTTP proxyt (8118) és egy SOCKS proxyt (9050) a Tor hálózatba. Az Orbot-nak megvan az a képessége is, hogy rootolt eszközön minden internetes forgalmat a Tor-on keresztül küldjön.</string>
+  <string name="wizard_permissions_root">Jogosultság megadva</string>
+  <string name="wizard_permissions_stock">Orbot jogosultságok</string>
+  <string name="wizard_premissions_msg_root">Kitűnő! Úgy észleltük, hogy root jogot engedélyeztél az Orbot számára. Ezt az erőt bölcsen fogjuk használni.</string>
+  <string name="wizard_permissions_msg_stock"> Habár nem szükséges, az Orbot sokkal hatékonyabb eszköz lehet, ha a készüléknek van root hozzáférése. Használd az alábbi gombot, hogy szuper-erőt adj az Orbot-nak! </string>
+  <string name="wizard_permissions_no_root">Ha nincs root hozzáférésed, vagy fogalmad sincs, hogy miről beszélünk, csak győződjél meg arról, hogy olyan alkalmazásokat használsz, amelyek együttműködnek az Orbot-tal.</string>
+  <string name="wizard_permissions_consent">Értettem és Superuser nélkül folytatnám tovább</string>
+  <string name="wizard_permission_enable_root">Root jog megadása az Orbot-nak</string>
+  <string name="wizard_configure">Tor-izálás konfigurálása</string>
+  <string name="wizard_configure_msg">Az Orbot lehetővé teszi, hogy az összes alkalmazás forgalmát a Tor-on keresztül küldje VAGY hogy egyénileg kiválaszthasd az alkalmazásaidat.</string>
+  <string name="wizard_configure_all">Minden alkalmazás keresztülproxyzása a Tor-on</string>
+  <string name="wizard_configure_select_apps">Alkalmazások kiválasztása a Tor-hoz</string>
+  <string name="wizard_tips_tricks">Orbot-engedélyezett alkalmazások</string>
+  <string name="wizard_tips_msg">Az alábbi alkalmazások az Orbot-tal való együttműködésre lettek fejlesztve. Kattints minden gombra az azonnali telepítéshez, vagy később megtalálod őket a Google Play-en, a GuardianProject.info weboldalon vagy az F-Droid.org-n.</string>
+  <string name="wizard_tips_otrchat">ChatSecure - Biztonságos azonnali üzenetküldő kliens Androidra</string>
+  <string name="wizard_tips_proxy">Proxy beállítások - Tanuld meg, hogyan állíthatod be az alkalmazásaidat, hogy együttműködjenek az Orbot-tal</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo keresőmotor alkalmazás</string>
+  <string name="wizard_tips_twitter"> Állítsd be a Twitter proxyt a hosztnál \"localhost\"-ra és a port-nál 8118-ra</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Készíts egy történetet és hagyd a Tor-ra a biztonságért!</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_proxy_help_msg">Ha az Android alkalmazás, amit használsz támogatja a HTTP vagy SOCKS proxy használatát, akkor konfigurálhatod, hogy csatlakozzon az Orbot-hoz és Tor-t használjon.\n\n\n A hoszt beállítások 127.0.0.1 vagy \"localhost\". HTTP-nek a port beállítása 8118. A SOCKS-nak a proxyja 9050. SOCKS4A -t vagy SOCKS5 -t kéne használnod, ha lehetséges.\n \n\n\n Többet tudhatsz meg a proxyzásról Androidon a GYIK-en keresztül itt: http://tinyurl.com/proxyandroid</string>
+  <string name="wizard_final">Az Orbot kész!</string>
+  <string name="wizard_final_msg">Emberek milliói használják a világ körül a Tor-t többféle különböző okból.\n\nÚjságírók és bloggerek, emberi jogok védelmezői, rendőrök, katonák, cégek, elnyomó rezsimek polgárai, és csak átlagos polgárok... és most már te is készen állsz!</string>
+  <string name="wizard_exit_at_first_screen_toast">Kérlek konfiguráld az Orbot-ot, mielőtt elkezded használni!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Sikeresen csatlakoztál a Tor hálózathoz - de ez NEM jelenti azt, hogy a készüléked biztonságos. Használhatod a \'Böngésző\' gombot a kapcsolatod teszteléséhez. \n\nLátogass meg minket a https://guardianproject.info/apps/orbot -on vagy küldj egy emailt a help at guardianproject.info -ra, hogy többet megtudj.</string>
+  <string name="tor_check">Ez megnyitja a webböngésződben a https://check.torproject.org -t ahhoz, hogy lásd, az Orbot valószínűleg konfigurált és csatlakozva vagy a Tor-hoz.</string>
+  <string name="pref_hs_group">Rejtett szolgáltatás kiszolgálás</string>
+  <string name="pref_general_group">Általános</string>
+  <string name="pref_start_boot_title">Az Orbot indítása rendszerindításkor</string>
+  <string name="pref_start_boot_summary">Automatikusan elindítja az Orbot-ot és csatlakozik a hálózathoz, amikor az Android eszköz betölt</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Az Orbot elhozza a Tor-t Androidra!\n\nA Tor segít megvédeni téged a tartalomszűréstől, forgalomelemzéstől és hálózati felügyelettől ami fenyegeti a magánéletet, bizalmas információt és személyes kapcsolatokat.\n\nEz a varázsló segít konfigurálni az Orbot-ot és Tor-t az eszközödön.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Figyelem</string>
+  <string name="wizard_warning_msg">Az Orbot egyszerű telepítésével nem fogja automatikusan névtelenné tenni a mobilforgalmadat.\n\nMegfelelően kell konfigurálnod az Orbot-ot, az eszközödet és egyéb alkalmazásokat ahhoz, hogy sikeresen használják a Tor-t.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Jogosultságok</string>
+  <string name="wizard_permissions_root_msg1">Opcionálisan adhatsz az Orbot részére \'Superuser\' hozzáférést, hogy engedélyezz olyan speciális szolgáltatásokat, mint például a Transzparens Proxyzás.</string>
+  <string name="wizard_permissions_root_msg2">Ha nem akarod ezt tenni, kérlek bizonyosodj meg róla, hogy olyan alkalmazásokat használsz, amelyek együttműködnek az Orbot-tal</string>
+  <string name="wizard_permissions_no_root_msg">Az eszközöd nem tűnik rootoltnak vagy nem ad root vagy \'Superuser\' hozzáférést.\n\nKérlek próbáld az \'Appok\' módot a főképernyőn ehelyett.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot-engedélyezett Alkalmazások</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: Biztonságos üzenetküldő alkalmazás OTR titkosítással</string>
+  <string name="wizard_tips_orweb">Orfox: Fokozott adatvédelmi böngésző, ami Tor-on keresztül működik</string>
+  <string name="wizard_tips_play">Az összes Guardian Project alkalmazás keresése a Google Play-en</string>
+  <string name="wizard_tips_fdroid">Az összes Guardian Project alkalmazást megtalálod az F-Droid -on</string>
+  <string name="wizard_tips_fdroid_org">Az összes Guardian Project alkalmazást megtalálod a https://f-droid.org -on</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Átlátszó Proxyzás</string>
+  <string name="wizard_transproxy_msg">Ez lehetővé teszi az alkalmazások számára a Tor-on keresztül kommunikálást, bármilyen konfiguráció nélkül.</string>
+  <string name="wizard_transproxy_hint">(Jelöld be ezt négyzetet, ha fogalmad sincs arról, hogy miről beszélünk)</string>
+  <string name="wizard_transproxy_none">Nincs</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">A Tor Transzparens Proxyzásának engedélyezése a Wifi és az USB Tetherelt eszközök felé (újraindítást igényel)</string>
+  <string name="button_grant_superuser">Superuser hozzáférés kérése</string>
+  <string name="pref_select_apps">Alkalmazások kiválasztása</string>
+  <string name="pref_select_apps_summary">Válassz alkalmazásokat, amik keresztül haladjanak a Tor-on</string>
+  <string name="pref_node_configuration">Csomópont konfiguráció</string>
+  <string name="pref_node_configuration_summary">Ezek haladó beállítások, amelyek csökkenthetik a névtelenséged.</string>
+  <string name="pref_entrance_node">Belépő csomópontok</string>
+  <string name="pref_entrance_node_summary">Ujjlenyomatok, becenevek, országok és címek az első ugráshoz</string>
+  <string name="pref_entrance_node_dialog">Belépő csomópontok megadása</string>
+  <string name="pref_allow_background_starts_title">Háttérbeli indulások engedélyezése</string>
+  <string name="pref_allow_background_starts_summary">Bármely alkalmazás közölheti az Orbot-tal, hogy indítsa a Tor-t és a kapcsolódó szolgáltatásokat</string>
+  <string name="button_proxy_all">Mindent proxyz</string>
+  <string name="button_proxy_none">Semmit nem proxyz</string>
+  <string name="button_invert_selection">Kijelölés megfordítása</string>
+  <string name="pref_proxy_title">Kimenő hálózati proxy (választható)</string>
+  <string name="pref_proxy_type_title">Proxy típus</string>
+  <string name="pref_proxy_type_summary">A Proxy szerver által használandó protokoll: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Add meg a proxy típusát</string>
+  <string name="pref_proxy_host_title">Kimenő proxy hoszt</string>
+  <string name="pref_proxy_host_summary">Proxy szerver állomásneve</string>
+  <string name="pref_proxy_host_dialog">Add meg a proxy hosztot</string>
+  <string name="pref_proxy_port_title">Proxy port</string>
+  <string name="pref_proxy_port_summary">Proxy szerver port</string>
+  <string name="pref_proxy_port_dialog">Add meg a proxy portját</string>
+  <string name="pref_proxy_username_title">Kimenő proxy felhasználónév</string>
+  <string name="pref_proxy_username_summary">Proxy felhasználónév (választható)</string>
+  <string name="pref_proxy_username_dialog">Add meg a proxy felhasználónevet</string>
+  <string name="pref_proxy_password_title">Kimenő proxy jelszó</string>
+  <string name="pref_proxy_password_summary">Proxy jelszó (választható)</string>
+  <string name="pref_proxy_password_dialog">Add meg a proxy jelszót</string>
+  <string name="status">Állapot</string>
+  <string name="setting_up_full_transparent_proxying_">A teljes körű transzparens proxyzás beállítása...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Alkalmazásalapú transzparens proxyzás beállítása...</string>
+  <string name="transparent_proxying_enabled">Transzparens proxyzás ENGEDÉLYEZVE</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy engedélyezve tetheringre!</string>
+  <string name="warning_error_starting_transparent_proxying_">FIGYELMEZTETÉS: hiba a transzparens proxyzás indításakor!</string>
+  <string name="transproxy_rules_cleared">TransProxy szabályok törölve</string>
+  <string name="couldn_t_start_tor_process_">Nem indítható el a Tor folyamat:</string>
+  <string name="privoxy_is_running_on_port_">A Polipo ezen a porton fut:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Port alapú transzparens proxyzás beállítása...</string>
+  <string name="bridge_error">Híd hiba</string>
+  <string name="bridge_requires_ip">A híd szolgáltatás használatához legalább egy híd IP címét meg kell adnod.</string>
+  <string name="send_email_for_bridges">Küldj egy emailt a bridges at torproject.org -ra a \"get bridges\" sorral a levél törzsében egy gmail fiókból.</string>
+  <string name="error">Hiba</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Az elérhető címeid beállításai kivételt okoztak!</string>
+  <string name="your_relay_settings_caused_an_exception_">Az átjátszód beállításai kivételt okoztak!</string>
+  <string name="exit_nodes">Kilépési csomópontok</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Ujjlenyomatok, becenevek, országok és címek az utolsó ugráshoz</string>
+  <string name="enter_exit_nodes">Kilépési csomópontok megadása</string>
+  <string name="exclude_nodes">Csomópontok kizárása</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Kizárandó ujjlenyomatok, becenevek, országok és címek</string>
+  <string name="enter_exclude_nodes">Add meg a kizárandó csomópontokat</string>
+  <string name="strict_nodes">Szigorú csomópontok</string>
+  <string name="use_only_these_specified_nodes">*Csak* ezeknek a megadott csomópontoknak a használata</string>
+  <string name="bridges">Hidak</string>
+  <string name="use_bridges">Hidak használata</string>
+  <string name="bridges_obfuscated">Fedőhidak</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Alternatív belépési pontok engedélyezése a Tor hálózatba</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Bekapcsolva, ha a konfigurált hidak fedőhidak</string>
+  <string name="ip_address_and_port_of_bridges">A hidak IP címe és portja</string>
+  <string name="enter_bridge_addresses">Add meg a híd címeit</string>
+  <string name="relays">Átjátszók</string>
+  <string name="relaying">Átjátszás</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Engedélyezd az eszközödnek, hogy nem-átjátszó elosztó legyen</string>
+  <string name="relay_port">Átjátszó port</string>
+  <string name="listening_port_for_your_tor_relay">Hallgató port a Tor átjátszódnak</string>
+  <string name="enter_or_port">Enter VAGY port</string>
+  <string name="relay_nickname">Átjátszó becenév</string>
+  <string name="the_nickname_for_your_tor_relay">A Tor átjátszód beceneve</string>
+  <string name="enter_a_custom_relay_nickname">Adj meg egy egyedi átjátszó becenevet</string>
+  <string name="reachable_addresses">Elérhető címek</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Futtatás kliensként egy tűzfal mögül, korlátozó rendelkezésekkel</string>
+  <string name="reachable_ports">Elérhető portok</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">A tűzfal mögött elérhető portok</string>
+  <string name="enter_ports">Add meg a portokat</string>
+  <string name="enable_hidden_services">Rejtett szolgáltatás kiszolgálás</string>
+  <string name="run_servers_accessible_via_the_tor_network">a készülék szerver elérhetőségének engedélyezése a Tor hálózaton keresztül</string>
+  <string name="enter_localhost_ports_for_hidden_services">add meg a localhost portokat a rejtett szolgáltatásokhoz</string>
+  <string name="hidden_service_ports">Rejtett szolgáltatás portok</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">a címezhető neve a rejtett szolgáltatásaidnak (automatikusan generált)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">a hibakeresési napló engedélyezése a kimenetre (adb -t vagy aLogCat -t kell használni a megtekintéshez)</string>
+  <string name="project_home">Projekt honlap(ok):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">A Tor Licenc</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3. fél szoftver:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Egy alkalmazás a %S rejtett szerver portot akarja megnyitni a Tor hálózathoz. Ez biztonságos, ha megbízol az alkalmazásban.</string>
+  <string name="found_existing_tor_process">létező Tor folyamat találva...</string>
+  <string name="something_bad_happened">Valami rossz történt. Nézd meg a naplót.</string>
+  <string name="hidden_service_on">rejtett szolgáltatás itt:</string>
+  <string name="unable_to_read_hidden_service_name">nem olvasható a rejtett szolgáltatás neve</string>
+  <string name="unable_to_start_tor">A Tor indítása sikertelen:</string>
+  <string name="unable_to_reset_tor">Indítsd újra a készüléked, nem lehet helyreállítani a Tor-t!</string>
+  <string name="pref_use_sys_iptables_title">Alapértelmezett Iptables használata</string>
+  <string name="pref_use_sys_iptables_summary">a beépített iptables bináris használata az Orbot-tal egybecsomagolt helyett</string>
+  <string name="error_installing_binares">A Tor binárisok nem telepíthetőek, vagy frissíthetőek.</string>
+  <string name="pref_use_persistent_notifications">Mindig tartsa az ikont az eszköztáron, ha az Orbot csatlakoztatva van.</string>
+  <string name="pref_use_persistent_notifications_title">Mindig-bekapcsolt értesítések</string>
+  <string name="pref_use_expanded_notifications">Mutassa a bővített értesítést a Tor kilépő országgal és IP-vel</string>
+  <string name="pref_use_expanded_notifications_title">Bővített értesítések</string>
+  <string name="notification_using_bridges">Hidak engedélyezve!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Nyelv</string>
+  <string name="set_locale_summary">Válaszd ki a helyszínt és nyelvet az Orbot-nak</string>
+  <string name="wizard_locale_title">Válassz nyelvet</string>
+  <string name="wizard_locale_msg">Hagyd alapértelmezetten vagy válts az aktuális nyelvre</string>
+  <string name="powered_by">powered by Tor</string>
+  <string name="btn_save_settings">Beállítások mentése</string>
+  <string name="no_internet_connection_tor">Nincs internetkapcsolat; Tor készenlétben...</string>
+  <string name="bandwidth_">Sávszélesség:</string>
+  <string name="down">le</string>
+  <string name="up">fel</string>
+  <string name="pref_disable_network_title">Nincs hálózati auto-alvás</string>
+  <string name="pref_disable_network_summary">A Tor alvó módba helyezése, ha internet nem elérhető</string>
+  <string name="newnym">Új Tor identitásra váltottál!</string>
+  <string name="menu_verify_browser">Böngésző</string>
+  <string name="menu_use_chatsecure">ChatSecure használata</string>
+  <string name="permission_manage_tor_label">Tor kezelése</string>
+  <string name="permission_manage_tor_description">Engedélyezi ennek az alkalmazásnak, hogy a Tor szolgáltatást vezérelje</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Úgy tűnik, hogy neked nincs Orfox telepítve. Kérsz segítséget benne, vagy csak nyissuk meg böngészőt?</string>
+  <string name="install_apps_">Alkalmazások telepítése?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Nincs hálózati kapcsolat. Tor alvó állapotba helyezése...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">A hálózati kapcsolat jó. Tor felébresztése...</string>
+  <string name="updating_settings_in_tor_service">a Tor szolgáltatás beállításainak frissítése</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Port amelyen a Tor a SOCKS proxyt biztosítja (alapértelmezett: 9050 vagy 0 a tiltáshoz)</string>
+  <string name="pref_socks_dialog">SOCKS port konfiguráció</string>
+  <string name="pref_transport_title">Tor TransProxy port</string>
+  <string name="pref_transport_summary">Port, amelyen a Tor a transzparens proxyt ajánl (alapértelmezett: 9040 vagy 0 a tiltáshoz)</string>
+  <string name="pref_transport_dialog">TransProxy port konfiguráció</string>
+  <string name="pref_dnsport_title">Tor DNS port</string>
+  <string name="pref_dnsport_summary">Port, amelyen a Tor a saját DNS-t ajánlja (alapértelmezett: 5400 vagy 0 a letiltáshoz)</string>
+  <string name="pref_dnsport_dialog">DNS port konfiguráció</string>
+  <string name="pref_torrc_title">Torrc egyedi konfiguráció</string>
+  <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 emberi jogok dokumentációja alkalmazás</string>
+  <string name="your_tor_public_ips_">A Tor-od publikus IP-jei:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Kérlek tiltsd le ezt az alkalmazást az Android->Beállítások->Alkalmazások-ban, ha az Orbot-tal problémáid vannak: </string>
+  <string name="app_conflict">Alkalmazás ütközés</string>
+  <string name="pref_transproxy_refresh_title">Transproxy auto-frissítés</string>
+  <string name="pref_transproxy_refresh_summary">A Transproxy szabályok újraalkalmazása, ha a hálózati állapot változik</string>
+  <string name="pref_transproxy_flush_title">Transproxy KÉNYSZERÍTETT ELTÁVOLÍTÁSA</string>
+  <string name="pref_transproxy_flush_summary">Érintsd meg itt, az összes transproxy hálózati szabály AZONNALI kiürítéséhez</string>
+  <string name="transparent_proxy_rules_flushed_">Transzparens proxy szabályok kiürítve!</string>
+  <string name="you_do_not_have_root_access_enabled">Nincs ROOT hozzáférésed engedélyezve</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Szükséged lehet az Orbot megállítására és indítására, hogy a beállítások megváltoztatása engedélyezve legyen.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Hidak frissítve</string>
+  <string name="restart_orbot_to_use_this_bridge_">Kérlek indítsd újra az Orbot-ot a változások engedélyezéséhez</string>
+  <string name="menu_qr">QR kódok</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Ha a mobilhálózatod aktívan blokkolja a Tor-t, használhatsz Hidat, hogy hozzáférj a hálózathoz. VÁLASSZ egyet a fenti híd típusokból, hogy engedélyezd a hidakat.</string>
+  <string name="bridge_mode">Híd mód</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Aktiválás</string>
+  <string name="apps_mode">Alkalmazások VPN mód</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Engedélyezhetsz minden alkalmazást, hogy Tor hálózaton keresztül fussanak az Android VPN funkcióját használva.\n\n*FIGYELMEZTETÉS* Ez egy új, kísérleti funkció és néhány esetben nem indulhat automatikusan, vagy leállhat. NEM kéne névtelenségre használni, CSAK a tűzfalakon és szűrőkön való átjutáshoz.</string>
+  <string name="send_email">Email küldése</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Kaphatsz egy híd-címet emailen, weben keresztül vagy a híd QR kódjának beszkennelésével. Válaszd az \'Email\'-t vagy a \'Web\'-et alább a híd-cím kéréséhez.\n\nAmikor már van egy címed, másold & illeszd be \"Hidak\" preferenciákba az Orbot beállításaiban és indítsd újra.</string>
+  <string name="install_orweb">Orweb telepítése</string>
+  <string name="standard_browser">Standard böngésző</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">MEGJEGYZÉS: Csak standard Tor hidak működnek az Intel X86/ATOM eszközökön</string>
+  <string name="vpn_default_world">Világ</string>
+</resources>
diff --git a/app/src/main/res/values-hy-rAM/strings.xml b/app/src/main/res/values-hy-rAM/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/app/src/main/res/values-hy-rAM/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-ia/strings.xml b/app/src/main/res/values-ia/strings.xml
new file mode 100644
index 0000000..db863c6
--- /dev/null
+++ b/app/src/main/res/values-ia/strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_home">Initio</string>
+  <string name="menu_browse">Navigar</string>
+  <string name="menu_settings">Configurationes</string>
+  <string name="menu_info">Adjuta</string>
+  <string name="menu_about">Circa</string>
+  <string name="button_help">Adjuta</string>
+  <string name="button_close">Clauder</string>
+  <string name="button_about">Circa</string>
+  <string name="menu_exit">Sortir</string>
+  <string name="btn_back">Retro</string>
+  <string name="btn_cancel">Cancellar</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Configurationes de proxy:</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">General</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Advertimento</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">Nulle</string>
+  <string name="status">Stato</string>
+  <string name="error">Error</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Salveguardar configurationes</string>
+</resources>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
new file mode 100644
index 0000000..344037a
--- /dev/null
+++ b/app/src/main/res/values-id/strings.xml
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot adalah aplikasi proxy gratis yang membuat aplikasi-aplikasi lainnya dapat terkoneksi dengan internet secara aman. Orbot menggunakan Tor untuk mengenkripsi hubungan internet anda dan menyalurkannya melewati berbagai komputer di seluruh dunia. Tor adalah software gratis dan suatu network terbuka, yang membantu anda menghindari pengawasan network yang mengancam kebebasan pribadi dan privasi, aktivitas bisnis rahasia dan relasi, serta keamanan negara yang dikenal dengan analisa traffic.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">mulai dan akhiri Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot sedang dimulai...</string>
+  <string name="status_activated">Tersambung ke Jaringan Tor</string>
+  <string name="status_disabled">Orbot telah dibatalkan</string>
+  <string name="status_shutting_down">TorService dimatikan</string>
+  <string name="tor_process_starting">Memulai klien Tor...</string>
+  <string name="tor_process_complete">selesai.</string>
+  <string name="tor_process_waiting">menunggu.</string>
+  <string name="not_anonymous_yet">PERINGATAN: Trafik anda belum anonim! Silahkan konfigurasikan aplikasi anda untuk dapat menggunakan proxy HTTP 127.0.0.1:8118 atau SOCKS4A atau proxy SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Beranda</string>
+  <string name="menu_browse">Jelajah</string>
+  <string name="menu_settings">Pengaturan</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Bantuan</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Mulai</string>
+  <string name="menu_stop">Berhenti</string>
+  <string name="menu_about">Tentang</string>
+  <string name="menu_promo_apps">Dapatkan aplikasi...</string>
+  <string name="main_layout_download">Unduh</string>
+  <string name="main_layout_upload">Unggah</string>
+  <string name="button_help">Bantuan</string>
+  <string name="button_close">Tutup</string>
+  <string name="button_about">Tentang</string>
+  <string name="button_clear_log">Hapus Log</string>
+  <string name="menu_verify">Periksa</string>
+  <string name="menu_exit">Keluar</string>
+  <string name="menu_scan">Pindai BridgeQR</string>
+  <string name="menu_share_bridge">Bagikan BridgeQR</string>
+  <string name="press_to_start">- sentuh dan tahan untuk memulai -</string>
+  <string name="pref_trans_proxy_group">Proxy Transparan (Dibutuhkan Root)</string>
+  <string name="pref_trans_proxy_title">Proxy Transparan</string>
+  <string name="pref_trans_proxy_summary">Otomatis Torfying Aplikasi</string>
+  <string name="pref_transparent_all_title">Tor Semuanya</string>
+  <string name="pref_transparent_all_summary">Trafik proxy untuk semua aplikasi melalui Tor</string>
+  <string name="pref_transparent_port_fallback_title">Alternatif Port Proxy</string>
+  <string name="pref_transparent_port_fallback_summary">PERINGATAN: Temukan port umum (80, 443, dll). *Gunakan Hanya* jika \'Semua\' atau \'Aplikasi\' mode tidak bekerja.</string>
+  <string name="pref_transparent_port_title">Daftar Port</string>
+  <string name="pref_transparent_port_summary">Daftar port untuk proxy. *GUNAKAN HANYA* jika modus \'Semua\' atau \'Apl\' tidak bekerja</string>
+  <string name="pref_transparent_port_dialog">Masukkan port untuk proxy</string>
+  <string name="pref_has_root">Minta Akses Root</string>
+  <string name="pref_has_root_summary">Meminta akses root untuk proxy transparan</string>
+  <string name="status_install_success">Binary Tor berhasil dipasang!</string>
+  <string name="status_install_fail">File binary Tor tidak dapat dipasang. Silahkan periksa log dan beritahukan ke tor-assistants at torprojects.org</string>
+  <string name="title_error">Kesalahan Pada Aplikasi</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Tentang Orbot</string>
+  <string name="btn_next">Berikutnya</string>
+  <string name="btn_back">Kembali</string>
+  <string name="btn_finish">Selesai</string>
+  <string name="btn_okay">Oke</string>
+  <string name="btn_cancel">Batal</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Beberapa Rincian Orbot</string>
+  <string name="wizard_details_msg">Orbot adalah aplikasi open-source yang mengandung Tor, LibEvent dan Polipo. Tor menyediakan HTTP proxy (8118) dan SOCKS proxy (9050) lokal menuju jaringan Tor. Orbot juga dapat, pada perangkat yang di-root, untuk mengirimkan semua lalu-lintas data internet melalui Tor.</string>
+  <string name="wizard_permissions_root">Izin Diberikan</string>
+  <string name="wizard_permissions_stock">Perizinan Orbot</string>
+  <string name="wizard_premissions_msg_root">Baik sekali! Kami telah mendeteksi bahwa anda telah mengaktifkan perizinan root untuk Orbot. Kami akan menggunakan kekuatan ini secara bijak.</string>
+  <string name="wizard_permissions_msg_stock">Sementara itu tidak diperlukan, Orbot dapat menjadi tool yang lebih kuat jika perangkat anda memiliki akses root. Gunakan tombol dibawah untuk memberikan kekuatan super kepada Orbot!</string>
+  <string name="wizard_permissions_no_root">Jika anda tidak memiliki akses root atau tidak tahu tentang apa yang kita bicarakan, pastikan untuk menggunakan aplikasi yang dibuat untuk bekerja dengan Orbot.</string>
+  <string name="wizard_permissions_consent">Saya mengerti dan ingin melanjutkan tanpa Superuser</string>
+  <string name="wizard_permission_enable_root">Berikan Akses Root untuk Orbot</string>
+  <string name="wizard_configure">Konfigurasi Torifikasi</string>
+  <string name="wizard_configure_msg">Orbot memberikan pilihan kepada anda untuk mengerahkan semua trafik aplikasi melalui Tor ATAU untuk memilih aplikasi anda secara individu.</string>
+  <string name="wizard_configure_all">Proxy Semua Aplikasi Melalui Tor</string>
+  <string name="wizard_configure_select_apps">Pilih Individu Aplikasi untuk Tor</string>
+  <string name="wizard_tips_tricks">Orbot- Aplikasi teraktifkan</string>
+  <string name="wizard_tips_msg">Aplikasi dibawah ini dikembangkan untuk bekerja dengan Orbot. Klik pada setiap tombol untuk memasangnya sekarang, atau anda dapat menemukan mereka di lain waktu pada Google Play, website GuardianProject.info atau melalui F-Droid.org</string>
+  <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="wizard_tips_twitter">Setel proxy Twitter ke host \"localhost\" dan port 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Tulis cerita dan biarkan Tor yang mengurus keamanannya!</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>
+  <string name="wizard_proxy_help_msg">Jika aplikasi Android yang anda gunakan mendukung penggunaan proxy HTTP atau SOCKS, maka anda dapat mengaturnya untuk terhubung ke Orbot dan menggunakan Tor. Setting host-nya 127.0.0.1 atau \"localhost\". Untuk HTTP, setting port-nya adalah 8118. Untuk SOCKS, proxy-nya adalah 9050. Anda disarankan menggunakan SOCKS4A atau SOCKS5 jika memungkinkan. Anda dapat mempelajari lebih lanjut mengenai pemakaian proxy pada Android melalui FAQ di: http://tinyurl.com/proxyandroid</string>
+  <string name="wizard_final">Orbot sudah siap!</string>
+  <string name="wizard_final_msg">Jutaan orang di seluruh dunia menggunakan Tor untuk berbagai tujuan. Jurnalis dan blogger, pembela hak asasi manusia, penegak hukum, prajurit, perusahaan, warga negara di rezim yang represif, dan warga biasa... dan kini anda sudah siap juga!</string>
+  <string name="wizard_exit_at_first_screen_toast">Konfigurasi Orbot terlebih dahulu sebelum anda menggunakannya!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Hal ini akan membuka peramban web anda ke https://check.torproject.org agar dapat melihat jika Orbot kemungkinan sudah dikonfigurasikan dan anda telah terhubung dengan Tor.</string>
+  <string name="pref_hs_group">Jasa Penyimpanan Rahasia</string>
+  <string name="pref_general_group">Umum</string>
+  <string name="pref_start_boot_title">Mulai Orbot saat Boot</string>
+  <string name="pref_start_boot_summary">Secara otomatis memulai Orbot dan menghubungkan dengan Tor ketika perangkat Android anda boot</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot membawa Tor ke Android! Tor membantu anda melawan penyaringan konten, analisis trafik dan pengawasan jaringan yang mengancam privasi, informasi rahasia dan hubungan pribadi. Wizard ini akan membantu anda mengkonfigurasikan Orbot dan Tor pada perangkat anda.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Peringatan</string>
+  <string name="wizard_warning_msg">Pemasangan Orbot tidak otomatis membuat trafik mobile anda anonim. Anda harus melakukan konfigurasi Orbot, perangkat anda dan aplikasi lainnya untuk dapat menggunakan Tor dengan baik.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Perizinan</string>
+  <string name="wizard_permissions_root_msg1">Anda dapat secara opsional memberikan Orbot akses \'Superuser\' untuk mengaktifkan fitur lanjutan, seperti Transparan Proxying.</string>
+  <string name="wizard_permissions_root_msg2">Jika anda tidak ingin melakukan ini, mohon pastikan bahwa anda menggunakan aplikasi yang dibuat untuk dapat bekerja dengan Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Perangkat anda belum di-root atau tidak punya akses \'Superuser\'. Silakan coba mode \'Aplikasi\' di tampilan utama.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Temukan semua aplikasi Guardian Project di Google Play</string>
+  <string name="wizard_tips_fdroid">Temukan semua aplikasi Guardian Project di F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Temukan semua aplikasi Guardian Project di https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparan Proxying</string>
+  <string name="wizard_transproxy_msg">Hal ini akan memungkinkan aplikasi anda untuk secara otomatis berjalan melalui jaringan Tor tanpa konfigurasi apapun.</string>
+  <string name="wizard_transproxy_hint">(Tandai box ini jika anda tidak tahu apa yang kita bicarakan)</string>
+  <string name="wizard_transproxy_none">Tidak ada</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Mengaktifkan Transparan Proxying Tor untuk Wifi dan Perangkat Tether USB (diperlukan restart)</string>
+  <string name="button_grant_superuser">Meminta Akses Superuser</string>
+  <string name="pref_select_apps">Pilih Aplikasi</string>
+  <string name="pref_select_apps_summary">Pilih Aplikasi untuk Mengerahkan Melalui Tor</string>
+  <string name="pref_node_configuration">Konfigurasi Simpul</string>
+  <string name="pref_node_configuration_summary">Itu adalah pengaturan lanjutan yang dapat mengurangi anonimitas anda</string>
+  <string name="pref_entrance_node">Simpul Masuk</string>
+  <string name="pref_entrance_node_summary">Sidik jari, alias, negara dan alamat untuk loncatan pertama</string>
+  <string name="pref_entrance_node_dialog">Masukkan Simpul Masuk</string>
+  <string name="pref_allow_background_starts_title">Ijinkan Latar Belakang Berjalan</string>
+  <string name="button_proxy_all">Proxy Semuanya</string>
+  <string name="button_proxy_none">Tanpa Proxy</string>
+  <string name="button_invert_selection">Balik Pilihan</string>
+  <string name="pref_proxy_title">Outbound Proxy Jaringan (Opsional)</string>
+  <string name="pref_proxy_type_title">Outbound Jenis Proxy</string>
+  <string name="pref_proxy_type_summary">Protokol yang digunakan untuk server proxy: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Masukkan Jenis Proxy</string>
+  <string name="pref_proxy_host_title">Outbound Host Proxy</string>
+  <string name="pref_proxy_host_summary">Nama host Server Proxy</string>
+  <string name="pref_proxy_host_dialog">Masukkan Host Proxy</string>
+  <string name="pref_proxy_port_title">Outbound Port Proxy</string>
+  <string name="pref_proxy_port_summary">Port Server Proxy</string>
+  <string name="pref_proxy_port_dialog">Masukkan port Proxy</string>
+  <string name="pref_proxy_username_title">Outbound Nama Pengguna Proxy</string>
+  <string name="pref_proxy_username_summary">Nama Pengguna Proxy (Opsional)</string>
+  <string name="pref_proxy_username_dialog">Masukkan Nama Pengguna Proxy</string>
+  <string name="pref_proxy_password_title">Outbound Sandi Proxy</string>
+  <string name="pref_proxy_password_summary">Sandi Proxy (Opsional)</string>
+  <string name="pref_proxy_password_dialog">Masukkan Sandi Proxy</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Menyetel transparan proxying penuh...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Menyetel apl-berbasis proxying transparan...</string>
+  <string name="transparent_proxying_enabled">Proxying transparan DIAKTIFKAN</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy diaktifkan untuk Tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">PERINGATAN: kesalahan dalam memulai proxying transparan!</string>
+  <string name="transproxy_rules_cleared">Aturan TransProxy dibersihkan</string>
+  <string name="couldn_t_start_tor_process_">Tidak dapat memulai proses Tor:</string>
+  <string name="privoxy_is_running_on_port_">Polipo aktif di port:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Menyetel proxying transparan berbasis-port...</string>
+  <string name="bridge_error">Kesalahan pada Bridge</string>
+  <string name="bridge_requires_ip">Agar dapat menggunakan fitur bridge, anda perlu memasukkan minimal satu alamat IP bridge.</string>
+  <string name="send_email_for_bridges">Kirimkan email ke bridges at torproject.org dengan baris \"get bridges\" dengan sendirinya dalam tubuh surat dari akun gmail.</string>
+  <string name="error">Kesalahan</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Pengaturan ReachableAddresses anda menyebabkan kesalahan!</string>
+  <string name="your_relay_settings_caused_an_exception_">Pengaturan relay anda menyebabkan kesalahan!</string>
+  <string name="exit_nodes">Node Keluar</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">fingerprints, nama, negara dan alamat untuk hop terakhir</string>
+  <string name="enter_exit_nodes">Memasuki Node Keluar</string>
+  <string name="exclude_nodes">Node pengecualian</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Pengecualian fingerprints,nama, negara dan alamat</string>
+  <string name="enter_exclude_nodes">Memasuki Node Pengecualian</string>
+  <string name="strict_nodes">Node Terlarang</string>
+  <string name="use_only_these_specified_nodes">Pakai *hanya* spesifik node</string>
+  <string name="bridges">Bridges</string>
+  <string name="use_bridges">Pakai Bridges</string>
+  <string name="bridges_obfuscated">Bridges Terobfuskasi</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Nyalakan alternatif node masuk ke dalam Tor Network</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Nyalakan jika pengaturan bridges adalah bridges terobfuskasi</string>
+  <string name="ip_address_and_port_of_bridges">Alamat IP dan port bridges</string>
+  <string name="enter_bridge_addresses">Memasuki Alamat Bridge</string>
+  <string name="relays">Relays</string>
+  <string name="relaying">Sedang me-Relay</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Nyalakan perangkat anda menjadi non-exit relay</string>
+  <string name="relay_port">Port Relay</string>
+  <string name="listening_port_for_your_tor_relay">Port mendengarkan untuk TOR relay anda</string>
+  <string name="enter_or_port">Memasuki OR port</string>
+  <string name="relay_nickname">Nama Relay</string>
+  <string name="the_nickname_for_your_tor_relay">sebuah nama untuk Tor Relay anda</string>
+  <string name="enter_a_custom_relay_nickname">Masukkan nama relay</string>
+  <string name="reachable_addresses">Addresses Terjangkau</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Jalankan sebagai client dibalik firewall dengan ketentuan ketat</string>
+  <string name="reachable_ports">Ports terjangkau</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Port terjangkau dibalik firewall ketat</string>
+  <string name="enter_ports">Memasuki ports</string>
+  <string name="enable_hidden_services">Layanan Penyimpanan Rahasia</string>
+  <string name="run_servers_accessible_via_the_tor_network">Membolehkan perangkat-nyala untuk diakses lewat Tor Network</string>
+  <string name="enter_localhost_ports_for_hidden_services">memasuki localhost port untuk layanan rahasia</string>
+  <string name="hidden_service_ports">Ports Layanan Rahasia</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">nama teralamatkan untuk layanan rahasia anda (otomatis dibuat)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">nyalakan debug log untuk output (harus menggunakan adb atau aLogCat untuk menampilkan)</string>
+  <string name="project_home">Beranda Projek:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android https://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Lisensi Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Perangkat Lunak Pihak Ke-3:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Sebuah aplikasi ingin membuka port %S server tersembunyi ke jaringan Tor. Hal ini aman jika anda mempercayai aplikasi tersebut.</string>
+  <string name="found_existing_tor_process">menemukan proses Tor yang ada...</string>
+  <string name="something_bad_happened">Sesuatu yang buruk terjadi. Periksa log</string>
+  <string name="hidden_service_on">layanan tersembunyi pada:</string>
+  <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string>
+  <string name="unable_to_start_tor">Tidak dapat memulai Tor:</string>
+  <string name="unable_to_reset_tor">Boot ulang perangkat anda, gagal me-reset Tor!</string>
+  <string name="pref_use_sys_iptables_title">Gunakan Iptables Default</string>
+  <string name="pref_use_sys_iptables_summary">menggunakan binary iptables built-in daripada yang disertakan dengan Orbot</string>
+  <string name="error_installing_binares">Binary Tor tidak dapat dipasang atau ditingkatkan</string>
+  <string name="pref_use_persistent_notifications">Selalu pelihara icon dalam toolbar ketika Orbot terhubung</string>
+  <string name="pref_use_persistent_notifications_title">Pemberitahuan Selalu-Hidup</string>
+  <string name="pref_use_expanded_notifications">Tampilkan notifikasi melebar dengan negara dan IP keluar Tor</string>
+  <string name="pref_use_expanded_notifications_title">Notifikasi Melebar</string>
+  <string name="notification_using_bridges">Bridge diaktifkan!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Bahasa</string>
+  <string name="set_locale_summary">Pilih lokal dan bahasa untuk Orbot</string>
+  <string name="wizard_locale_title">Pilih Bahasa</string>
+  <string name="wizard_locale_msg">Biarkan default atau berlaih ke bahasa saat ini</string>
+  <string name="powered_by">diperkuat dengan Tor</string>
+  <string name="btn_save_settings">Simpan Pengaturan</string>
+  <string name="no_internet_connection_tor">Tidak ada koneksi internet; Tor sedang standby...</string>
+  <string name="bandwidth_">Bandwidth:</string>
+  <string name="down">unduh</string>
+  <string name="up">unggah</string>
+  <string name="pref_disable_network_title">Auto-Tidur Tidak Ada Jaringan</string>
+  <string name="pref_disable_network_summary">Menempatkan Tor untuk tidur ketika tidak ada internet yang tersedia</string>
+  <string name="newnym">Anda telah beralih ke identitas Tor baru!</string>
+  <string name="menu_verify_browser">Peramban</string>
+  <string name="menu_use_chatsecure">Gunakan ChatSecure</string>
+  <string name="permission_manage_tor_label">Kelola Tor</string>
+  <string name="permission_manage_tor_description">Aktifkan aplikasi ini untuk mengontrol layanan Tor</string>
+  <string name="install_apps_">Pasang aplikasi?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Tidak ada jaringan terhubung. Menidurkan Tor...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Jaringan terhubung baik. Memanggil Tor...</string>
+  <string name="updating_settings_in_tor_service">memperbarui setting pada layanan Tor</string>
+  <string name="pref_socks_title">SOCKS Tor</string>
+  <string name="pref_socks_summary">Port tempat proxy SOCKS Tor aktif (standar: 9050 atau 0 untuk mematikan)</string>
+  <string name="pref_socks_dialog">Konfigurasi Port SOCKS</string>
+  <string name="pref_transport_title">Port TransProxy Tor</string>
+  <string name="pref_transport_summary">Port tempat Proxy Transparan Tor aktif (standar: 9040 atau 0 untuk mematikan)</string>
+  <string name="pref_transport_dialog">Konfigurasi Port TransProxy</string>
+  <string name="pref_dnsport_title">Port DNS Tor</string>
+  <string name="pref_dnsport_summary">Port tempat DNS Tor aktif (standar: 5400 atau 0 untuk mematikan)</string>
+  <string name="pref_dnsport_dialog">Konfigurasi Port DNS</string>
+  <string name="pref_torrc_title">Konfigurasi Torrc</string>
+  <string name="pref_torrc_summary">HANYA UNTUK AHLI: masukkan baris konfigurasi direct Torrc</string>
+  <string name="pref_torrc_dialog">Torrc Custom</string>
+  <string name="wizard_tips_martus">Mobile Martus - Aplikasi Dokumentasi Hak Asasi Manusia milik Benetech</string>
+  <string name="your_tor_public_ips_">IP Publik Tor Anda:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Mohon nonaktifkan aplikasi ini di Android Settings Apps jika Orbot anda bermasalah</string>
+  <string name="app_conflict">Konflik Aplikasi</string>
+  <string name="pref_transproxy_refresh_title">Auto-Refresh Transproxy</string>
+  <string name="pref_transproxy_refresh_summary">Pasang ulang rule Transproxy saat status jaringan berubah</string>
+  <string name="pref_transproxy_flush_title">BUANG PAKSA Transproxy</string>
+  <string name="pref_transproxy_flush_summary">Ketuk disini untuk mengosongkan semua rule jaringan Transproxy SEKARANG</string>
+  <string name="transparent_proxy_rules_flushed_">Rule proxy transparan telah kosong!</string>
+  <string name="you_do_not_have_root_access_enabled">Anda tidak punya akses ROOT</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Anda mungkin harus stop lalu start kembali Orbot agar perubahan setting menjadi aktif.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Bridge Telah Diperbarui</string>
+  <string name="restart_orbot_to_use_this_bridge_">Silakan start ulang Orbot untuk mengaktifkan perubahan</string>
+  <string name="menu_qr">Kode QR</string>
+  <string name="bridge_mode">Mode Bridge</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Laman</string>
+  <string name="activate">Aktivasi</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Anda dapat membuat semua aplikasi di perangkat anda bekerja melalui jaringan Tor menggunakan fitur VPN dari Android. *AWAS* Fitur ini masih baru, percobaan dan pada beberapa kasus tidak start otomatis, atau bahkan berhenti. Tidak untuk anonimitas, dan HANYA untuk melewati firewall dan penyaringan.</string>
+  <string name="send_email">Kirim Email</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Anda bisa mendapatkan alamat bridge melalui email, halaman web atau dengan memindai kode QR bridge tersebut. Pilih \'Email\' atau \'Laman\' di bawah untuk meminta alamat bridge. Setelah anda mendapatkannya, salin lalu tempel di pilihan \"Bridges\" pada setting Orbot lalu start ulang.</string>
+  <string name="standard_browser">Peramban Standar</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">CATATAN: Hanya bridge Tor yang standar yang bekerja di perangkat Intel X86/ATOM</string>
+</resources>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
new file mode 100644
index 0000000..344037a
--- /dev/null
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot adalah aplikasi proxy gratis yang membuat aplikasi-aplikasi lainnya dapat terkoneksi dengan internet secara aman. Orbot menggunakan Tor untuk mengenkripsi hubungan internet anda dan menyalurkannya melewati berbagai komputer di seluruh dunia. Tor adalah software gratis dan suatu network terbuka, yang membantu anda menghindari pengawasan network yang mengancam kebebasan pribadi dan privasi, aktivitas bisnis rahasia dan relasi, serta keamanan negara yang dikenal dengan analisa traffic.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">mulai dan akhiri Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot sedang dimulai...</string>
+  <string name="status_activated">Tersambung ke Jaringan Tor</string>
+  <string name="status_disabled">Orbot telah dibatalkan</string>
+  <string name="status_shutting_down">TorService dimatikan</string>
+  <string name="tor_process_starting">Memulai klien Tor...</string>
+  <string name="tor_process_complete">selesai.</string>
+  <string name="tor_process_waiting">menunggu.</string>
+  <string name="not_anonymous_yet">PERINGATAN: Trafik anda belum anonim! Silahkan konfigurasikan aplikasi anda untuk dapat menggunakan proxy HTTP 127.0.0.1:8118 atau SOCKS4A atau proxy SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Beranda</string>
+  <string name="menu_browse">Jelajah</string>
+  <string name="menu_settings">Pengaturan</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Bantuan</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Mulai</string>
+  <string name="menu_stop">Berhenti</string>
+  <string name="menu_about">Tentang</string>
+  <string name="menu_promo_apps">Dapatkan aplikasi...</string>
+  <string name="main_layout_download">Unduh</string>
+  <string name="main_layout_upload">Unggah</string>
+  <string name="button_help">Bantuan</string>
+  <string name="button_close">Tutup</string>
+  <string name="button_about">Tentang</string>
+  <string name="button_clear_log">Hapus Log</string>
+  <string name="menu_verify">Periksa</string>
+  <string name="menu_exit">Keluar</string>
+  <string name="menu_scan">Pindai BridgeQR</string>
+  <string name="menu_share_bridge">Bagikan BridgeQR</string>
+  <string name="press_to_start">- sentuh dan tahan untuk memulai -</string>
+  <string name="pref_trans_proxy_group">Proxy Transparan (Dibutuhkan Root)</string>
+  <string name="pref_trans_proxy_title">Proxy Transparan</string>
+  <string name="pref_trans_proxy_summary">Otomatis Torfying Aplikasi</string>
+  <string name="pref_transparent_all_title">Tor Semuanya</string>
+  <string name="pref_transparent_all_summary">Trafik proxy untuk semua aplikasi melalui Tor</string>
+  <string name="pref_transparent_port_fallback_title">Alternatif Port Proxy</string>
+  <string name="pref_transparent_port_fallback_summary">PERINGATAN: Temukan port umum (80, 443, dll). *Gunakan Hanya* jika \'Semua\' atau \'Aplikasi\' mode tidak bekerja.</string>
+  <string name="pref_transparent_port_title">Daftar Port</string>
+  <string name="pref_transparent_port_summary">Daftar port untuk proxy. *GUNAKAN HANYA* jika modus \'Semua\' atau \'Apl\' tidak bekerja</string>
+  <string name="pref_transparent_port_dialog">Masukkan port untuk proxy</string>
+  <string name="pref_has_root">Minta Akses Root</string>
+  <string name="pref_has_root_summary">Meminta akses root untuk proxy transparan</string>
+  <string name="status_install_success">Binary Tor berhasil dipasang!</string>
+  <string name="status_install_fail">File binary Tor tidak dapat dipasang. Silahkan periksa log dan beritahukan ke tor-assistants at torprojects.org</string>
+  <string name="title_error">Kesalahan Pada Aplikasi</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Tentang Orbot</string>
+  <string name="btn_next">Berikutnya</string>
+  <string name="btn_back">Kembali</string>
+  <string name="btn_finish">Selesai</string>
+  <string name="btn_okay">Oke</string>
+  <string name="btn_cancel">Batal</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Beberapa Rincian Orbot</string>
+  <string name="wizard_details_msg">Orbot adalah aplikasi open-source yang mengandung Tor, LibEvent dan Polipo. Tor menyediakan HTTP proxy (8118) dan SOCKS proxy (9050) lokal menuju jaringan Tor. Orbot juga dapat, pada perangkat yang di-root, untuk mengirimkan semua lalu-lintas data internet melalui Tor.</string>
+  <string name="wizard_permissions_root">Izin Diberikan</string>
+  <string name="wizard_permissions_stock">Perizinan Orbot</string>
+  <string name="wizard_premissions_msg_root">Baik sekali! Kami telah mendeteksi bahwa anda telah mengaktifkan perizinan root untuk Orbot. Kami akan menggunakan kekuatan ini secara bijak.</string>
+  <string name="wizard_permissions_msg_stock">Sementara itu tidak diperlukan, Orbot dapat menjadi tool yang lebih kuat jika perangkat anda memiliki akses root. Gunakan tombol dibawah untuk memberikan kekuatan super kepada Orbot!</string>
+  <string name="wizard_permissions_no_root">Jika anda tidak memiliki akses root atau tidak tahu tentang apa yang kita bicarakan, pastikan untuk menggunakan aplikasi yang dibuat untuk bekerja dengan Orbot.</string>
+  <string name="wizard_permissions_consent">Saya mengerti dan ingin melanjutkan tanpa Superuser</string>
+  <string name="wizard_permission_enable_root">Berikan Akses Root untuk Orbot</string>
+  <string name="wizard_configure">Konfigurasi Torifikasi</string>
+  <string name="wizard_configure_msg">Orbot memberikan pilihan kepada anda untuk mengerahkan semua trafik aplikasi melalui Tor ATAU untuk memilih aplikasi anda secara individu.</string>
+  <string name="wizard_configure_all">Proxy Semua Aplikasi Melalui Tor</string>
+  <string name="wizard_configure_select_apps">Pilih Individu Aplikasi untuk Tor</string>
+  <string name="wizard_tips_tricks">Orbot- Aplikasi teraktifkan</string>
+  <string name="wizard_tips_msg">Aplikasi dibawah ini dikembangkan untuk bekerja dengan Orbot. Klik pada setiap tombol untuk memasangnya sekarang, atau anda dapat menemukan mereka di lain waktu pada Google Play, website GuardianProject.info atau melalui F-Droid.org</string>
+  <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="wizard_tips_twitter">Setel proxy Twitter ke host \"localhost\" dan port 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Tulis cerita dan biarkan Tor yang mengurus keamanannya!</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>
+  <string name="wizard_proxy_help_msg">Jika aplikasi Android yang anda gunakan mendukung penggunaan proxy HTTP atau SOCKS, maka anda dapat mengaturnya untuk terhubung ke Orbot dan menggunakan Tor. Setting host-nya 127.0.0.1 atau \"localhost\". Untuk HTTP, setting port-nya adalah 8118. Untuk SOCKS, proxy-nya adalah 9050. Anda disarankan menggunakan SOCKS4A atau SOCKS5 jika memungkinkan. Anda dapat mempelajari lebih lanjut mengenai pemakaian proxy pada Android melalui FAQ di: http://tinyurl.com/proxyandroid</string>
+  <string name="wizard_final">Orbot sudah siap!</string>
+  <string name="wizard_final_msg">Jutaan orang di seluruh dunia menggunakan Tor untuk berbagai tujuan. Jurnalis dan blogger, pembela hak asasi manusia, penegak hukum, prajurit, perusahaan, warga negara di rezim yang represif, dan warga biasa... dan kini anda sudah siap juga!</string>
+  <string name="wizard_exit_at_first_screen_toast">Konfigurasi Orbot terlebih dahulu sebelum anda menggunakannya!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Hal ini akan membuka peramban web anda ke https://check.torproject.org agar dapat melihat jika Orbot kemungkinan sudah dikonfigurasikan dan anda telah terhubung dengan Tor.</string>
+  <string name="pref_hs_group">Jasa Penyimpanan Rahasia</string>
+  <string name="pref_general_group">Umum</string>
+  <string name="pref_start_boot_title">Mulai Orbot saat Boot</string>
+  <string name="pref_start_boot_summary">Secara otomatis memulai Orbot dan menghubungkan dengan Tor ketika perangkat Android anda boot</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot membawa Tor ke Android! Tor membantu anda melawan penyaringan konten, analisis trafik dan pengawasan jaringan yang mengancam privasi, informasi rahasia dan hubungan pribadi. Wizard ini akan membantu anda mengkonfigurasikan Orbot dan Tor pada perangkat anda.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Peringatan</string>
+  <string name="wizard_warning_msg">Pemasangan Orbot tidak otomatis membuat trafik mobile anda anonim. Anda harus melakukan konfigurasi Orbot, perangkat anda dan aplikasi lainnya untuk dapat menggunakan Tor dengan baik.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Perizinan</string>
+  <string name="wizard_permissions_root_msg1">Anda dapat secara opsional memberikan Orbot akses \'Superuser\' untuk mengaktifkan fitur lanjutan, seperti Transparan Proxying.</string>
+  <string name="wizard_permissions_root_msg2">Jika anda tidak ingin melakukan ini, mohon pastikan bahwa anda menggunakan aplikasi yang dibuat untuk dapat bekerja dengan Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Perangkat anda belum di-root atau tidak punya akses \'Superuser\'. Silakan coba mode \'Aplikasi\' di tampilan utama.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Temukan semua aplikasi Guardian Project di Google Play</string>
+  <string name="wizard_tips_fdroid">Temukan semua aplikasi Guardian Project di F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Temukan semua aplikasi Guardian Project di https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparan Proxying</string>
+  <string name="wizard_transproxy_msg">Hal ini akan memungkinkan aplikasi anda untuk secara otomatis berjalan melalui jaringan Tor tanpa konfigurasi apapun.</string>
+  <string name="wizard_transproxy_hint">(Tandai box ini jika anda tidak tahu apa yang kita bicarakan)</string>
+  <string name="wizard_transproxy_none">Tidak ada</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Mengaktifkan Transparan Proxying Tor untuk Wifi dan Perangkat Tether USB (diperlukan restart)</string>
+  <string name="button_grant_superuser">Meminta Akses Superuser</string>
+  <string name="pref_select_apps">Pilih Aplikasi</string>
+  <string name="pref_select_apps_summary">Pilih Aplikasi untuk Mengerahkan Melalui Tor</string>
+  <string name="pref_node_configuration">Konfigurasi Simpul</string>
+  <string name="pref_node_configuration_summary">Itu adalah pengaturan lanjutan yang dapat mengurangi anonimitas anda</string>
+  <string name="pref_entrance_node">Simpul Masuk</string>
+  <string name="pref_entrance_node_summary">Sidik jari, alias, negara dan alamat untuk loncatan pertama</string>
+  <string name="pref_entrance_node_dialog">Masukkan Simpul Masuk</string>
+  <string name="pref_allow_background_starts_title">Ijinkan Latar Belakang Berjalan</string>
+  <string name="button_proxy_all">Proxy Semuanya</string>
+  <string name="button_proxy_none">Tanpa Proxy</string>
+  <string name="button_invert_selection">Balik Pilihan</string>
+  <string name="pref_proxy_title">Outbound Proxy Jaringan (Opsional)</string>
+  <string name="pref_proxy_type_title">Outbound Jenis Proxy</string>
+  <string name="pref_proxy_type_summary">Protokol yang digunakan untuk server proxy: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Masukkan Jenis Proxy</string>
+  <string name="pref_proxy_host_title">Outbound Host Proxy</string>
+  <string name="pref_proxy_host_summary">Nama host Server Proxy</string>
+  <string name="pref_proxy_host_dialog">Masukkan Host Proxy</string>
+  <string name="pref_proxy_port_title">Outbound Port Proxy</string>
+  <string name="pref_proxy_port_summary">Port Server Proxy</string>
+  <string name="pref_proxy_port_dialog">Masukkan port Proxy</string>
+  <string name="pref_proxy_username_title">Outbound Nama Pengguna Proxy</string>
+  <string name="pref_proxy_username_summary">Nama Pengguna Proxy (Opsional)</string>
+  <string name="pref_proxy_username_dialog">Masukkan Nama Pengguna Proxy</string>
+  <string name="pref_proxy_password_title">Outbound Sandi Proxy</string>
+  <string name="pref_proxy_password_summary">Sandi Proxy (Opsional)</string>
+  <string name="pref_proxy_password_dialog">Masukkan Sandi Proxy</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Menyetel transparan proxying penuh...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Menyetel apl-berbasis proxying transparan...</string>
+  <string name="transparent_proxying_enabled">Proxying transparan DIAKTIFKAN</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy diaktifkan untuk Tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">PERINGATAN: kesalahan dalam memulai proxying transparan!</string>
+  <string name="transproxy_rules_cleared">Aturan TransProxy dibersihkan</string>
+  <string name="couldn_t_start_tor_process_">Tidak dapat memulai proses Tor:</string>
+  <string name="privoxy_is_running_on_port_">Polipo aktif di port:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Menyetel proxying transparan berbasis-port...</string>
+  <string name="bridge_error">Kesalahan pada Bridge</string>
+  <string name="bridge_requires_ip">Agar dapat menggunakan fitur bridge, anda perlu memasukkan minimal satu alamat IP bridge.</string>
+  <string name="send_email_for_bridges">Kirimkan email ke bridges at torproject.org dengan baris \"get bridges\" dengan sendirinya dalam tubuh surat dari akun gmail.</string>
+  <string name="error">Kesalahan</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Pengaturan ReachableAddresses anda menyebabkan kesalahan!</string>
+  <string name="your_relay_settings_caused_an_exception_">Pengaturan relay anda menyebabkan kesalahan!</string>
+  <string name="exit_nodes">Node Keluar</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">fingerprints, nama, negara dan alamat untuk hop terakhir</string>
+  <string name="enter_exit_nodes">Memasuki Node Keluar</string>
+  <string name="exclude_nodes">Node pengecualian</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Pengecualian fingerprints,nama, negara dan alamat</string>
+  <string name="enter_exclude_nodes">Memasuki Node Pengecualian</string>
+  <string name="strict_nodes">Node Terlarang</string>
+  <string name="use_only_these_specified_nodes">Pakai *hanya* spesifik node</string>
+  <string name="bridges">Bridges</string>
+  <string name="use_bridges">Pakai Bridges</string>
+  <string name="bridges_obfuscated">Bridges Terobfuskasi</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Nyalakan alternatif node masuk ke dalam Tor Network</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Nyalakan jika pengaturan bridges adalah bridges terobfuskasi</string>
+  <string name="ip_address_and_port_of_bridges">Alamat IP dan port bridges</string>
+  <string name="enter_bridge_addresses">Memasuki Alamat Bridge</string>
+  <string name="relays">Relays</string>
+  <string name="relaying">Sedang me-Relay</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Nyalakan perangkat anda menjadi non-exit relay</string>
+  <string name="relay_port">Port Relay</string>
+  <string name="listening_port_for_your_tor_relay">Port mendengarkan untuk TOR relay anda</string>
+  <string name="enter_or_port">Memasuki OR port</string>
+  <string name="relay_nickname">Nama Relay</string>
+  <string name="the_nickname_for_your_tor_relay">sebuah nama untuk Tor Relay anda</string>
+  <string name="enter_a_custom_relay_nickname">Masukkan nama relay</string>
+  <string name="reachable_addresses">Addresses Terjangkau</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Jalankan sebagai client dibalik firewall dengan ketentuan ketat</string>
+  <string name="reachable_ports">Ports terjangkau</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Port terjangkau dibalik firewall ketat</string>
+  <string name="enter_ports">Memasuki ports</string>
+  <string name="enable_hidden_services">Layanan Penyimpanan Rahasia</string>
+  <string name="run_servers_accessible_via_the_tor_network">Membolehkan perangkat-nyala untuk diakses lewat Tor Network</string>
+  <string name="enter_localhost_ports_for_hidden_services">memasuki localhost port untuk layanan rahasia</string>
+  <string name="hidden_service_ports">Ports Layanan Rahasia</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">nama teralamatkan untuk layanan rahasia anda (otomatis dibuat)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">nyalakan debug log untuk output (harus menggunakan adb atau aLogCat untuk menampilkan)</string>
+  <string name="project_home">Beranda Projek:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android https://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Lisensi Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Perangkat Lunak Pihak Ke-3:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Sebuah aplikasi ingin membuka port %S server tersembunyi ke jaringan Tor. Hal ini aman jika anda mempercayai aplikasi tersebut.</string>
+  <string name="found_existing_tor_process">menemukan proses Tor yang ada...</string>
+  <string name="something_bad_happened">Sesuatu yang buruk terjadi. Periksa log</string>
+  <string name="hidden_service_on">layanan tersembunyi pada:</string>
+  <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string>
+  <string name="unable_to_start_tor">Tidak dapat memulai Tor:</string>
+  <string name="unable_to_reset_tor">Boot ulang perangkat anda, gagal me-reset Tor!</string>
+  <string name="pref_use_sys_iptables_title">Gunakan Iptables Default</string>
+  <string name="pref_use_sys_iptables_summary">menggunakan binary iptables built-in daripada yang disertakan dengan Orbot</string>
+  <string name="error_installing_binares">Binary Tor tidak dapat dipasang atau ditingkatkan</string>
+  <string name="pref_use_persistent_notifications">Selalu pelihara icon dalam toolbar ketika Orbot terhubung</string>
+  <string name="pref_use_persistent_notifications_title">Pemberitahuan Selalu-Hidup</string>
+  <string name="pref_use_expanded_notifications">Tampilkan notifikasi melebar dengan negara dan IP keluar Tor</string>
+  <string name="pref_use_expanded_notifications_title">Notifikasi Melebar</string>
+  <string name="notification_using_bridges">Bridge diaktifkan!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Bahasa</string>
+  <string name="set_locale_summary">Pilih lokal dan bahasa untuk Orbot</string>
+  <string name="wizard_locale_title">Pilih Bahasa</string>
+  <string name="wizard_locale_msg">Biarkan default atau berlaih ke bahasa saat ini</string>
+  <string name="powered_by">diperkuat dengan Tor</string>
+  <string name="btn_save_settings">Simpan Pengaturan</string>
+  <string name="no_internet_connection_tor">Tidak ada koneksi internet; Tor sedang standby...</string>
+  <string name="bandwidth_">Bandwidth:</string>
+  <string name="down">unduh</string>
+  <string name="up">unggah</string>
+  <string name="pref_disable_network_title">Auto-Tidur Tidak Ada Jaringan</string>
+  <string name="pref_disable_network_summary">Menempatkan Tor untuk tidur ketika tidak ada internet yang tersedia</string>
+  <string name="newnym">Anda telah beralih ke identitas Tor baru!</string>
+  <string name="menu_verify_browser">Peramban</string>
+  <string name="menu_use_chatsecure">Gunakan ChatSecure</string>
+  <string name="permission_manage_tor_label">Kelola Tor</string>
+  <string name="permission_manage_tor_description">Aktifkan aplikasi ini untuk mengontrol layanan Tor</string>
+  <string name="install_apps_">Pasang aplikasi?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Tidak ada jaringan terhubung. Menidurkan Tor...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Jaringan terhubung baik. Memanggil Tor...</string>
+  <string name="updating_settings_in_tor_service">memperbarui setting pada layanan Tor</string>
+  <string name="pref_socks_title">SOCKS Tor</string>
+  <string name="pref_socks_summary">Port tempat proxy SOCKS Tor aktif (standar: 9050 atau 0 untuk mematikan)</string>
+  <string name="pref_socks_dialog">Konfigurasi Port SOCKS</string>
+  <string name="pref_transport_title">Port TransProxy Tor</string>
+  <string name="pref_transport_summary">Port tempat Proxy Transparan Tor aktif (standar: 9040 atau 0 untuk mematikan)</string>
+  <string name="pref_transport_dialog">Konfigurasi Port TransProxy</string>
+  <string name="pref_dnsport_title">Port DNS Tor</string>
+  <string name="pref_dnsport_summary">Port tempat DNS Tor aktif (standar: 5400 atau 0 untuk mematikan)</string>
+  <string name="pref_dnsport_dialog">Konfigurasi Port DNS</string>
+  <string name="pref_torrc_title">Konfigurasi Torrc</string>
+  <string name="pref_torrc_summary">HANYA UNTUK AHLI: masukkan baris konfigurasi direct Torrc</string>
+  <string name="pref_torrc_dialog">Torrc Custom</string>
+  <string name="wizard_tips_martus">Mobile Martus - Aplikasi Dokumentasi Hak Asasi Manusia milik Benetech</string>
+  <string name="your_tor_public_ips_">IP Publik Tor Anda:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Mohon nonaktifkan aplikasi ini di Android Settings Apps jika Orbot anda bermasalah</string>
+  <string name="app_conflict">Konflik Aplikasi</string>
+  <string name="pref_transproxy_refresh_title">Auto-Refresh Transproxy</string>
+  <string name="pref_transproxy_refresh_summary">Pasang ulang rule Transproxy saat status jaringan berubah</string>
+  <string name="pref_transproxy_flush_title">BUANG PAKSA Transproxy</string>
+  <string name="pref_transproxy_flush_summary">Ketuk disini untuk mengosongkan semua rule jaringan Transproxy SEKARANG</string>
+  <string name="transparent_proxy_rules_flushed_">Rule proxy transparan telah kosong!</string>
+  <string name="you_do_not_have_root_access_enabled">Anda tidak punya akses ROOT</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Anda mungkin harus stop lalu start kembali Orbot agar perubahan setting menjadi aktif.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Bridge Telah Diperbarui</string>
+  <string name="restart_orbot_to_use_this_bridge_">Silakan start ulang Orbot untuk mengaktifkan perubahan</string>
+  <string name="menu_qr">Kode QR</string>
+  <string name="bridge_mode">Mode Bridge</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Laman</string>
+  <string name="activate">Aktivasi</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Anda dapat membuat semua aplikasi di perangkat anda bekerja melalui jaringan Tor menggunakan fitur VPN dari Android. *AWAS* Fitur ini masih baru, percobaan dan pada beberapa kasus tidak start otomatis, atau bahkan berhenti. Tidak untuk anonimitas, dan HANYA untuk melewati firewall dan penyaringan.</string>
+  <string name="send_email">Kirim Email</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Anda bisa mendapatkan alamat bridge melalui email, halaman web atau dengan memindai kode QR bridge tersebut. Pilih \'Email\' atau \'Laman\' di bawah untuk meminta alamat bridge. Setelah anda mendapatkannya, salin lalu tempel di pilihan \"Bridges\" pada setting Orbot lalu start ulang.</string>
+  <string name="standard_browser">Peramban Standar</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">CATATAN: Hanya bridge Tor yang standar yang bekerja di perangkat Intel X86/ATOM</string>
+</resources>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
new file mode 100644
index 0000000..42c4461
--- /dev/null
+++ b/app/src/main/res/values-in/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">mulai dan akhiri Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot sedang dimulai…</string>
+  <string name="status_activated">Tersambung ke Jaringan Tor</string>
+  <string name="status_disabled">Orbot telah dibatalkan</string>
+  <string name="status_shutting_down">Orbot sedang dimatikan</string>
+  <string name="not_anonymous_yet">PERINGATAN: </string>
+  <string name="menu_home">Home</string>
+  <string name="menu_browse">Jelajahi</string>
+  <string name="menu_settings">Pengaturan</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Bantuan</string>
+  <string name="menu_about">Mengenai</string>
+  <string name="button_help">Bantuan</string>
+  <string name="button_close">Dekat</string>
+  <string name="button_about">Mengenai</string>
+  <string name="button_clear_log">Hapus Log</string>
+  <string name="menu_verify">Periksa</string>
+  <string name="menu_exit">Keluar</string>
+  <string name="pref_transparent_all_title">Tor Semuanya</string>
+  <string name="pref_transparent_port_title">Daftar Port</string>
+  <string name="pref_has_root">Minta Akses Dasar</string>
+  <string name="btn_back">Kembali</string>
+  <string name="btn_cancel">Batal</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Pengaturan Proxy</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Umum</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Peringatan</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">Tidak ada</string>
+  <string name="status">Status</string>
+  <string name="error">Kesalahan</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Simpan Pengaturan</string>
+</resources>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
new file mode 100644
index 0000000..ca2f9cb
--- /dev/null
+++ b/app/src/main/res/values-is/strings.xml
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot er ókeypis proxy smáforrit sem gerir öðrum smáforritum kleift að nota veraldarvefinn á öruggari hátt. Orbot notar Tor til að dulkóða umferð þína á netinu og felur hana svo með að hoppa í gegnum fjölda tölva um allan heim. Tor er ókeypis hugbúnaður og opið net sem aðstoðar þig við að verjast gegn eftirliti á netinu sem vinnur gegn frelsi einkalífsins og friðhelgi, trúnaðar viðskiptamálum og samböndum, og ríkisöryggi þekkt sem umferðargreining.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">ræsa og stöðva Tor</string>
+  <string name="tor_proxy_service_process">torproxyþjónusta</string>
+  <string name="status_starting_up">Orbot er að ræsa...</string>
+  <string name="status_activated">Tengdur við Tor netið</string>
+  <string name="status_disabled">Orbot er slökkt</string>
+  <string name="tor_process_starting">Kveiki á Tor notanda...</string>
+  <string name="tor_process_complete">lokið.</string>
+  <string name="tor_process_waiting">bíða.</string>
+  <string name="not_anonymous_yet">AÐVÖRUN: Netumferðin þín er ekki nafnlaus enn! Vinsamlegast stilltu hugbúnaðinn þinn til að nota HTTP proxy 127.0.0.1:8118 eða SOCK4A eða SOCK5 proxy 127.0.0.1:9050</string>
+  <string name="menu_home">Heim</string>
+  <string name="menu_browse">Vafra</string>
+  <string name="menu_settings">Stillingar</string>
+  <string name="menu_log">Skráning</string>
+  <string name="menu_info">Hjálp</string>
+  <string name="menu_start">Byrja</string>
+  <string name="menu_stop">Stöðva</string>
+  <string name="menu_about">Um</string>
+  <string name="main_layout_download">Niðurhal</string>
+  <string name="main_layout_upload">Upphal</string>
+  <string name="button_help">Hjálp</string>
+  <string name="button_close">Loka</string>
+  <string name="button_about">Um</string>
+  <string name="button_clear_log">Hreinsa Skráningu</string>
+  <string name="menu_verify">Athuga</string>
+  <string name="menu_exit">Hætta</string>
+  <string name="menu_scan">Skanna BridgeQR</string>
+  <string name="menu_share_bridge">Deila BridgeQR</string>
+  <string name="press_to_start">- ýttu lengi til að byrja -</string>
+  <string name="pref_trans_proxy_group">Gegnsætt Proxy (Þarfnast Rótaraðgangs)</string>
+  <string name="pref_trans_proxy_title">Gegnsætt Proxy</string>
+  <string name="pref_trans_proxy_summary">Sjálfkrafa Tor-gera smáforrit</string>
+  <string name="pref_transparent_all_title">Tor Allt</string>
+  <string name="pref_transparent_all_summary">Beina umferð fyrir öll smáforrit í gegnum Tor</string>
+  <string name="pref_transparent_port_fallback_title">Port Beinir til vara</string>
+  <string name="pref_transparent_port_fallback_summary">AÐVÖRUN: Fer framhjá algengum portum (80, 443, etc). *NOTA AÐEINS* ef \'Allt\' eða \'Smáforrit\' stilling virkar ekki.</string>
+  <string name="pref_transparent_port_title">Porta Listi</string>
+  <string name="pref_transparent_port_summary">Listi yfir port til að proxya. *NOTA AÐEINS* ef \'Allt\' eða \'Smáforrit\' stilling virkar ekki</string>
+  <string name="pref_transparent_port_dialog">Settu inn port til að proxya</string>
+  <string name="pref_has_root">Biðja um Rótaraðgang</string>
+  <string name="pref_has_root_summary">Þarfnast rótaraðgangs fyrir gegnsæja proxýun</string>
+  <string name="status_install_success">Uppsetning Tor skráa tókst!</string>
+  <string name="status_install_fail">Tor binary skrár gátu ekki verið settar upp. Vinsamlegast athugaðu Skráninguna og láttu vita til tor-assistants at torproject.org</string>
+  <string name="title_error">Villa í Forriti</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Um Orbot</string>
+  <string name="btn_next">Næsta</string>
+  <string name="btn_back">Til baka</string>
+  <string name="btn_finish">Enda</string>
+  <string name="btn_okay">Ókei</string>
+  <string name="btn_cancel">Hætta við</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Fáein Orbot Smáatriði</string>
+  <string name="wizard_details_msg">Orbot er open-source forrit sem inniheldur Tor, LibEvent og Polipo. Það veitir staðbundinn HTTP proxy (8118) og SOCKS proxy (9050) inná Tor netið. Orbot hefur líka eiginleika, á tæki með rótaraðgang, til að senda alla vefumferð í gegnum Tor.</string>
+  <string name="wizard_permissions_root">Aðgangur Heimilaður</string>
+  <string name="wizard_permissions_stock">Orbot Leyfisveiting</string>
+  <string name="wizard_premissions_msg_root">Frábært! Við höfum skynjað að þú hefur rótaraðgang heimilaðan fyrir Orbot. Við munum nota þetta vald skynsamlega.</string>
+  <string name="wizard_permissions_msg_stock">Þrátt fyrir að vera ekki nauðsynlegt, getur Orbot orðið öflugra verkfæri ef tækið þitt hefur rótaraðgang. Notaðu hnappinn fyrir neðan til að veita Orbot ofurkrafta!</string>
+  <string name="wizard_permissions_no_root">Ef þú hefur ekki rótaraðgang eða hefur enga hugmynd um hvað við erum að tala, vertu viss um að nota smáforrit sem gerð eru til að vinna með Orbot.</string>
+  <string name="wizard_permissions_consent">Ég skil og vil halda áfram án réttinda Ofurnotanda</string>
+  <string name="wizard_permission_enable_root">Veita rótaraðgang fyrir Orbot</string>
+  <string name="wizard_configure">Stilla Torinleika</string>
+  <string name="wizard_configure_msg">Orbot gefur þér möguleikann á að beina allri umferð smáforrita í gegnum Tor EÐA að velja smáforrit hvert fyrir sig.</string>
+  <string name="wizard_configure_all">Beina umferð fyrir öll smáforrit í gegnum Tor</string>
+  <string name="wizard_configure_select_apps">Velja Einstök Smáforrit fyrir Tor</string>
+  <string name="wizard_tips_tricks">Orbot-virk Smáforrit</string>
+  <string name="wizard_tips_msg">Smáforritin fyrir neðan voru þróuð til að virka með Orbot. Klikkaðu hvern takka til að setja upp núna, eða þú getur fundið þá seinna á Google Play, á heimasíðu GuardianProject.info eða í gegnum F-Droid.org.</string>
+  <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="wizard_tips_twitter">Setja Twitter proxy hýsir til \"localhost\" and port 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Búða til sögu og skildu það eftir fyrir tor vegna öryggis!</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>
+  <string name="wizard_proxy_help_msg">Ef að Android smáforritið sem þú notar, styður notkun af HTTP eða SOCKS proxy, getur þú stillt það til að tengjast Orbot og nota Tor.\n\n\nStillingar þjóns er 127.0.0.1 eða \"localhost\". Fyrir HTTP, port stillingin er 8118. Fyrir SOCKS, proxyinn er 9050. Þú ættir að nota SOCKS4A eða SOCKS5 ef mögulegt. Þú getur lært meira um proxýun á Android með FAQ á: http://tinyurl.com/proxyandroid</string>
+  <string name="wizard_final">Orbot er tilbúinn!</string>
+  <string name="wizard_final_msg">Milljónir manneskja um allan heim nota Tor útaf mörgum mismunandi ástæðum.\n\nBlaðamenn og bloggarar, mannréttindasinnar, lögreglufólk, hermenn, stórfyrirtæki, þegnar bælandi ríkisstjórna og bara venjulegir borgarar... og núna þú ert líka tilbúinn!</string>
+  <string name="wizard_exit_at_first_screen_toast">Vinsamlegast stilltu Orbot áður en þú getur byrjað að nota það!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Þetta mun opna vef vafrann þinn að https://check.torproject.org til að sjá hvort Orbot sé rétt tengdur og að þú sért tengdur Tor.</string>
+  <string name="pref_hs_group">Falin Þjónusta Hýsing</string>
+  <string name="pref_general_group">Almennt</string>
+  <string name="pref_start_boot_title">Virkja Orbot við Ræsingu</string>
+  <string name="pref_start_boot_summary">Sjálfkrafa virkja Orbot og tengja Tor þegar Android tækið þitt ræsist</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot kemur með Tor til Android!\n\nTor hjálpar þér að verjast gegn síun innihalds, umferðargreiningu og net eftirliti sem er hættulegt friðhelgi einkalífsins, trúnaðarupplýsingum og persónulegum samböndum.\n\nÞessi leiðbeinandi hjálpar þér að stilla Orbot og Tor á tækinu þínu.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Aðvörun</string>
+  <string name="wizard_warning_msg">Aðeins með að setja Orbot upp mun ekki sjálfkrafa gera netumferð þína nafnlausa.\n\nÞú verður að stilla Orbot rétt, tækið þitt og önnur smáforrit til að nota Tor rétt.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Leyfisveitingar</string>
+  <string name="wizard_permissions_root_msg1">Þú getur valfrjálst veitt Orbot \'Ofurnotanda\' aðgang til að virkja stillingar fyrir lengra komna, eins og Gegnsæ Proxýun.</string>
+  <string name="wizard_permissions_root_msg2">Ef þú vilt ekki gera þetta, vinsamlegast vertu viss um að nota smáforrit sem gerð eru til að vinna með Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Tækið þitt virðist ekki vera með rótaraðgang eða veita \'Ofurnotanda\' réttindi.\n\nVinsamlegast prófaðu \'Smáforrit\' viðmótið á aðalskjánum í staðinn.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Finndu öll Guardian Verkefnis smáforrit á Google Play</string>
+  <string name="wizard_tips_fdroid">Finndu öll smáforrit úr Guardian Verkefninu á F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Finndu öll smáforrit úr Guardian Verkefninu á https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Gegnsæ Proxýun</string>
+  <string name="wizard_transproxy_msg">Þetta leyfir smáforritunum þínum sjálfkrafa að keyra í gengum Tor netið án nokkurra stillinga.</string>
+  <string name="wizard_transproxy_hint">(Hakaðu í þenna reit ef þú hefur enga hugmynd um hvað við erum að tala)</string>
+  <string name="wizard_transproxy_none">Engin</string>
+  <string name="pref_transparent_tethering_title">Tor Netaðgangspunktur</string>
+  <string name="pref_transparent_tethering_summary">Leyfa Tor Gegnsæja Proxýun fyrir WiFi og USB Tæki með Netaðgengi (þarfnast endurræsingar)</string>
+  <string name="button_grant_superuser">Biðja um Ofurnotandaréttindi</string>
+  <string name="pref_select_apps">Velja Smáforrit</string>
+  <string name="pref_select_apps_summary">Velja Smáforrit til að Beina í gegnum Tor</string>
+  <string name="pref_node_configuration">Punkta Stilling</string>
+  <string name="pref_node_configuration_summary">Þetta eru flóknari stillingar sem geta minnkað nafnleysið þitt</string>
+  <string name="pref_entrance_node">Inngangs Punktur</string>
+  <string name="pref_entrance_node_summary">Fingraför, uppnefni, lönd og heimilisföng fyrir fyrsta hoppið</string>
+  <string name="pref_entrance_node_dialog">Sláðu Inn Inngangspunkt</string>
+  <string name="button_proxy_all">Proxy Allt</string>
+  <string name="button_proxy_none">Proxy Ekkert</string>
+  <string name="button_invert_selection">Öfugt Val</string>
+  <string name="pref_proxy_title">Útistandandi Net Proxy (Valfrjálst)</string>
+  <string name="pref_proxy_type_title">Útistandandi Proxy Gerð</string>
+  <string name="pref_proxy_type_summary">Protocol til að nota fyrir proxy þjón: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Sláðu Inn Gerð Proxýs</string>
+  <string name="pref_proxy_host_title">Útistandandi Proxy Hýsir</string>
+  <string name="pref_proxy_host_summary">Proxy Netþjóns nafn</string>
+  <string name="pref_proxy_host_dialog">Sláðu Inn Proxy Þjón</string>
+  <string name="pref_proxy_port_title">Útistandandi Proxy Port</string>
+  <string name="pref_proxy_port_summary">Proxy Netþjóns port</string>
+  <string name="pref_proxy_port_dialog">Sláðu Inn Proxy port</string>
+  <string name="pref_proxy_username_title">Útistandandi Proxy Notendanafn</string>
+  <string name="pref_proxy_username_summary">Proxy Notendanafn (Valfrjálst)</string>
+  <string name="pref_proxy_username_dialog">Sláðu Inn Proxy Notendanafn</string>
+  <string name="pref_proxy_password_title">Útistandandi Proxy Lykilorð</string>
+  <string name="pref_proxy_password_summary">Proxy Lykilorð (Valfrjálst)</string>
+  <string name="pref_proxy_password_dialog">Sláðu Inn Proxy Lykilorð</string>
+  <string name="status">Staða</string>
+  <string name="setting_up_full_transparent_proxying_">Set upp full-gegnsæjan proxy...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Set upp smáforrita-byggðan gegnsæjan proxy... </string>
+  <string name="transparent_proxying_enabled">Gegnsæ proxýun KVEIKT</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy kveikt fyrir Netaðgangspunkt!</string>
+  <string name="warning_error_starting_transparent_proxying_">AÐVÖRUN: villa við að kveikja á gegnsærri proxýun</string>
+  <string name="transproxy_rules_cleared">TransProxy reglur hreinsaðar</string>
+  <string name="couldn_t_start_tor_process_">Gat ekki kveikt á Tor þráð:</string>
+  <string name="privoxy_is_running_on_port_">Polipo keyrir á porti:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Set upp port-byggða gegnsæja proxýun...</string>
+  <string name="bridge_error">Brúar Villa</string>
+  <string name="bridge_requires_ip">Til að nota brúar viðbótina, verðuru að slá inn að minnsta kosti eina IP addressu fyrir brú.</string>
+  <string name="send_email_for_bridges">Sendu tölvupóst til bridges at torproject.org með setningunni \"get bridges\" eitt og sér í innihaldi skeytisins frá gmail aðgangi.</string>
+  <string name="error">Villa</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Þitt ReachableAddressur stillingar ollu undanþágu!</string>
+  <string name="your_relay_settings_caused_an_exception_">Endurvarp stillingar þínar ollu undanþágu!</string>
+  <string name="exit_nodes">Útgangspunktar</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingraför, uppnefni, lönd og heimilisföng fyrir síðasta hoppið</string>
+  <string name="enter_exit_nodes">Sláðu Inn Útgangspunkta</string>
+  <string name="exclude_nodes">Útiloka Punkta</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingraför, uppnefni, lönd og heimilisföng til að útiloka</string>
+  <string name="enter_exclude_nodes">Sláðu Inn Útiloka Punkta</string>
+  <string name="strict_nodes">Strangir Punktar</string>
+  <string name="use_only_these_specified_nodes">Nota *aðeins* þessa tilgreindu punkta</string>
+  <string name="bridges">Brýr</string>
+  <string name="use_bridges">Nota Brýr</string>
+  <string name="bridges_obfuscated">Villandi Brýr</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Kveikja hliðstæðan inngangspunkt inná Tor Netið</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Leyfa ef stilltar brýr eru villandi brýr</string>
+  <string name="ip_address_and_port_of_bridges">IP addressa og brúarport</string>
+  <string name="enter_bridge_addresses">Sláðu Inn Brúar Addressur</string>
+  <string name="relays">Endurvarpar</string>
+  <string name="relaying">Endurvörpun</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Leyfa tækinu þínu að vera útgangslaus endurvarpi</string>
+  <string name="relay_port">Endurvörpunar Port</string>
+  <string name="listening_port_for_your_tor_relay">Hlustunar port fyrir Tor endurvarpann þinn</string>
+  <string name="enter_or_port">Sláðu Inn OR port</string>
+  <string name="relay_nickname">Endurvörpunar viðurnefni</string>
+  <string name="the_nickname_for_your_tor_relay">Viðurnefni fyrir Tor endurvarpið þitt</string>
+  <string name="enter_a_custom_relay_nickname">Sláðu Inn sérhannað endurvarp viðurnefni</string>
+  <string name="reachable_addresses">Nálgunarhæf Heimilisföng</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Keyra sem notandi bakvið eldvegg með hamlandi skilyrðum</string>
+  <string name="reachable_ports">Nálgunarhæf port</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Port nálgunarhæf bakvið hamlandi eldvegg</string>
+  <string name="enter_ports">Sláðu Inn port</string>
+  <string name="enable_hidden_services">Falin Þjónusta Hýsing</string>
+  <string name="run_servers_accessible_via_the_tor_network">leyfa á-tæki netþjón til að vera aðgengilegur í gegnum Tor netið</string>
+  <string name="enter_localhost_ports_for_hidden_services">sláðu inn localhost port fyrir faldar þjónustur</string>
+  <string name="hidden_service_ports">Falin Þjónustu Port</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">nafnið fyrir falda þjónustu þína (búið til sjálfkrafa)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">leyfa villuskráningu á verða búin til (verður að nota adb eða aLogCat til að skoða)</string>
+  <string name="project_home">Heimili Verkefni(sins):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor Leyfið</string>
+  <string name="https_torproject_org">https:torproject.org</string>
+  <string name="third_party_software">Hugbúnaður frá 3ja aðila:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Smáforrit vill opna falið port þjóns %S að Tor netinu. Þetta er öruggt ef þú treystir smáforritinu.</string>
+  <string name="found_existing_tor_process">fann annan Tor þráð...</string>
+  <string name="something_bad_happened">Eitthvað slæmt gerðist. Athugaðu skráninguna</string>
+  <string name="hidden_service_on">falin þjónusta á:</string>
+  <string name="unable_to_read_hidden_service_name">get ekki lesið nafn földu þjónustunnar</string>
+  <string name="unable_to_start_tor">Get ekki kveikt á Tor:</string>
+  <string name="unable_to_reset_tor">Endurræstu tækið þitt, ekki hægt að núllstilla Tor!</string>
+  <string name="pref_use_sys_iptables_title">Nota Upprunalegar IPtöflur</string>
+  <string name="pref_use_sys_iptables_summary">nota innbyggðar iptöflur binary í staðinn fyrir þær sem fylgja með Orbot</string>
+  <string name="error_installing_binares">Tor binary-in gátu ekki verið uppsettar eða uppfærðar.</string>
+  <string name="pref_use_persistent_notifications">Alltaf hafa smámynd í glugganum þegar Orbot er tengudr</string>
+  <string name="pref_use_persistent_notifications_title">Alltaf-Á Upplýsingar</string>
+  <string name="pref_use_expanded_notifications">Sýndu útvíkkaðar upplýsingar varðandi Tor útgangsland og IP tölu</string>
+  <string name="pref_use_expanded_notifications_title">Útvíkkaðar Upplýsingar</string>
+  <string name="notification_using_bridges">Brýr kveiktar!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Tungumál</string>
+  <string name="set_locale_summary">Veldu staðsetningu og tungumál fyrir Orbot</string>
+  <string name="wizard_locale_title">Veldu Tungumál</string>
+  <string name="wizard_locale_msg">Leyfa upprunalega eða skipta núverandi tungumáli</string>
+  <string name="powered_by">gert kleift af Tor</string>
+  <string name="btn_save_settings">Geyma Stillingar</string>
+  <string name="no_internet_connection_tor">Engin tenging við netið; Tor er í biðstöðu...</string>
+  <string name="bandwidth_">Bandvídd:</string>
+  <string name="down">niðri</string>
+  <string name="up">uppi</string>
+  <string name="pref_disable_network_title">Enginn Netkerfis Sjálfvirkur-Svefn</string>
+  <string name="pref_disable_network_summary">Svæfðu Tor þegar engin internet tenging er til staðar</string>
+  <string name="newnym">Þú ert komin með nýtt Tor auðkenni!</string>
+  <string name="menu_use_chatsecure">Nota ChatSecure</string>
+  <string name="permission_manage_tor_label">Stilla Tor</string>
+  <string name="permission_manage_tor_description">Leyfa þessu smáforriti að stjórna Tor þjónustunni</string>
+  <string name="install_apps_">Setja upp smáforrit?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Engin tenging við netið. Tor verður svæfður...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Tenging við netið er góð. Tor verður vakinn...</string>
+  <string name="updating_settings_in_tor_service">uppfæri stillingar í Tor þjónustu</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Port sem Tor býður SOCKS proxy á (upprunalegt: 9050 eða 0 til að slökkva)</string>
+  <string name="pref_socks_dialog">SOCK Port Stilling</string>
+  <string name="pref_transport_title">Tor GegnsærProxy Port</string>
+  <string name="pref_transport_summary">Port sem Tor býður Gegnsæjum Proxy á (upprunalegt: 9040 eða 0 til að slökkva)</string>
+  <string name="pref_transport_dialog">GegnsærProxy Port Stilling</string>
+  <string name="pref_dnsport_title">Tor DNS Port</string>
+  <string name="pref_dnsport_summary">Port sem Tor býður DNS á (upprunalegt: 5400 eða 0 til að slökkva)</string>
+  <string name="pref_dnsport_dialog">DNS Port Stilling</string>
+  <string name="pref_torrc_title">Torrc Mótanleg Stilling</string>
+  <string name="pref_torrc_summary">AÐEINS SÉRFRÆÐINGAR: sláðu inn beinar torrc stillingar línur</string>
+  <string name="pref_torrc_dialog">Mótanlegt Torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus - Benetech Mannréttinda Skjölunar Smáforrit</string>
+  <string name="your_tor_public_ips_">Tor Almennings IP tölurnar Þínar </string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Vinsamlegast slökktu á þessu smáforriti í Android->Settings->Apps ef þú ert í vandræðum með Orbot: </string>
+  <string name="app_conflict">Smáforrita Árekstur</string>
+  <string name="pref_transproxy_refresh_title">Gegnsærproxy Sjálfkrafa Endurnýjun</string>
+  <string name="pref_transproxy_refresh_summary">Endursetja Gegnsærproxy reglurnar þegar ástand netsins breytist</string>
+  <string name="pref_transproxy_flush_title">Gegnsærproxy ÞVINGUÐ FJARLÆGING</string>
+  <string name="pref_transproxy_flush_summary">Ýttu hér til að henda öllum gegnsærproxy net reglunum NÚNA</string>
+  <string name="transparent_proxy_rules_flushed_">Gegnsær proxy reglum hent!</string>
+  <string name="you_do_not_have_root_access_enabled">Þú ert ekki með RÓTAR aðgang kveikt</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Þú gætir þurft að stöðva og byrja Orbot til að stillinga breytingar taka gildi.</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Brýr Uppfærðar</string>
+  <string name="restart_orbot_to_use_this_bridge_">Vinsamlegast endurræstu Orbot til að breytingarnar taki gildi</string>
+  <string name="menu_qr">QR Kóðar</string>
+  <string name="bridge_mode">Brúar Viðmót</string>
+  <string name="get_bridges_email">Tölvupóstur</string>
+  <string name="get_bridges_web">Vefur</string>
+  <string name="activate">Virkja</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Þú getur leyft öllum smáforritum á tækinu þínu að fara í gegnum Tor netið með að nota VPN möguleikann í Android.\n\n*AÐVÖRUN* Þetta er ný, tilraunar möguleiki og í sumum tilfellum mun ekki byrja sjálfkrafa, eða geta stöðvast. Það ætti EKKI að notast fyrir nafnleysi, og AÐEINS notað til að komast í gegnum eldveggi og síur.</string>
+  <string name="send_email">Senda Tölvupóst</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Þú getur fengið brúar heimilisfang í gegnum tölvupóst, vefinn eða með að skanna brúar QR kóða. Veldu \'Tölvupóstur\' eða \'Vefur\' fyrir neðan til að óska eftir brúar heimilisfangi.\n\nÞegar þú hefur heimilisfang, afritaðu & límdu það inn í \'Brýr\' stillingu í stillingar og endurræsun í Orbot.</string>
+  <string name="standard_browser">Staðlaður Vafri</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">ATHUGAÐU: Aðeins staðlaðar Tor brýr virka á Intel X86/ATOM devices</string>
+</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
new file mode 100644
index 0000000..62f1455
--- /dev/null
+++ b/app/src/main/res/values-it/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot è un\'applicazione proxy che permette alle altre applicazioni di accedere a internet in maniera più sicura. Orbot usa Tor per cifrare il  traffico internet e lo nasconde poi facendolo rimbalzare attraverso una serie di computer attorno al mondo. Tor è un software libero e una rete aperta che aiuta a difendersi da una forma di sorveglianza della rete conosciuta come analisi del traffico. Quest\'ultima minaccia libertà e privacy personale, attività commerciali riservate, rapporti interpersonali, e persino la sicurezza di stato.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">avvia e ferma Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot è in esecuzione...</string>
+  <string name="status_activated">Connesso alla rete Tor</string>
+  <string name="status_disabled">\"Orbot è disattivato</string>
+  <string name="status_shutting_down">TorService si sta spegnendo</string>
+  <string name="tor_process_starting">Avvio client Tor...</string>
+  <string name="tor_process_complete">completa.</string>
+  <string name="tor_process_waiting">attesa.</string>
+  <string name="not_anonymous_yet">ATTENZIONE: Il traffico non è ancora anonimo! Configura le applicazioni per utilizzare il proxy HTTP 127.0.0.1:8118,  SOCKS4A o proxy SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Home</string>
+  <string name="menu_browse">Sfoglia</string>
+  <string name="menu_settings">Impostazioni</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Aiuto</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Avvio</string>
+  <string name="menu_stop">Ferma</string>
+  <string name="menu_about">About</string>
+  <string name="menu_promo_apps">Installa apps...</string>
+  <string name="main_layout_download">Download (velocità/totale)</string>
+  <string name="main_layout_upload">Upload (velocità/totale)</string>
+  <string name="button_help">Aiuto</string>
+  <string name="button_close">Chiudi</string>
+  <string name="button_about">About</string>
+  <string name="button_clear_log">Cancella log</string>
+  <string name="menu_verify">Controlla</string>
+  <string name="menu_exit">Esci</string>
+  <string name="menu_scan">Scansiona BridgeQR</string>
+  <string name="menu_share_bridge">Condividi BridgeQR</string>
+  <string name="press_to_start">- tieni premuto per avviare -</string>
+  <string name="pref_trans_proxy_group">Proxying trasparente (Richiede root)</string>
+  <string name="pref_trans_proxy_title">Proxying trasparente</string>
+  <string name="pref_trans_proxy_summary">Torifying automatico delle app</string>
+  <string name="pref_transparent_all_title">Tor ovunque</string>
+  <string name="pref_transparent_all_summary">Traffico proxy di tutte le app attraverso Tor</string>
+  <string name="pref_transparent_port_fallback_title">Fallback porte proxy</string>
+  <string name="pref_transparent_port_fallback_summary">ATTENZIONE: Aggira le porte comuni (80, 443, ecc). *USARE SOLO* se le modalità \'All\' o \'App\' non funzionano.</string>
+  <string name="pref_transparent_port_title">Elenco porte</string>
+  <string name="pref_transparent_port_summary">Lista di porte per cui fare proxy. *USARE SOLO* se le modalità \'All\' o \'App\' non funzionano.</string>
+  <string name="pref_transparent_port_dialog">Inserisci porte da proxare</string>
+  <string name="pref_has_root">Richiesto accesso root</string>
+  <string name="pref_has_root_summary">Richiede il root per il proxying trasparente</string>
+  <string name="status_install_success">I binari di Tor sono stati installati con successo!</string>
+  <string name="status_install_fail">I file binari di Tor non possono essere installati. Controlla i log e notifica l\'accaduto su tor-assistants at torproject.org</string>
+  <string name="title_error">Errore applicazione</string>
+  <string name="wizard_title">Benvenuti in Orbot</string>
+  <string name="wizard_btn_tell_me_more">About Orbot</string>
+  <string name="btn_next">Avanti</string>
+  <string name="btn_back">Indietro</string>
+  <string name="btn_finish">Fine</string>
+  <string name="btn_okay">Ok</string>
+  <string name="btn_cancel">Annulla</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Alcuni dettagli su Orbot</string>
+  <string name="wizard_details_msg">Orbot è un\'app open-source contenente Tor, LibEvent e Polipo. Fornisce un proxy HTTP locale (8118) e un proxy SOCKS (9050) nella rete Tor. Orbot, solo sui dispositivi con permessi di ROOT, offre anche la possibilità di veicolare tutto il traffico attraverso Tor.</string>
+  <string name="wizard_permissions_root">Permesso concesso</string>
+  <string name="wizard_permissions_stock">Permessi Orbot</string>
+  <string name="wizard_premissions_msg_root">Eccellente! Abbiamo rilevato la presenza dei permessi di root attivati per Orbot. Useremo questi poteri con saggezza.</string>
+  <string name="wizard_permissions_msg_stock">Anche se non è richiesto, Orbot può diventare uno strumento ancora più potente se il dispositivo ha accesso come root. Utilizza il pulsante qui sotto per concedere i superpoteri a Orbot!</string>
+  <string name="wizard_permissions_no_root">Se non hai i permessi root o non hai idea di cosa siano, assicurati solamente di utilizzare applicazioni fatte per lavorare con Orbot.</string>
+  <string name="wizard_permissions_consent">Ho capito e desidero continuare senza il root</string>
+  <string name="wizard_permission_enable_root">Concedi permessi root a Orbot</string>
+  <string name="wizard_configure">Configura Torification</string>
+  <string name="wizard_configure_msg">Orbot dà la possibilità di instradare tutto il traffico delle applicazioni tramite Tor o scegliere le applicazioni singolarmente.</string>
+  <string name="wizard_configure_all">Usa Tor come proxy per tutte le applicazioni.</string>
+  <string name="wizard_configure_select_apps">Seleziona singole App per Tor</string>
+  <string name="wizard_tips_tricks">App abilitate per Orbot</string>
+  <string name="wizard_tips_msg">Ti invitiamo a scaricare & usare app che possono connettersi direttamente a Orbot. Fai click sui pulsanti qui sotto per installare.</string>
+  <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="wizard_tips_twitter">Twitter supporta il proxy http \"localhost:8118\"</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Crea una storia e lascia a Tor la sicurezza!</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>
+  <string name="wizard_proxy_help_msg">Se l\'app Android che stai usando supporta l\'uso di Proxy HTTP o SOCKS, allora puoi configurarle per connettersi a Orbot e usare Tor.\n\n\n L\'impostazione host è 127.0.0.1 o \"localhost\". Per l\'HTTP, il valore della porta è 8118. Per SOCKS, il proxy è 9050. Dovresti utilizzare SOCKS4A o SOCKS5 se possibile.\n \n\n\n PPuoi imparare altro sul proxying in Android tramite le FAQ: http://tinyurl.com/proxyandroid</string>
+  <string name="wizard_final">Orbot è pronto!</string>
+  <string name="wizard_final_msg">Milioni di persione in giro per il mondo usano Tor per un\'ampia varietà di ragioni.\n\nGiornalisti e blogger, difensori dei diritti umani, ufficiali delle forze dell\'ordine, soldati, aziende, cittadini di paesi repressivi, e anche cittadini qualunque... e ora sei pronto a farlo anche tu!</string>
+  <string name="wizard_exit_at_first_screen_toast">Perfavore configura Orbot prima di iniziare ad usarlo!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Ti sei collegato correttamente alla rete Tor - ma questo NON significa che il tuo dispositivo è sicuro. È possibile utilizzare l\'opzione \'Browser\' dal menù per testare il browser. \n\nVisita il nostro sito web https://guardianproject.info/apps/orbot o invia una mail a help at guardianproject.info per saperne di più.</string>
+  <string name="tor_check">Si aprirà il browser web predefinito per https://check.torproject.org per controllare se Orbot probabilmente è configurato e si è connessi a Tor.</string>
+  <string name="pref_hs_group">Servizi nascosti</string>
+  <string name="pref_general_group">Generale</string>
+  <string name="pref_start_boot_title">Avvia Orbot al boot</string>
+  <string name="pref_start_boot_summary">Avvia automaticamente Orbot e connetti Tor quando il dispositivo Android viene avviato</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot porta Tor su Android!\n\nTor ti aiuta a difenderti da filtraggio di contenuti, analisi del traffico e sorveglianza della rete che minacciano la privacy, informazioni personali e relazioni personali.\n\nQuesta procedura guidata ti aiuterà a configurare Orbot e Tor sul tuo dispositivo.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Attenzione</string>
+  <string name="wizard_warning_msg">La semplice installazione di Orbot non renderà anonimo il tuo traffico di rete mobile.\n\nDevi configurare correttamente Orbot, il tuo dispositivo e le altre applicazioni per usare Tor efficacemente.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permessi</string>
+  <string name="wizard_permissions_root_msg1">Opzionalmente, è possibile concedere ad Orbot l\'accesso da superutente per abilitare funzionalità avanzate come il proxying trasparente.</string>
+  <string name="wizard_permissions_root_msg2">Se non si vuole intraprendere questa scelta, ci si assicuri di utilizzare applicazioni fatte per funzionare con Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Il vostro dispositivo non sembra essere rooted o fornire accesso da \'Superutente\'.\n\nPerfavore prova invece la modalità \'App\' nella schermata principale.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox: Browser progettato per la privacy che funziona attraverso Tor</string>
+  <string name="wizard_tips_play">Cerca tutte le app del Guardian Project su Google Play</string>
+  <string name="wizard_tips_fdroid">Trova tutte le app Guardian Projec su F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Trova tutte le app Guardian Project su https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxying trasparente</string>
+  <string name="wizard_transproxy_msg">Questo permette alle tue applicazioni di passare automaticamente attraverso la rete Tor senza necessità di ulteriore configurazione.</string>
+  <string name="wizard_transproxy_hint">(Seleziona questa casella se non hai idea di quello di cui stiamo parlando)</string>
+  <string name="wizard_transproxy_none">Nessuno</string>
+  <string name="pref_transparent_tethering_title">Tethering Tor</string>
+  <string name="pref_transparent_tethering_summary">Abilita il proxying trasparente di Tor per i dispositivi connessi in tethering via WiFi e USB (necessita di riavvio)</string>
+  <string name="button_grant_superuser">Richiede accesso superuser</string>
+  <string name="pref_select_apps">Seleziona app</string>
+  <string name="pref_select_apps_summary">Scegli le applicazioni da utilizzare attraverso Tor</string>
+  <string name="pref_node_configuration">Configurazione nodo</string>
+  <string name="pref_node_configuration_summary">Questi sono parametri di configurazione avanzati che possono ridurre il vostro anonimato</string>
+  <string name="pref_entrance_node">Nodi di entrata</string>
+  <string name="pref_entrance_node_summary">Identificativi, nicknames, paesi ed indirizzi del primo hop</string>
+  <string name="pref_entrance_node_dialog">Inserisci nodi di entrata</string>
+  <string name="pref_allow_background_starts_title">Permetti Avvii in Background</string>
+  <string name="pref_allow_background_starts_summary">Permetti a qualsiasi app di comunicare ad Orbot di avviare Tor e servizi relativi</string>
+  <string name="button_proxy_all">Proxa tutto</string>
+  <string name="button_proxy_none">Non proxare niente</string>
+  <string name="button_invert_selection">Inverti selezione</string>
+  <string name="pref_proxy_title">Proxy di Rete in Uscita (Facoltativo)</string>
+  <string name="pref_proxy_type_title">Tipo proxy</string>
+  <string name="pref_proxy_type_summary">Protocolli da utilizzare per i server proxy: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Inserisci tipo proxy</string>
+  <string name="pref_proxy_host_title">Host proxy</string>
+  <string name="pref_proxy_host_summary">Hostname server proxy</string>
+  <string name="pref_proxy_host_dialog">Inserire l\'host del proxy</string>
+  <string name="pref_proxy_port_title">Porta proxy</string>
+  <string name="pref_proxy_port_summary">Porta del server proxy</string>
+  <string name="pref_proxy_port_dialog">Inserire la porta del proxy</string>
+  <string name="pref_proxy_username_title">Nome Utente del Proxy in Uscita</string>
+  <string name="pref_proxy_username_summary">Nome Utente del Proxy (Facoltativo)</string>
+  <string name="pref_proxy_username_dialog">Inserisci Nome Utente del Proxy</string>
+  <string name="pref_proxy_password_title">Password del Proxy in Uscita</string>
+  <string name="pref_proxy_password_summary">Password del Proxy (Facoltativo)</string>
+  <string name="pref_proxy_password_dialog">Inserisci Password Proxy</string>
+  <string name="status">Stato</string>
+  <string name="setting_up_full_transparent_proxying_">Configurazione del proxying completamente trasparente...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Configurazione del proxying trasparente basato su applicazione...</string>
+  <string name="transparent_proxying_enabled">Proxying trasparente ABILITATO</string>
+  <string name="transproxy_enabled_for_tethering_">Proxying trasparente abilitato per il tethering</string>
+  <string name="warning_error_starting_transparent_proxying_">AVVERTIMENTO: errore nell\'avvio del TransProxy!</string>
+  <string name="transproxy_rules_cleared">Regole del TransProxy cancellate</string>
+  <string name="couldn_t_start_tor_process_">Impossibile avviare il processo Tor:</string>
+  <string name="privoxy_is_running_on_port_">Polipo è in esecuzione sulla porta:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Configurazione del proxying trasparente basato su porta...</string>
+  <string name="bridge_error">Errore bridge</string>
+  <string name="bridge_requires_ip">Al fine di utilizzare la funzionalità bridge, è necessario inserire almeno l\'indirizzo IP di un bridge.</string>
+  <string name="send_email_for_bridges">Si consiglia di inviare una email a bridges at torproject.org con la linea \"get bridges\" da sola nel corpo del messaggio da un account gmail.</string>
+  <string name="error">Errore</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">La tua configurazione dell\'indirizzo raggiungibile ha causato un\'eccezione!</string>
+  <string name="your_relay_settings_caused_an_exception_">La configurazione del tuo relay ha causato un\'eccezione!</string>
+  <string name="exit_nodes">Nodi di uscita</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Identificatori, nicknames, paesi ed indirizzi per l\'ultimo hop</string>
+  <string name="enter_exit_nodes">Inserire i nodi d\'uscita</string>
+  <string name="exclude_nodes">Escludere i nodi</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Identificatori, nicknames, paesi ed indirizzi da escludere</string>
+  <string name="enter_exclude_nodes">Inserire i nodi da escludere</string>
+  <string name="strict_nodes">Nodi specifici</string>
+  <string name="use_only_these_specified_nodes">Utilizza *solo* i nodi specificati</string>
+  <string name="bridges">Ponti</string>
+  <string name="use_bridges">Utilizza i bridge</string>
+  <string name="bridges_obfuscated">Bridge mascherati</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Abilita nodi alternati in entrata nella rete Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Attiva se i Bridge configurati sono mascherati</string>
+  <string name="ip_address_and_port_of_bridges">Indirizzo IP e porta dei bridge</string>
+  <string name="enter_bridge_addresses">Inserire gli indirizzi dei bridge</string>
+  <string name="relays">Relays</string>
+  <string name="relaying">Relaying</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Abilita il tuo dispositivo per essere un relay non di uscita</string>
+  <string name="relay_port">Porta del relay</string>
+  <string name="listening_port_for_your_tor_relay">Porta in ascolto per il proprio Tor relay</string>
+  <string name="enter_or_port">Inserire la porta OR</string>
+  <string name="relay_nickname">Nickname del relay</string>
+  <string name="the_nickname_for_your_tor_relay">Il nickname per il proprio relay Tor</string>
+  <string name="enter_a_custom_relay_nickname">Inserire un nickname personalizzato per il relay</string>
+  <string name="reachable_addresses">Indirizzo raggiungibile</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Esegui come un client dietro un firewall con politiche restrittive</string>
+  <string name="reachable_ports">Porte raggiungibili</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Porte raggiungibili dietro un firewall restrittivo</string>
+  <string name="enter_ports">Inserisci porte</string>
+  <string name="enable_hidden_services">Abilita servizi nascosti</string>
+  <string name="run_servers_accessible_via_the_tor_network">esegui server accessibili attraverso la rete Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">inserire la porta per l\'host locale per i servizi nascosti</string>
+  <string name="hidden_service_ports">Porta per i servizi nascosti</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">il nome di indirizzamento per i propri servizi nascosti (generato automaticamente)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">abilita i log di debug in output (richiede l\'uso di adb o aLogCat per esser visualizzato)</string>
+  <string name="project_home">Home progetto:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Licenza Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Software di terze parti:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Un applicazione ha richiesto di aprire la porta per servizi nascosti %S alla rete Tor. Questo è sicuro se ci si fida dell\'applicazione.</string>
+  <string name="found_existing_tor_process">trovato un processo Tor esistente...</string>
+  <string name="something_bad_happened">E\' accaduto un evento indesiderato. Controllare i log.</string>
+  <string name="hidden_service_on">servizio nascosto attivo:</string>
+  <string name="unable_to_read_hidden_service_name">Impossibile leggere il nome del servizio nascosto.</string>
+  <string name="unable_to_start_tor">Impossibile avviare Tor:</string>
+  <string name="unable_to_reset_tor">Riavvia il tuo dispositivo, impossibile resettare Tor!</string>
+  <string name="pref_use_sys_iptables_title">Utilizza Iptables di default</string>
+  <string name="pref_use_sys_iptables_summary">utilizza il binario di iptables installato invece di quello fornito con Orbot</string>
+  <string name="error_installing_binares">Non è stato possibile installare o aggiornare i binari di Tor.</string>
+  <string name="pref_use_persistent_notifications">Mantieni sempre l\'icona nella barra degli strumenti quando Orbot è connesso.</string>
+  <string name="pref_use_persistent_notifications_title">Notifiche sempre attive</string>
+  <string name="pref_use_expanded_notifications">Visualizza notifica espansa con nazione e ip dell\'nodo d\'uscita Tor</string>
+  <string name="pref_use_expanded_notifications_title">Espandi notifiche</string>
+  <string name="notification_using_bridges">Bridge attivati!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Lingua</string>
+  <string name="set_locale_summary">Scegli le impostazioni internazionali e la lingua di Orbot</string>
+  <string name="wizard_locale_title">Scegli Lingua</string>
+  <string name="wizard_locale_msg">Lasciare la predefinita o cambiare la lingua corrente</string>
+  <string name="powered_by">powered by Tor</string>
+  <string name="btn_save_settings">Salva impostazioni</string>
+  <string name="no_internet_connection_tor">Nessuna connessione ad internet; Tor è in standby...</string>
+  <string name="bandwidth_">Larghezza di Banda:</string>
+  <string name="down">giù</string>
+  <string name="up">su</string>
+  <string name="pref_disable_network_title">impedire spegnimento automatico della rete</string>
+  <string name="pref_disable_network_summary">Stand-by di Tor quando non c\'è un collegamento a internet disponibile</string>
+  <string name="newnym">Sei passato a una nuova identità Tor!</string>
+  <string name="menu_verify_browser">Browser</string>
+  <string name="menu_use_chatsecure">Usa ChatSecure</string>
+  <string name="permission_manage_tor_label">Gestisci Tor</string>
+  <string name="permission_manage_tor_description">Abilita questa app per controllare il servizio Tor</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Non sembra che tu abbia Orfox installato. Necessiti di aiuto, o apro semplicemente il browser?</string>
+  <string name="install_apps_">Installare applicazioni?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Nessuna connettività di rete. Mettendo Tor a riposo...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Connettività di rete buona. Svegliando Tor...</string>
+  <string name="updating_settings_in_tor_service">aggiornamento impostazioni nel servizio Tor</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Porta sulla quale Tor offre il proxy SOCKS (default: 9050 o 0 per disabilitare)</string>
+  <string name="pref_socks_dialog">Configurazione Porta SOCKS</string>
+  <string name="pref_transport_title">Porta TransProxy Tor</string>
+  <string name="pref_transport_summary">Porta sulla quale Tor offre il Proxy Trasparente (default: 9040 o 0 per disabilitare)</string>
+  <string name="pref_transport_dialog">Configurazione Porta TransProxy</string>
+  <string name="pref_dnsport_title">Porte Tor DNS</string>
+  <string name="pref_dnsport_summary">Porta sulla quale Tor offre i DNS (default: 5400 o 0 per disabilitare)</string>
+  <string name="pref_dnsport_dialog">Configurazione porte DNS</string>
+  <string name="pref_torrc_title">Configurazioni personalizzate di Torrc</string>
+  <string name="pref_torrc_summary">SOLO ESPERTI: inserisci direttamente configurazioni torrc</string>
+  <string name="pref_torrc_dialog">Torrc personalizzate</string>
+  <string name="wizard_tips_martus">Mobile Martus - App per la Documentazione dei Diritti Umani Benetech</string>
+  <string name="your_tor_public_ips_">Il tuo Tor IP pubblico è:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Perfavore disabilita quest\'app in Android->Impostazioni->Apps se stai avendo problemi con Orbot: </string>
+  <string name="app_conflict">Conflitto app</string>
+  <string name="pref_transproxy_refresh_title">Auto-Refresh TransProxy</string>
+  <string name="pref_transproxy_refresh_summary">Ri-applica regole Transproxy quando cambia lo stato della rete</string>
+  <string name="pref_transproxy_flush_title">FORZA RIMOZIONE Transproxy</string>
+  <string name="pref_transproxy_flush_summary">Clicca qui per eliminare tutte le regole di rete Transproxy IMMEDIATAMENTE</string>
+  <string name="transparent_proxy_rules_flushed_">Regole Proxy Trasparente eliminate!</string>
+  <string name="you_do_not_have_root_access_enabled">Non ci sono i permessi di ROOT abilitati</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Potrebbe essere necessario riavviare Orbot per applicare i cambiamenti delle impostazioni.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Bridge attivati</string>
+  <string name="restart_orbot_to_use_this_bridge_">Per favore riavvia Orbot per rendere effettive le modifiche</string>
+  <string name="menu_qr">Codici QR</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Se la tua rete cellulare blocca attivamente Tor puoi utilizzare un Bridge per accedere alla rete. Seleziona uno dei tipi di bridge da sopra per attivare i bridge</string>
+  <string name="bridge_mode">Modalità Bridge</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Attiva</string>
+  <string name="apps_mode">Modalità VPN per le applicazioni</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Puoi configurare tutte le app del tuo dispositivo per connettersi attraverso la rete Tor usando la modalità VPN di Android.\n\n*ATTENZIONE* Questa è una funzione nuova e sperimentale, in alcuni potrebbe non avviarsi in automatico o fermarsi. NON dovrebbe essere usata per l\'anonimato ma solo per bypassare filtri e firewall.</string>
+  <string name="send_email">Invia email</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Tu poi ricevere un indirizzo bridge via email, web o scansionando un codice QR. Seleziona \'Email\' o \'Web\' per richiedere un indirizzo bridge.\n\nUna volta che hai un indirizzo, copialo & incollalo nell\'opzione \"Bridges\" delle impostazioni di Orbot e riavvialo.</string>
+  <string name="install_orweb">Installa Orfox</string>
+  <string name="standard_browser">Browser standard</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTA: Solo i Tor Bridges standard funzionano sui dispositivi Intel x86/Atom</string>
+  <string name="vpn_default_world">Mondo</string>
+</resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
new file mode 100644
index 0000000..e5e33f9
--- /dev/null
+++ b/app/src/main/res/values-iw/strings.xml
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot הינה אפליקציית פרוקסי חינמית המאפשרת לאפליקציות אחרות להשתמש באינטרנט בבטחה. Orbot נעזרת ב-Tor כדי להצפין את תעבורת האינטרנט שלך ולהסוותה באמצעותה ניתובה דרך מספר מחשבים ברחבי העולם. Tor היא תוכנה חופשית ורשת פתוחה המסייעת לך להתגונן מפני סוגים מסוימים של אמצעי ניטור ומעקב אחר רשת האינטרנט המאיימים על הפרטיות, החירות האישית, פעילויות עסקיות ומערכות יחסים חשאיות.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">התחל ועצור את Tor</string>
+  <string name="tor_proxy_service_process">שירות פרוקסי Tor</string>
+  <string name="status_starting_up">Orbot מתחיל…</string>
+  <string name="status_activated">מחובר לרשת Tor</string>
+  <string name="status_disabled">Orbot כבוי</string>
+  <string name="tor_process_starting">מתחיל לקוח Tor...</string>
+  <string name="tor_process_complete">הושלם.</string>
+  <string name="tor_process_waiting">מחכה.</string>
+  <string name="not_anonymous_yet">אזהרה: התעבורה שלך אינה אנונימית עדיין! בבקשה הגדר את האפליקציות שלך כך שיתאפשר שימוש בפרוקסי HTTP (קרי 127.0.0.1:8118) או SOCKS4A או SOCKS5 (קרי 127.0.0.1:9050)</string>
+  <string name="menu_home">בית</string>
+  <string name="menu_browse">דפדף</string>
+  <string name="menu_settings">הגדרות</string>
+  <string name="menu_log">רישום</string>
+  <string name="menu_info">עזרה</string>
+  <string name="menu_start">התחל</string>
+  <string name="menu_stop">עצור</string>
+  <string name="menu_about">אודות</string>
+  <string name="main_layout_download">הורדה</string>
+  <string name="main_layout_upload">העלאה</string>
+  <string name="button_help">עזרה</string>
+  <string name="button_close">סגור</string>
+  <string name="button_about">אודות</string>
+  <string name="button_clear_log">נקה רישום</string>
+  <string name="menu_verify">בדוק</string>
+  <string name="menu_exit">יציאה</string>
+  <string name="menu_scan">סרוק BridgeQR</string>
+  <string name="menu_share_bridge">שתף BridgeQR</string>
+  <string name="press_to_start">-נגיעה ארוכה להתחלה-</string>
+  <string name="pref_trans_proxy_group">פרוקסי שקוף (שורש נדרש)</string>
+  <string name="pref_trans_proxy_title">פרוקסי שקוף</string>
+  <string name="pref_trans_proxy_summary">עבודה אוטומטית עם אפליקציות דרך Tor</string>
+  <string name="pref_transparent_all_title">הכל דרך Tor</string>
+  <string name="pref_transparent_all_summary">תעבור דרך פרוקסי  עבור כל האפליקציות דרך Tor</string>
+  <string name="pref_transparent_port_fallback_title">מפלט פורט פרוקסי</string>
+  <string name="pref_transparent_port_fallback_summary">אזהרה: עקוף פורטים נפוצים (80,443 וכו\'). *השתמש רק* אם האופנים \'All\' או \'App\'  לא עובדים.</string>
+  <string name="pref_transparent_port_title">רשימת פורטים</string>
+  <string name="pref_transparent_port_summary">רשימת פורטים לפרוקסי. *השתמש רק* אם האופנים \'All\' או \'App\'  לא עובדים.</string>
+  <string name="pref_transparent_port_dialog">הזן פורטים לפרוקסי</string>
+  <string name="pref_has_root">דרושה גישת שורש</string>
+  <string name="pref_has_root_summary">בקש גישה עליונה עבור שימוש בפרוקסי שקוף</string>
+  <string name="status_install_success">קבצים ברי הרצה של Tor הותקנו בהצלחה!</string>
+  <string name="status_install_fail">הקבצים ברי ההרצה של Tor לא ניתנו להתקנה. בבקשה בדוק את הלוג והודע ל 
+tor-assistants at torproject.org</string>
+  <string name="title_error">שגיאת אפליקציה</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">אודות Orbot</string>
+  <string name="btn_next">הבא</string>
+  <string name="btn_back">הקודם</string>
+  <string name="btn_finish">סיים</string>
+  <string name="btn_okay">אישור</string>
+  <string name="btn_cancel">ביטול</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">פרטים מסוימים של Orbot </string>
+  <string name="wizard_details_msg">Orbot היא אפליקציית קוד פתוח הכוללת את Tor, LibEvent ו-Polipo. היא מתחבר לרשת Tor באמצעות שרת פרוקסי HTTP מקומי (8118) ושרת פרוקסי SOCKS (פורט 9050). Orbot יכולה בנוסף עם הרשאות רוט לנתב את כל תעבורת האינטרנט של המכשיר דרך Tor כברירת מחדל.</string>
+  <string name="wizard_permissions_root">ניתנה הרשאה</string>
+  <string name="wizard_permissions_stock">הרשאות Orbot</string>
+  <string name="wizard_premissions_msg_root">מצוין! גילינו כי יש לך הרשאות שורש מאופשרות בשביל Orbot. אנחנו נשתמש בכוח הזה בחוכמה.</string>
+  <string name="wizard_permissions_msg_stock">בזמן שזה לא נדרש, Orbot יכולה להפוך להיות כלי חזק יותר אם למכשיר שלך יש גישה עליונה. תשתמש בכפתור למטה כדי לקבל כוחות על של Orbot !</string>
+  <string name="wizard_permissions_no_root">אם אין לך גישה עליונה או אין לך מושג על מה אנחנו מדברים, רק תוודא שתשתמש באפליקציות שנועדו לעבוד עם Orbot.</string>
+  <string name="wizard_permissions_consent">הבנתי ואני מעדיף להמשיך בלי Superuser</string>
+  <string name="wizard_permission_enable_root">אפשר גישת שורש עבור Orbot</string>
+  <string name="wizard_configure">הגדר עבודה באמצעות Tor</string>
+  <string name="wizard_configure_msg">Orbot נותנת לך אפשרות לכוון את כל תעבורת האפליקציות דרך Tor או לבחור את האפליקציות שלך בנפרד.</string>
+  <string name="wizard_configure_all">השתמש בפרוקסי בכל האפליקציות דרך Tor</string>
+  <string name="wizard_configure_select_apps">בחר אפליקציות מסוימות עבור Tor</string>
+  <string name="wizard_tips_tricks">Orbot מתאפשר על ידי אפליקציות</string>
+  <string name="wizard_tips_msg">האפליקציות מתחת פותחו לעבודה עם Orbot. לחץ על כל כפתור להתקנה מיידית, או שאתה יכול למצוא אותם אחר כך ב Google Play, באתר GuardianProject.info או
+דרך  F-Droid.org</string>
+  <string name="wizard_tips_otrchat">ChatSecure - תוכנת מסרים מידיים מאובטחת לאנדרואיד</string>
+  <string name="wizard_tips_proxy">הגדרות פרוקסי - למד איך להגדיר אפליקציות לעבוד עם Orbot</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo אפליקציית מנוע חיפוש</string>
+  <string name="wizard_tips_twitter">קבע פרוקסי Twitter למארח \"localhost\" ולפורט 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - מערך שיעורים לעיתונאים על שימוש ב-Tor להגנה על עבודתם.</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_proxy_help_msg">אם אפליקצת האנדרואיד שאתה משתמש תומכת בפרוקסי מבוסס HTTP או SOCKS, תוכל להגדיר אותה לעבוד עם Orbot תחת Tor. \n\n\n ההגדרות הן: שם השרת הוא 127.0.0.1 או \"localhost\". עבור HTTP, הפורט הוא 8118. עבור SOCKS, הפורט הוא 9050. עליך להשתמש בSOCKS4A או SOCKS5 אם אפשר.\n \n\n\n תוכל ללמוד עוד אודות פרוקסי באנדרואיד תחת עמוד השאלות הנפוצות שלנו בכתובת: http://tinyurl.com/proxyandroid </string>
+  <string name="wizard_final">Orbot מוכן!</string>
+  <string name="wizard_final_msg">מיליוני אנשים ברחבי העולם משתמשים בTor מסיבות רבות.\n\n עיתונאים ובלוגרים, פעילי זכויות אדם, שוטרים, חיילים, תאגידים, אזרחי במשטרים מדוגאים וגם אזרחים פשוטים... ועכשיו גם אתה!</string>
+  <string name="wizard_exit_at_first_screen_toast">אנא הגדר את Orbot לפני שתוכל להתחיל להשתמש בה!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">דבר זה יוביל את דפדפן הרשת שלך למוד https://check.torproject.org כדי לראות אם Orbot הוגדרה כראוי וכן כי אתה מחובר לרשת Tor.</string>
+  <string name="pref_hs_group">איחסון שירותים נסתרים</string>
+  <string name="pref_general_group">כללי</string>
+  <string name="pref_start_boot_title">התחל את Orbot בהדלקת המכשיר</string>
+  <string name="pref_start_boot_summary">התחל את Orbot והתחבר לרשת Tor אוטומטית כאשר המכשיר נדלק</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">אזהרה</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">הרשאות</string>
+  <string name="wizard_permissions_root_msg1">אתה יכול להעניק לאפליקציה Orbot גישת \'Superuser\' כדי לאפשר מאפיינים מתקדמים כמו למשל, פרוקסי שקוף.</string>
+  <string name="wizard_permissions_root_msg2">אם אתה לא רוצה לעשות את זה, אנא הקפד להשתמש באפליקציות שיועדו לעבוד עם Orbot</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot-יישומים מופעלים</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: אפליקציית מסרים עם הצפנת Off-the-Record</string>
+  <string name="wizard_tips_play">מצא את כל אפליציות Guardian Project אצל Google Play</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">פרוקסי שקוף</string>
+  <string name="wizard_transproxy_msg">זה מאפשר לאפליקציות שלך לרוץ באופן אוטומטי דרך רשת Tor ללא כל תצורה.</string>
+  <string name="wizard_transproxy_hint">(סמן תיבה זו אם אין לך מושג על מה אנחנו מדברים)</string>
+  <string name="wizard_transproxy_none">כלום</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">מאפשר עבודה עם פרוקסי שקוף עבור רשת אלחוטית ומכשירי  USB Tethered (דורש אתחול מחדש)</string>
+  <string name="button_grant_superuser">דרוש אישור Superuser</string>
+  <string name="pref_select_apps">בחר אפלקציות</string>
+  <string name="pref_select_apps_summary">בחר אפלקציות</string>
+  <string name="pref_node_configuration">הגדרות Node</string>
+  <string name="pref_node_configuration_summary">קיימות הגדרות מתקדמות שיכולות להפחית את האנונימיות שלך</string>
+  <string name="pref_entrance_node">Entrance Nodes</string>
+  <string name="pref_entrance_node_summary">טביעות אצבע, כינויים, ארצות וכתובות עבור המעבר הראשון</string>
+  <string name="pref_entrance_node_dialog">הכנס Entrance Nodes</string>
+  <string name="button_proxy_all">העבר הכל דרך פרוקסי</string>
+  <string name="button_proxy_none">אל תשתמש בפרוקסי</string>
+  <string name="button_invert_selection">הפוך בחירה</string>
+  <string name="pref_proxy_type_title">Outbound Proxy Type</string>
+  <string name="pref_proxy_type_summary">פרוטוקול שימוש בשרת פרוקסי:  HTTP, HTTPS, Socks4,Socks5</string>
+  <string name="pref_proxy_type_dialog">סוג הפרוקסי</string>
+  <string name="pref_proxy_host_title">מארח של Outbound Proxy</string>
+  <string name="pref_proxy_host_summary">שם מארח שרת פרוקסי</string>
+  <string name="pref_proxy_host_dialog">הכנס מארח פרוקסי</string>
+  <string name="pref_proxy_port_title">פורט של Outbound Proxy</string>
+  <string name="pref_proxy_port_summary">פורט שרת פרוקסי</string>
+  <string name="pref_proxy_port_dialog">הכנס פורט של פרוקסי</string>
+  <string name="pref_proxy_username_title">שם משתמש של Outbound Proxy</string>
+  <string name="pref_proxy_username_summary">שם משתמש פרוקסי (רשות)</string>
+  <string name="pref_proxy_username_dialog">הזן שם משתמש פרוקסי</string>
+  <string name="pref_proxy_password_title">סיסמא של Outbound Proxy</string>
+  <string name="pref_proxy_password_summary">סיסמת פרוקסי (רשות)</string>
+  <string name="pref_proxy_password_dialog">הזן סיסמת פרוקסי</string>
+  <string name="status">סטטוס</string>
+  <string name="setting_up_full_transparent_proxying_">הכנה של הפרוקסי השקוף...</string>
+  <string name="setting_up_app_based_transparent_proxying_">הכנה של הפרוקסי השקוף מבוסס אפליקציות...</string>
+  <string name="transparent_proxying_enabled">פרוקסי שקוף מאופשר</string>
+  <string name="transproxy_enabled_for_tethering_">פרוקסי שקוף מאופשר ל Tathering!</string>
+  <string name="warning_error_starting_transparent_proxying_">אזהרה: שגיאה התחילה את הפרוקסי השקוף!</string>
+  <string name="transproxy_rules_cleared">כללי TransProxy טוהרו</string>
+  <string name="couldn_t_start_tor_process_">אין אפשרות להתחיל תהליך Tor:</string>
+  <string name="privoxy_is_running_on_port_">Polipo רץ על פורט:</string>
+  <string name="setting_up_port_based_transparent_proxying_">הכנה של הפרוקסי השקוף מבוסס פורט...</string>
+  <string name="bridge_error">שגיאת גשר</string>
+  <string name="error">שגיאה</string>
+  <string name="exit_nodes">צמתי יציאה</string>
+  <string name="enter_exit_nodes">הזן צמתי יציאה</string>
+  <string name="exclude_nodes">צמתים מוצאים</string>
+  <string name="enter_exclude_nodes">הזן צמתים מוצאים</string>
+  <string name="strict_nodes">צמתים קפדנים</string>
+  <string name="use_only_these_specified_nodes">השתמש *רק* בצמתים מצוינים אלו</string>
+  <string name="bridges">גשרים</string>
+  <string name="use_bridges">השתמש בגשרים</string>
+  <string name="bridges_obfuscated">גשרים מעורפלים</string>
+  <string name="ip_address_and_port_of_bridges">כתובת ה-IP ויציאה של הגשרים</string>
+  <string name="enter_bridge_addresses">הכנס כתובות גשר</string>
+  <string name="relays">ממסרים</string>
+  <string name="relaying">ממסור</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">אפשר למכשיר שלך להיות תחנת ממסר שאיננה יציאה</string>
+  <string name="relay_port">פורט הממסר</string>
+  <string name="listening_port_for_your_tor_relay">פורט מאזין עבור Tor relay</string>
+  <string name="enter_or_port"> הכנס יציאת OR</string>
+  <string name="relay_nickname">כינוי הממסר</string>
+  <string name="the_nickname_for_your_tor_relay">הכינוי לממסר Tor שלך</string>
+  <string name="enter_a_custom_relay_nickname">הזן כינוי עבור ממסר</string>
+  <string name="reachable_addresses">כתובות בהישג יד</string>
+  <string name="reachable_ports">פורטים בהישג יד</string>
+  <string name="enter_ports">הזן פורטים</string>
+  <string name="enable_hidden_services">אחסון שירותים נסתרים</string>
+  <string name="enter_localhost_ports_for_hidden_services">הזן פורטים של localhost עבור שירותים נסתרים</string>
+  <string name="hidden_service_ports">פורט השירותים הנסתרים</string>
+  <string name="project_home">אתרי הפרויקט:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">הרשיון של Tor</string>
+  <string name="https_torproject_org">https://torproject.org/</string>
+  <string name="third_party_software">תוכנה-צד-ג׳: </string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="found_existing_tor_process">נמצא תהליך Tor קיים…</string>
+  <string name="something_bad_happened">משהו רע התרחש. בדוק את היומן</string>
+  <string name="hidden_service_on">שירות נסתר ב:</string>
+  <string name="unable_to_read_hidden_service_name">לא מסוגל לקרוא שם שירות נסתר</string>
+  <string name="unable_to_start_tor">לא מסוגל להתחיל את Tor:</string>
+  <string name="unable_to_reset_tor">אתחל את המכשיר שלך, אין אפשרות להפעיל מחדש את Tor!</string>
+  <string name="pref_use_sys_iptables_title">השתמש בברירות המחדל של iptables</string>
+  <string name="pref_use_persistent_notifications">לשמור תמיד את האיקון בסרגל כלים כשאורבוט מחובר</string>
+  <string name="notification_using_bridges">גשרים מאופשרים!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">שפה</string>
+  <string name="set_locale_summary">בחר את המקומיות והשפה של Orbot</string>
+  <string name="wizard_locale_title">בחר שפה</string>
+  <string name="wizard_locale_msg">השאר ברירת מחדל או החלף לשפה הנוכחית</string>
+  <string name="powered_by">מופעל באמצעות Tor</string>
+  <string name="btn_save_settings">שמירת הגדרות</string>
+  <string name="no_internet_connection_tor">אין חיבור לאינטרנט; תור ממתין...</string>
+  <string name="bandwidth_">רוחב פס:</string>
+  <string name="down">מטה</string>
+  <string name="up">מעלה</string>
+  <string name="pref_disable_network_summary">כבה את Tor כאשר אין חיבור לאינטרנט</string>
+  <string name="newnym">החלפת אל זהות Tor חדשה!</string>
+  <string name="menu_use_chatsecure">הפעל את ChatSecure</string>
+  <string name="permission_manage_tor_label">נהל Tor</string>
+  <string name="permission_manage_tor_description">אפשר את אפליקציה זו כדי לשלוט בשירות Tor</string>
+  <string name="install_apps_">להתקין אפליקציה?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">אין חיבור לרשת. מכבה את Tor....</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">החיבור עובד טוב. מעיר את Tor...</string>
+  <string name="updating_settings_in_tor_service">מעדכן הגדרות Tor במכשיר</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_dialog">הגדרות SOCKS Port </string>
+  <string name="pref_transport_title">Tor TransProxy Port</string>
+  <string name="pref_transport_dialog">הגדרת הפורט של TransProxy</string>
+  <string name="pref_dnsport_title">Tor DNS Port</string>
+  <string name="your_tor_public_ips_">הIPs החיצוניים שלך עם Tor:</string>
+  <string name="you_do_not_have_root_access_enabled">אין לך גישת רוט מאופשרת</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">תצטרך לכבות ולהפעיל את Orbot על מנת להחיל את השינוי בהגדרות.</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="menu_qr">קוד QR</string>
+  <string name="get_bridges_email">דוא\"ל</string>
+  <string name="get_bridges_web">אתר</string>
+  <string name="activate">הפעל</string>
+  <string name="send_email">שלח דוא\"ל</string>
+  <string name="standard_browser">דפדפן רגיל</string>
+</resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
new file mode 100644
index 0000000..1f11756
--- /dev/null
+++ b/app/src/main/res/values-ja/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbotは他のアプリがインターネットをより安全に使うことを可能にするフリーのプロキシアプリです。Orbotでは、Torを用いてあなたの端末のトラフィックを暗号化し、世界中のコンピューターを中継することで、そのトラフィックを隠します。Torはフリーのソフトウェアとオープンなネットワークであり、ユーザーの自由とプライバシーを脅かす監視活動や、機密のビジネス活動、国家によるトラフィック分析から身を守ることを助けてくれます。</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">Torを起動・停止する</string>
+  <string name="tor_proxy_service_process">Torプロクシサービス</string>
+  <string name="status_starting_up">Orbotが開始されています...</string>
+  <string name="status_activated">Torネットワークに接続しています</string>
+  <string name="status_disabled">\"Orbotが解除されました</string>
+  <string name="status_shutting_down">TorServiceが終了しています</string>
+  <string name="tor_process_starting">Torクライエントを開始しています...</string>
+  <string name="tor_process_complete">完了</string>
+  <string name="tor_process_waiting">お待ちください</string>
+  <string name="not_anonymous_yet">警告:この通信はまだ匿名化されていません! HTTP proxy 127.0.0.1:8118 か、 SOCKS4A または SOCKS5 proxy 127.0.0.1:9050 を利用するようにアプリケーション側で設定してください</string>
+  <string name="menu_home">ホーム</string>
+  <string name="menu_browse">閲覧</string>
+  <string name="menu_settings">設定</string>
+  <string name="menu_log">履歴</string>
+  <string name="menu_info">ヘルプ</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">スタート</string>
+  <string name="menu_stop">停止</string>
+  <string name="menu_about">情報</string>
+  <string name="menu_promo_apps">アプリを入手…</string>
+  <string name="main_layout_download">ダウンロード</string>
+  <string name="main_layout_upload">アップロード</string>
+  <string name="button_help">ヘルプ</string>
+  <string name="button_close">閉じる</string>
+  <string name="button_about">について</string>
+  <string name="button_clear_log">ログを削除する</string>
+  <string name="menu_verify">確認</string>
+  <string name="menu_exit">終了</string>
+  <string name="menu_scan">ブリッジQRをスキャン</string>
+  <string name="menu_share_bridge">ブリッジQRを共有</string>
+  <string name="press_to_start">- 長押しして起動 -</string>
+  <string name="pref_trans_proxy_group">透過プロキシ (要root)</string>
+  <string name="pref_trans_proxy_title">透過プロキシ</string>
+  <string name="pref_trans_proxy_summary">アプリの自動Tor化中</string>
+  <string name="pref_transparent_all_title">全てをTor化</string>
+  <string name="pref_transparent_all_summary">全てのアプリをTor経由で使う</string>
+  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
+  <string name="pref_transparent_port_fallback_summary">警告:通常のポート(80,443等)を迂回。「全て」か「指定アプリ」モードが動作しない場合にのみ使用してください。</string>
+  <string name="pref_transparent_port_title">ポート一覧</string>
+  <string name="pref_transparent_port_summary">プロキシを通すポート *警告* 「全て」か「指定アプリ」が動作しない場合にのみ使用してください。</string>
+  <string name="pref_transparent_port_dialog">プロキシのポート番号を入力</string>
+  <string name="pref_has_root">ルートアクセスの許可を要求します</string>
+  <string name="pref_has_root_summary">透過プロキシのためにroot権限が必要です</string>
+  <string name="status_install_success">Torバイナリインストールが成功しました</string>
+  <string name="status_install_fail">Torバイナリファイルがインストールできませんでした。ログを調べて、通知をtor-assistants at torproject.orgに送信してください。</string>
+  <string name="title_error">アプリケーションエラー</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Orbotについて</string>
+  <string name="btn_next">次</string>
+  <string name="btn_back">戻る</string>
+  <string name="btn_finish">終了</string>
+  <string name="btn_okay">OK</string>
+  <string name="btn_cancel">キャンセル</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Orbot詳細</string>
+  <string name="wizard_details_msg">Orbot はTor、LibEvent、Privoxyを含むオープンソース アプリケーションです。ローカルのHTTPプロキシ (8118) とSOCKSプロキシ (9050) を提供してTor接続します。root化された端末では、Orbotは全てのインターネット通信をTorを通して送信することもできます。</string>
+  <string name="wizard_permissions_root">権限を取得完了</string>
+  <string name="wizard_permissions_stock">Orbotの権限</string>
+  <string name="wizard_premissions_msg_root">Orbotがroot権限を取得したことを確認しました。全ての機能が利用できます。</string>
+  <string name="wizard_permissions_msg_stock">Orbotはroot化された端末では全ての機能を活用できます。下のボタンを押してOrbotに管理者権限を与えてください。</string>
+  <string name="wizard_permissions_no_root">root化していなかったり、そもそもroot化が何のことだかわからない方は、Orbot上で動作確認が取れているアプリだけを使用してください。</string>
+  <string name="wizard_permissions_consent">Superuserを利用せずに続行</string>
+  <string name="wizard_permission_enable_root">Orbotにroot権限を与える</string>
+  <string name="wizard_configure">Torをソフトウェアに使用する設定</string>
+  <string name="wizard_configure_msg">Orbotでは全てのアプリにTorプロキシを通すか、Torアプリを使う個々のアプリを指定できます。</string>
+  <string name="wizard_configure_all">全てのアプリにTorプロキシを通す</string>
+  <string name="wizard_configure_select_apps">指定したアプリだけにTorプロキシを通す</string>
+  <string name="wizard_tips_tricks">Orbotが有効化されたアプリ</string>
+  <string name="wizard_tips_msg">以下のアプリはOrbot用に作られています。それぞれのボタンを押すと今すぐインストールできます。Google Playからも同じものが探せます。</string>
+  <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="wizard_tips_twitter">Twitter proxyを「localhost」と8118番ポートに合わせる</string>
+  <string name="wizard_tips_story_maker">StoryMaker - ストーリーを作成して、セキュリティのためTorで残します!</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_proxy_help_msg">AndroidアプリがHTTPかSOCKSプロキシを利用できる場合、Orbotを使ってTor接続をすることが可能です。\n\n\n ホスト設定は127.0.0.1またはlocalhostです。HTTPでは使用ポートは8118です。SOCKSでは9050です。可能であればSOCKS4AかSOCKS5の利用を推奨します。\n \n\n\n Android上のプロキシについて学びたい場合は http://tinyurl.com/proxyandroid のFAQを参照してください。</string>
+  <string name="wizard_final">Orbotの準備が完了しました</string>
+  <string name="wizard_final_msg">世界中で数百万人が様々な理由でTorを利用しています。\n\nジャーナリストやブロガー、人権団体、法的機関、軍隊、企業、独裁国家の市民、普通の市民も… そしてあなたも同じように利用することができます!</string>
+  <string name="wizard_exit_at_first_screen_toast">使用を開始する前にOrbotを設定してください!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Torネットワークに正常に接続しました - しかしお使いの端末が安全だとは限りません。「ブラウザ」ボタンを使用して接続のテストができます。 \n\nさらに詳細はhttps://guardianproject.info/apps/orbot を参照するか、help at guardianproject.info にメールを送信してください。</string>
+  <string name="tor_check">ブラウザを開いてhttps://check.torproject.org にTor接続し、Orbotの設定が成功したかを試します。</string>
+  <string name="pref_hs_group">Hidden Services</string>
+  <string name="pref_general_group">一般</string>
+  <string name="pref_start_boot_title">起動時にOrbotを実行する</string>
+  <string name="pref_start_boot_summary">Android端末の起動時にOrbotを自動実行</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">AndroidでもOrbotでTorが使えます!\n\nTorは、コンテンツフィルタリング、トラフィック分析、そしてプライバシー、機密情報や個人的な関係を脅かすネットワーク監視から守ることができます。\n\nこのウィザードはお使いの端末でOrbotとTorの設定ができます。</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">注意</string>
+  <string name="wizard_warning_msg">Orbotをインストールしただけでは通信は匿名化されません。\n\nOrbot、Android端末、アプリの全てを正しく設定しないとTorは使えません。</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">許可</string>
+  <string name="wizard_permissions_root_msg1">オプションとしてOrbotにスーパーユーザー権限を与えることで透過プロキシなどの追加機能が使えます。</string>
+  <string name="wizard_permissions_root_msg2">これを実行しない場合、Orbot用に作られたアプリだけを使ってください。</string>
+  <string name="wizard_permissions_no_root_msg">お使いの端末はroot化されていないか、rootまたは「Superuser」にアクセスできないようです。 \n\n代わりに、メイン画面の「アプリ」モードを試してください。 </string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbotが有効化されたアプリ</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: 非記録式暗号によるセキュアなチャットアプリ</string>
+  <string name="wizard_tips_orweb">Orfox: Torを介して動作するプライバシーを強化したブラウザ</string>
+  <string name="wizard_tips_play">Google Playで全てのGuardian Projectのアプリを見つける</string>
+  <string name="wizard_tips_fdroid">F-Droidで全てのGuardian Projectのアプリを見つける</string>
+  <string name="wizard_tips_fdroid_org">https://f-droid.org で全てのGuardian Projectのアプリを見つける</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">透過プロキシ</string>
+  <string name="wizard_transproxy_msg">これはあなたのアプリを自動的にTor経由で通信させます。</string>
+  <string name="wizard_transproxy_hint">(何を言っているのかわからないときはここをチェックしてください)</string>
+  <string name="wizard_transproxy_none">無し</string>
+  <string name="pref_transparent_tethering_title">Torテザリング</string>
+  <string name="pref_transparent_tethering_summary">Tor透過プロクシをWifiかUSBテザリングされたデバイスに対して有効化(再起動が必要)</string>
+  <string name="button_grant_superuser">管理許可アクセスを要求します</string>
+  <string name="pref_select_apps">アプリケーションを選択します</string>
+  <string name="pref_select_apps_summary">Torを経由させるアプリを選択</string>
+  <string name="pref_node_configuration">ノード設定</string>
+  <string name="pref_node_configuration_summary">ご注意、先進設定が匿名レベルを縮小します</string>
+  <string name="pref_entrance_node">入り口ノード</string>
+  <string name="pref_entrance_node_summary">最初のホップのためのデジタル指紋、ニックネーム、国とIPアドレス</string>
+  <string name="pref_entrance_node_dialog">入り口ノードを入力</string>
+  <string name="pref_allow_background_starts_title">バックグラウンドの開始を許可</string>
+  <string name="pref_allow_background_starts_summary">OrbotがTorと関連サービスを開始するように、任意のアプリに伝えます</string>
+  <string name="button_proxy_all">すべてプロキシ</string>
+  <string name="button_proxy_none">プロキシなし</string>
+  <string name="button_invert_selection">選択の反転</string>
+  <string name="pref_proxy_title">外方向ネットワークプロキシ (オプション)</string>
+  <string name="pref_proxy_type_title">外方向プロキシの種類</string>
+  <string name="pref_proxy_type_summary">HTTP,HTTPS,Socks4,Socks5で使用するプロトコル</string>
+  <string name="pref_proxy_type_dialog">プロキシの種類を入力してください</string>
+  <string name="pref_proxy_host_title">外方向プロキシのホスト</string>
+  <string name="pref_proxy_host_summary">プロキシサーバのホスト名</string>
+  <string name="pref_proxy_host_dialog">プロクシ ホストを入力</string>
+  <string name="pref_proxy_port_title">外方向プロキシのポート</string>
+  <string name="pref_proxy_port_summary">プロキシサーバのポート</string>
+  <string name="pref_proxy_port_dialog">プロキシのポートを入力してください</string>
+  <string name="pref_proxy_username_title">外方向プロキシのポート</string>
+  <string name="pref_proxy_username_summary">プロキシユーザー名 (オプション)</string>
+  <string name="pref_proxy_username_dialog">プロキシのユーザー名を入力してください</string>
+  <string name="pref_proxy_password_title">外方向プロキシのパスワード</string>
+  <string name="pref_proxy_password_summary">プロキシのパスワード (オプション)</string>
+  <string name="pref_proxy_password_dialog">プロキシのパスワードを入力してください</string>
+  <string name="status">状態</string>
+  <string name="setting_up_full_transparent_proxying_">完全な透過プロキシをセットアップ中...</string>
+  <string name="setting_up_app_based_transparent_proxying_">アプリベースの透過プロキシをセットアップ中...</string>
+  <string name="transparent_proxying_enabled">透過プロキシ 有効</string>
+  <string name="transproxy_enabled_for_tethering_">テザリングでの透過プロキシ有効</string>
+  <string name="warning_error_starting_transparent_proxying_">警告: 透過プロキシの開始時にエラー発生</string>
+  <string name="transproxy_rules_cleared">透過プロキシ ルール 消去完了</string>
+  <string name="couldn_t_start_tor_process_">Torプロセスの起動に失敗:</string>
+  <string name="privoxy_is_running_on_port_">Polipoを実行中のポート: </string>
+  <string name="setting_up_port_based_transparent_proxying_">ポートベースの透過プロキシをセットアップ中...</string>
+  <string name="bridge_error">ブリッジ エラー</string>
+  <string name="bridge_requires_ip">ブリッジ機能を利用するには、最低一つのブリッジIPアドレスの入力が必要です。</string>
+  <string name="send_email_for_bridges">gmailを使って、本文に「get bridges」と書いたメールをbridges at torproject.orgに送信してください。</string>
+  <string name="error">エラー</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">あなたのReachableAddresses設定により例外が発生しました!</string>
+  <string name="your_relay_settings_caused_an_exception_">あなたのリレー設定により例外が発生しました!</string>
+  <string name="exit_nodes">出口ノード</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">最後のホップのためのデジタル指紋、ニックネーム、国とIPアドレス</string>
+  <string name="enter_exit_nodes">出口ノードを入力</string>
+  <string name="exclude_nodes">除外ノード</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">除外するデジタル指紋、ニックネーム、国とIPアドレス</string>
+  <string name="enter_exclude_nodes">除外ノードを入力</string>
+  <string name="strict_nodes">Strictノード</string>
+  <string name="use_only_these_specified_nodes">ここに指定したノードのみを使用</string>
+  <string name="bridges">ブリッジ</string>
+  <string name="use_bridges">ブリッジを使う</string>
+  <string name="bridges_obfuscated">Obfus化されたブリッジ</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">代替入り口ノードを有効化</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">設定したブリッジがObfus化されたブリッジであれば有効</string>
+  <string name="ip_address_and_port_of_bridges">ブリッジのIPアドレスとポート</string>
+  <string name="enter_bridge_addresses">ブリッジのアドレスを入力</string>
+  <string name="relays">リレー</string>
+  <string name="relaying">リレー中</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">この端末を非出口リレーにする</string>
+  <string name="relay_port">リレー ポート</string>
+  <string name="listening_port_for_your_tor_relay">このTorリレーのリスニングポート</string>
+  <string name="enter_or_port">ORポートを入力</string>
+  <string name="relay_nickname">リレーのニックネーム</string>
+  <string name="the_nickname_for_your_tor_relay">このTorリレーのニックネーム</string>
+  <string name="enter_a_custom_relay_nickname">リレーのカスタムニックネームを入力</string>
+  <string name="reachable_addresses">到達可能アドレス</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">制限設定のファイアウォールを通してクライアントとして実行</string>
+  <string name="reachable_ports">到達可能ポート</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">制限設定のファイアウォールを通して到達可能なポート</string>
+  <string name="enter_ports">ポートを入力</string>
+  <string name="enable_hidden_services">Hidden Serviceのホスティング</string>
+  <string name="run_servers_accessible_via_the_tor_network">デバイス上のサーバーをTor経由でアクセス可能にする</string>
+  <string name="enter_localhost_ports_for_hidden_services">Hidden Service用のlocalhostのポートを入力</string>
+  <string name="hidden_service_ports">Hidden Serviceのポート</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">あなたのHidden Serviceのアドレス(自動生成されます)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">デバッグログの出力を有効化(閲覧にはadbかaLogCatが必要)</string>
+  <string name="project_home">プロジェクトのホーム:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor ライセンス文書</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">第三者製のソフトウェア</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">アプリがhidden serverの port %S をTorネットワークに開放しようとしています。信頼できるアプリであればこれは安全です。</string>
+  <string name="found_existing_tor_process">Torプロセスを発見</string>
+  <string name="something_bad_happened">何かが起こりました。ログを確認してください。</string>
+  <string name="hidden_service_on">hidden service 有効:</string>
+  <string name="unable_to_read_hidden_service_name">hidden serviceの名前読込不能</string>
+  <string name="unable_to_start_tor">Torを実行できませんでした</string>
+  <string name="unable_to_reset_tor">Torをリセットできません。お使いのデバイスを再起動してください!</string>
+  <string name="pref_use_sys_iptables_title">デフォルトのlptablesを使う</string>
+  <string name="pref_use_sys_iptables_summary">Orbotバンドル版ではなく内蔵のiptablesを使う</string>
+  <string name="error_installing_binares">Torバイナリのインストールまたはアップグレードは不可能でした。</string>
+  <string name="pref_use_persistent_notifications">Orbotが接続中はアイコンを常にツールバーに表示</string>
+  <string name="pref_use_persistent_notifications_title">通知を常に有効化</string>
+  <string name="pref_use_expanded_notifications">拡張通知で、Torの出口の国とIPを表示します</string>
+  <string name="pref_use_expanded_notifications_title">拡張通知</string>
+  <string name="notification_using_bridges">ブリッジが有効です!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">言語</string>
+  <string name="set_locale_summary">Orbotの地域と言語を選択</string>
+  <string name="wizard_locale_title">言語を選択</string>
+  <string name="wizard_locale_msg">今の言語を変更するか、そのままにする</string>
+  <string name="powered_by">powered by Tor</string>
+  <string name="btn_save_settings">設定を保存</string>
+  <string name="no_internet_connection_tor">インターネット接続なし。Torは待機中です...</string>
+  <string name="bandwidth_">帯域幅:</string>
+  <string name="down">ダウン</string>
+  <string name="up">アップ</string>
+  <string name="pref_disable_network_title">ネットワークなし時オートスリープ</string>
+  <string name="pref_disable_network_summary">ネット接続がない時 Tor をスリープさせる</string>
+  <string name="newnym">新たな Tor の身元に切り替えました。</string>
+  <string name="menu_verify_browser">ブラウザ</string>
+  <string name="menu_use_chatsecure">ChatSecure を使用</string>
+  <string name="permission_manage_tor_label">Tor を管理</string>
+  <string name="permission_manage_tor_description">このアプリが Tor サービスをコントールできるようにする</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orfox をインストールしていないようです。それについて助けが必要ですか、あるいはただブラウザを開くべきですか?</string>
+  <string name="install_apps_">アプリをインストールしますか?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">ネットワーク接続がありません。Torはスリープします…</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">ネットワーク接続は良好です。Torを有効にします…</string>
+  <string name="updating_settings_in_tor_service">Torサービスの設定を更新中</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">TorがSOCKSプロキシを提供するポート (デフォルト: 9050、0にすると無効)</string>
+  <string name="pref_socks_dialog">SOCKS ポート設定</string>
+  <string name="pref_transport_title">Tor透過プロキシポート</string>
+  <string name="pref_transport_summary">Torが透過プロキシを提供するポート (デフォルト: 9040、0にすると無効)</string>
+  <string name="pref_transport_dialog">透過プロキシポート設定</string>
+  <string name="pref_dnsport_title">Tor DNS ポート</string>
+  <string name="pref_dnsport_summary">TorがDNSを提供するポート (デフォルト: 5400、0にすると無効)</string>
+  <string name="pref_dnsport_dialog">DNS ポート設定</string>
+  <string name="pref_torrc_title">Torrc カスタム設定</string>
+  <string name="pref_torrc_summary">上級者家のみ: 直接torrc設定行を入力します</string>
+  <string name="pref_torrc_dialog">Torrcをカスタム</string>
+  <string name="wizard_tips_martus">Mobile Martus - Benetech 人権文書アプリ</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>
+  <string name="pref_transproxy_refresh_title">透過プロキシ自動リフレッシュ</string>
+  <string name="pref_transproxy_refresh_summary">ネットワークの状態が変化したとき、透過プロキシのルールを再適用します</string>
+  <string name="pref_transproxy_flush_title">透過プロキシ強制削除</string>
+  <string name="pref_transproxy_flush_summary">ここをタップすると、今すぐすべての透過プロキシ ネットワークルールをフラッシュします</string>
+  <string name="transparent_proxy_rules_flushed_">透過プロキシのルールをフラッシュしました!</string>
+  <string name="you_do_not_have_root_access_enabled">ROOT アクセスが有効ではありません</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">変更した設定を有効にするために、Orbotを停止して開始する必要があるかもしれません。</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">ブリッジを更新しました</string>
+  <string name="restart_orbot_to_use_this_bridge_">変更を有効にするにはOrbotを再起動してください</string>
+  <string name="menu_qr">QRコード</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">モバイルネットワークが積極的にTorをブロックする場合、ブリッジを使用してネットワークにアクセスすることができます。\n\nブリッジを有効にするため、上のいずれかのブリッジタイプを選択してください。</string>
+  <string name="bridge_mode">ブリッジ モード</string>
+  <string name="get_bridges_email">メール</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">アクティブ化</string>
+  <string name="apps_mode">アプリ VPN モード</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">AndroidのVPN機能を使用して、デバイス上のすべてのアプリをTorネットワークを介するようにすることができます\n\n個*警告* これは新しい、実験的な機能であり、いくつかのケースで自動的に起動しないこと、または停止することがあります。これは匿名のために使用しないでください。ファイアウォールやフィルターを通すためにのみ使用してください。</string>
+  <string name="send_email">メール送信</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">あなたは、メール、ウェブを介して、またはブリッジQRコードをスキャンしてブリッジアドレスを取得することができます。ブリッジアドレスを要求するため、下の「メール」または「ウェブ」を選択してください。\n\nアドレスを入手したら、それをOrbot設定の「ブリッジ」設定にコピー& 貼り付けして、Orbotを再起動します。</string>
+  <string name="install_orweb">Orfoxをインストール</string>
+  <string name="standard_browser">標準ブラウザ</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">注: 標準のTorブリッジは、Intel X86/ATOM デバイス上でのみ動作します</string>
+  <string name="vpn_default_world">ワールド</string>
+</resources>
diff --git a/app/src/main/res/values-kn-rIN/strings.xml b/app/src/main/res/values-kn-rIN/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/app/src/main/res/values-kn-rIN/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/app/src/main/res/values-kn/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
new file mode 100644
index 0000000..765b572
--- /dev/null
+++ b/app/src/main/res/values-ko/strings.xml
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">Tor 시작 및 중지</string>
+  <string name="tor_proxy_service_process">Tor 프록시 서비스</string>
+  <string name="status_starting_up">Orbot 시작 중…</string>
+  <string name="status_activated">Tor 네트워크에 연결됨</string>
+  <string name="status_disabled">Orbot이 비활성화되어 있습니다</string>
+  <string name="tor_process_starting">Tor 클라이언트 시작 중…</string>
+  <string name="tor_process_complete">완료.</string>
+  <string name="tor_process_waiting">대기 중.</string>
+  <string name="not_anonymous_yet">경고: 귀하의 트래픽은 아직 익명이 아닙니다! HTTP 프록시 127.0.0.1:8118 또는 SOCKS4A 또는 SOCKS5 프록시 127.0.0.1:9050을 사용하여 응용 프로그램을 구성하십시오</string>
+  <string name="menu_home">홈</string>
+  <string name="menu_browse">탐색</string>
+  <string name="menu_settings">설정</string>
+  <string name="menu_log">로그</string>
+  <string name="menu_info">도움말</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">시작</string>
+  <string name="menu_stop">중지</string>
+  <string name="menu_about">정보</string>
+  <string name="main_layout_download">다운로드</string>
+  <string name="main_layout_upload">업로드</string>
+  <string name="button_help">도움말</string>
+  <string name="button_close">닫기</string>
+  <string name="button_about">정보</string>
+  <string name="button_clear_log">로그 지우기</string>
+  <string name="menu_verify">확인</string>
+  <string name="menu_exit">종료</string>
+  <string name="menu_scan">브릿지 QR코드 스캔하기</string>
+  <string name="menu_share_bridge">브릿지 QR코드 공유하기</string>
+  <string name="press_to_start">- 길게 눌러서 시작하기 -</string>
+  <string name="pref_trans_proxy_group">투명한 프록시 (루팅 필요)</string>
+  <string name="pref_trans_proxy_title">투명한 프록시</string>
+  <string name="pref_trans_proxy_summary">앱의 자동적인 토르화</string>
+  <string name="pref_transparent_all_title">모두 토르화</string>
+  <string name="pref_transparent_all_summary">토르를 통한 모든 응용 프로그램에 대한 프록시 트래픽</string>
+  <string name="pref_transparent_port_fallback_title">대체 프록시 포트</string>
+  <string name="pref_transparent_port_fallback_summary">경고 : 흔한 포트(80,443 등)만 순환. 전체 모드나 앱 모드가 작동하지 않을 경우에만 사용할 것.</string>
+  <string name="pref_transparent_port_title">포트 목록</string>
+  <string name="pref_transparent_port_summary">프록시 처리할 포트 목록. 만약 전체 모드나 앱 모드가 작동하지 않을 경우에만 사용할 것.</string>
+  <string name="pref_transparent_port_dialog">프록시 포트 입력</string>
+  <string name="pref_has_root">루트 권한에 대한 접근 필요</string>
+  <string name="pref_has_root_summary">명백한 프록시를 위해 루트 권한 요구</string>
+  <string name="status_install_success">Tor 바이너리가 성공적으로 설치되었습니다!</string>
+  <string name="status_install_fail">토르 바이너리 파일을 설치할 수 없습니다. 로그를 확인해 주시고 tor-assistants at torproject.org 에 알려 주십시오.</string>
+  <string name="title_error">애플리케이션 오류</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Orbot 정보</string>
+  <string name="btn_next">다음</string>
+  <string name="btn_back">뒤로</string>
+  <string name="btn_finish">마침</string>
+  <string name="btn_okay">확인</string>
+  <string name="btn_cancel">취소</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Orbot에 대한 몇몇 상세사항</string>
+  <string name="wizard_details_msg">Orbot은 Tor와, LibEvent, Polipo를 탑재한 오픈소스 어플리케이션입니다. 다이 앱은 Tor 네트워크로 연결되는 HTTP 프록시 (8118)와 SOCKS 프록시 (9050) 을 제공합니다. Orbot은 또한, 루팅된 폰의 경우, 모든 트래픽을 Tor를 통할 수 있도록 합니다.</string>
+  <string name="wizard_permissions_root">사용 권한 부여</string>
+  <string name="wizard_permissions_stock">Orbot 사용 권한</string>
+  <string name="wizard_premissions_msg_root">완벽합니다! Orbot을 위해 루트 권한이 활성화된것을 감지했습니다. 우리는 이 힘을 현명하게 사용할 것입니다.</string>
+  <string name="wizard_permissions_msg_stock">이것은 필수가 아닌 반면, 귀하의 장치가 루트 권한을 가지고 있다면 Orbot은 더 강력한 도구가 될 수 있습니다. Orbot에게 수퍼유저 권한을 부여하려면 아래 버튼을 누르십시오.</string>
+  <string name="wizard_permissions_no_root">루트 권한을 가지고 있지 않거나 무엇을 말하는 것인지 모르겠다면, Orbot과 동작하는 애플리케이션만을 사용하십시오.</string>
+  <string name="wizard_permissions_consent">내용을 이해하였으며, 수퍼유저 권한 없이 계속 진행합니다.</string>
+  <string name="wizard_permission_enable_root">Orbot에게 루트권한 부여</string>
+  <string name="wizard_configure">토르화 설정</string>
+  <string name="wizard_configure_msg">Orbot은 모든 애플리케이션 또는 선택된 애플리케이션을 Tor를 통해 통신하도록 할 수 있습니다.</string>
+  <string name="wizard_configure_all">모든 앱을 토르 프록시로 연결하기</string>
+  <string name="wizard_configure_select_apps">Tor를 위해 각각의 앱 선택</string>
+  <string name="wizard_tips_tricks">Orbot이 활성화된 앱</string>
+  <string name="wizard_tips_msg">아래의 앱은 Orbot과 작동되도록 개발되었습니다. 지금 설치하려면 각각의 버튼을 누르십시오. 또는 나중에 Google Play, GuardianProject.info, F-Droid.org 에서 찾을 수 있습니다.</string>
+  <string name="wizard_tips_otrchat">ChatSecure - 안드로이드를 위한 안전한 인스턴트 메세징 클라이언트</string>
+  <string name="wizard_tips_proxy">Proxy Settings - Orbot과 작동하도록 앱을 설정하는 방법을 배우기</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo 검색 엔진 앱</string>
+  <string name="wizard_tips_twitter">트위터 프록시를 localhost:8118로 설정</string>
+  <string name="wizard_tips_story_maker">StoryMaker - 스토리는 당신이 만들고 보안은 Tor에 맏기세요!</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>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Orbot이 정상적으로 설정되었고 Tor에 연결되었는지 확인하기 위해 https://check.torproject.org 을 귀하의 웹 브라우저에 열 것입니다.</string>
+  <string name="pref_hs_group">숨겨진 서비스 호스팅</string>
+  <string name="pref_general_group">일반</string>
+  <string name="pref_start_boot_title">부팅 후 Orbot 시작</string>
+  <string name="pref_start_boot_summary">안드로이드 장치가 시작할 때 자동적으로 Orbot을 시작하고 Tor에 연결합니다</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">경고</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">권한</string>
+  <string name="wizard_permissions_root_msg1">투명 프록시 같은 고급 기능을 활성화하기 위해 귀하는 선택적으로 Orbot에게 \'수퍼유저\' 권한을 줄 수 있습니다.</string>
+  <string name="wizard_permissions_root_msg2">이것을 원하지 않으신다면, Orbot과 작동하도록 만들어진 앱만을 사용하십시오.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot을 사용하는 앱</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: 오프 더 레코드 암호화를 적용한 안전한 채팅 앱</string>
+  <string name="wizard_tips_play">구글 플레이에서 모든 가디언 프로젝트 앱 찾기</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">투명 프록시</string>
+  <string name="wizard_transproxy_msg">이것은 어떠한 설정 없이도 귀하의 앱이 자동적으로 토르 네트워크를 통해 작동하도록 해 줍니다.</string>
+  <string name="wizard_transproxy_hint">(위 내용을 이해할 수 없다면 이것을 선택해주십시오.)</string>
+  <string name="wizard_transproxy_none">없음</string>
+  <string name="pref_transparent_tethering_title">토르 테더링</string>
+  <string name="pref_transparent_tethering_summary">테더링 된 와이파이와 USB 장치에 토르 투명 프록시 활성화 (재시작 필요)</string>
+  <string name="button_grant_superuser">수퍼유저 권한 요청</string>
+  <string name="pref_select_apps">앱 선택</string>
+  <string name="pref_select_apps_summary">Tor를 통한 통신을 사용할 앱 선택</string>
+  <string name="pref_node_configuration">노드 설정</string>
+  <string name="pref_node_configuration_summary">귀하의 익명성을 감소시킬 수 있는 고급 설정이 있습니다.</string>
+  <string name="pref_entrance_node">입구 노드</string>
+  <string name="pref_entrance_node_summary">첫번째 Hop을 위한핑거프린트, 별칭, 나라와 주소</string>
+  <string name="pref_entrance_node_dialog">입구 노드 입력</string>
+  <string name="pref_proxy_title">외부 네트워크 프록시 (선택)</string>
+  <string name="pref_proxy_type_title">외부 프록시 유형</string>
+  <string name="pref_proxy_type_summary">프록시 서버를 위한 사용되는 프로토콜 : HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">프록시 형식 입력</string>
+  <string name="pref_proxy_host_title">외부 프록시 호스트</string>
+  <string name="pref_proxy_host_summary">프록시 서버 호스트네입</string>
+  <string name="pref_proxy_host_dialog">프록시 호스트 입력</string>
+  <string name="pref_proxy_port_title">외부 프록시 포트</string>
+  <string name="pref_proxy_port_summary">서버 포트 입력</string>
+  <string name="pref_proxy_port_dialog">프록시 포트 입력</string>
+  <string name="pref_proxy_username_title">외부 프록시 사용자명</string>
+  <string name="pref_proxy_username_summary">프록시 사용자명 (선택)</string>
+  <string name="pref_proxy_username_dialog">프록시 사용자명 입력</string>
+  <string name="pref_proxy_password_title">외부 프록시 비밀번호</string>
+  <string name="pref_proxy_password_summary">프록시 비밀번호 (선택)</string>
+  <string name="pref_proxy_password_dialog">프록시 비밀번호 입력</string>
+  <string name="status">상태</string>
+  <string name="setting_up_full_transparent_proxying_">전체 투명 프록시 설정중...</string>
+  <string name="setting_up_app_based_transparent_proxying_">앱에 기반한 투명 프록시 설정중...</string>
+  <string name="transparent_proxying_enabled">투명 프록시 활성화됨</string>
+  <string name="transproxy_enabled_for_tethering_">테더링을 위한 TransProxy 활성화됨</string>
+  <string name="warning_error_starting_transparent_proxying_">경고 : 투명 프록시 시작 오류</string>
+  <string name="transproxy_rules_cleared">TransProxy 규칙 모두 삭제됨</string>
+  <string name="couldn_t_start_tor_process_">Tor 프로세스 시작 불가능:  </string>
+  <string name="setting_up_port_based_transparent_proxying_">포트에 기반한 투명 프록시 설정</string>
+  <string name="bridge_error">브릿지 오류</string>
+  <string name="bridge_requires_ip">브릿지 기능을 사용하기 위해서, 최소한 1개 이상의 브릿지 IP 주소가 필요합니다.</string>
+  <string name="send_email_for_bridges">메일 본문에 get bridges라고 적어서 Gmail로 bridges at torproject.org에 메일을 보내십시오.</string>
+  <string name="error">오류</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">귀하의 ReachableAddress 설정은 예외를 발생시켰습니다!</string>
+  <string name="your_relay_settings_caused_an_exception_">귀하의 중계서버 설정은 예외를 발생시켰습니다!</string>
+  <string name="exit_nodes">출구 노드</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">마지막 Hop을 위한핑거프린트, 별칭, 나라와 주소</string>
+  <string name="enter_exit_nodes">출구 노드 입력</string>
+  <string name="exclude_nodes">차단할 노드</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">차단할 핑거프린트, 별칭, 나라와 주소</string>
+  <string name="enter_exclude_nodes">차단할 노드 입력</string>
+  <string name="strict_nodes">노드 선택</string>
+  <string name="use_only_these_specified_nodes">이 특정한 노드*만* 사용합니다.</string>
+  <string name="bridges">중계서버</string>
+  <string name="use_bridges">중계서버 사용</string>
+  <string name="bridges_obfuscated">Obfuscated Bridges</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Tor 네트워크로 들어가는 대안의 입구 노드 활성화</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">설정된 bridge가 obfsproxy bridge면 활성화</string>
+  <string name="ip_address_and_port_of_bridges">중계서버의 IP 주소와 </string>
+  <string name="enter_bridge_addresses">중게서버 주소 입력</string>
+  <string name="relays">중계서버</string>
+  <string name="relaying">중계</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">귀하의 장치를 출구가 아닌 중계서버로 활성화</string>
+  <string name="relay_port">중계 포트</string>
+  <string name="listening_port_for_your_tor_relay">귀하의 Tor 중계서버를 위한 Listening 포트</string>
+  <string name="enter_or_port">OR 포트 입력</string>
+  <string name="relay_nickname">중계서버 별명</string>
+  <string name="the_nickname_for_your_tor_relay">귀하의 중계서버를 위한 별명</string>
+  <string name="enter_a_custom_relay_nickname">임의의 중계서버 별명을 입력</string>
+  <string name="reachable_addresses">도달 가능한 주소</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">엄격한 정책을 가진 방화벽 뒤에서 클라이언트 가동</string>
+  <string name="reachable_ports">도달 가능한 포트</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">엄격한 방화벽 뒤에서 접근 가능한 포트</string>
+  <string name="enter_ports">포트 입력</string>
+  <string name="enable_hidden_services">히든 서비스 호스팅</string>
+  <string name="run_servers_accessible_via_the_tor_network">장치 내의 서버가 Tor 네트워크를 통해 접근 가능하도록 허용</string>
+  <string name="enter_localhost_ports_for_hidden_services">히든 서비스를 위한 localhost 포트 입력</string>
+  <string name="hidden_service_ports">히든 서비스 포트</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">귀하의 히든 서비스를 위한 주소화된 이름(자동으로 생성됨)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">디버그 로그 출력 활성화 (보기 위해서는 adb나 aLogCat을 사용해야 함)</string>
+  <string name="project_home">프로젝트 홈 페이지:</string>
+  <string name="the_tor_license">The Tor License</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3rd-Party-Software: </string>
+  <string name="hidden_service_request">앱이 Tor 네트워크로 히든 서버 포트를 열고 싶어합니다. 앱을 믿는다면 안전합니다.</string>
+  <string name="found_existing_tor_process">존재하고 있는 Tor 프로세스 발견</string>
+  <string name="something_bad_happened">어떤 나쁜 것이 발생. 로그 확인하세요.</string>
+  <string name="hidden_service_on">히든 서비스 목록 :</string>
+  <string name="unable_to_read_hidden_service_name">히든 서비스 이름을 읽을 수 없음</string>
+  <string name="unable_to_start_tor">Tor 시작 불가능</string>
+  <string name="pref_use_sys_iptables_title">기본 iptables 사용</string>
+  <string name="pref_use_sys_iptables_summary">Orbot에 동봉된 것 대신에 빌트인된 iptables 바이너리 사용</string>
+  <string name="error_installing_binares">Tor 바이너리는 설치되거나 없그레이드 될 수 없었습니다.</string>
+  <string name="pref_use_persistent_notifications">Orbot이 연결되었을 때 툴바에 아이콘 보이기</string>
+  <string name="pref_use_persistent_notifications_title">항상 켜진 알림</string>
+  <string name="notification_using_bridges">bridge 활성화됨</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Orbot을 위한 로케일과 언어 선택</string>
+  <string name="wizard_locale_title">언어 선택</string>
+  <string name="wizard_locale_msg">기본값으로 두거나 현재 언어 바꾸기</string>
+  <string name="btn_save_settings">설정 저장</string>
+  <string name="bandwidth_">대역폭:</string>
+  <string name="down">아래로</string>
+  <string name="up">위로</string>
+  <string name="pref_disable_network_title">네트워크가 없을 때의 자동 슬립</string>
+  <string name="pref_disable_network_summary">인터넷이 불가능하다면 Tor를 슬립 모드로 두십시오</string>
+  <string name="newnym">새로운 Tor 신원으로 전환되었습니다!</string>
+  <string name="menu_use_chatsecure">ChatSecure  사용</string>
+  <string name="permission_manage_tor_label">Tor 관리</string>
+  <string name="permission_manage_tor_description">Tor 서비스를 제어하기 위해 이 앱을 활성화하십시오</string>
+  <string name="install_apps_">앱을 설치할까요?</string>
+  <string name="menu_vpn">VPN</string>
+</resources>
diff --git a/app/src/main/res/values-ky/strings.xml b/app/src/main/res/values-ky/strings.xml
new file mode 100644
index 0000000..89c837c
--- /dev/null
+++ b/app/src/main/res/values-ky/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_settings">Ырастоолор</string>
+  <string name="menu_info">Жардам</string>
+  <string name="menu_about">Программа жөнүндө</string>
+  <string name="button_help">Жардам</string>
+  <string name="button_about">Программа жөнүндө</string>
+  <string name="menu_exit">Чыгуу</string>
+  <string name="btn_cancel">Айнуу</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="status">Абал</string>
+  <string name="error">Ката</string>
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
new file mode 100644
index 0000000..b9253dd
--- /dev/null
+++ b/app/src/main/res/values-lt/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_browse">Naršyti</string>
+  <string name="menu_settings">Nustatymai</string>
+  <string name="menu_info">Pagalba</string>
+  <string name="menu_about">Apie</string>
+  <string name="button_help">Pagalba</string>
+  <string name="button_close">Uždaryti</string>
+  <string name="button_about">Apie</string>
+  <string name="menu_exit">Išeiti</string>
+  <string name="btn_back">Atgal</string>
+  <string name="btn_cancel">Atsisakyti</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Proxy nustatymai</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Įspėjimas</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">Joks</string>
+  <string name="status">Statusas</string>
+  <string name="error">Klaida</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Išsaugoti nustatymus</string>
+</resources>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
new file mode 100644
index 0000000..194c7b0
--- /dev/null
+++ b/app/src/main/res/values-lv/strings.xml
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot ir starpniekserveru bezmaksas lietotne, kas sniedz iespēju citām lietotnēm drošāk lietot internetu. Orbot izmanto Tor, lai šifrētu Jūsu interneta datplūsmu, tad to paslēpj, pārsūtot to caur daudziem datoriem visā pasaulē. Tor ir bezmaksas programmatūra un atvērts tīkls, kas palīdz Jums aizsargāties pret tīkla uzraudzības veidu - datplūsmas analīzi -, ar kuras palīdzību tiek apdraudēta personiskā brīvība un privātums, konfidenciālas lietišķas darbības un attiecības, kā arī valsts drošība.  </string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">startēt un apturēt Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot startē...</string>
+  <string name="status_activated">Izveidots savienojums ar tīklu Tor</string>
+  <string name="status_disabled">Orbot ir deaktivēts</string>
+  <string name="tor_process_starting">Startē Tor klientu...</string>
+  <string name="tor_process_complete">pabeidz.</string>
+  <string name="tor_process_waiting">gaida.</string>
+  <string name="not_anonymous_yet">BRĪDINĀJUMS: Jūsu datplūsma vēl nav anonīma! Lūdzu konfigurējiet savas lietotnes, lai tās izmantotu HTTP starpnieku 127.0.0.1:8118 vai SOCKS4A , vai SOCKS5 starpnieku 127.0.0.1:9050</string>
+  <string name="menu_home">Mājas</string>
+  <string name="menu_browse">Pārlūkot</string>
+  <string name="menu_settings">Iestatījumi</string>
+  <string name="menu_log">Žurnāls</string>
+  <string name="menu_info">Palīdzība</string>
+  <string name="menu_start">Startēt</string>
+  <string name="menu_stop">Apturēt</string>
+  <string name="menu_about">Par</string>
+  <string name="main_layout_download">Lejupielāde</string>
+  <string name="main_layout_upload">Augšupielāde</string>
+  <string name="button_help">Palīdzība</string>
+  <string name="button_close">Aizvērt</string>
+  <string name="button_about">Par</string>
+  <string name="button_clear_log">Notīrīt žurnālu</string>
+  <string name="menu_verify">Pārbaudīt</string>
+  <string name="menu_exit">Iziet</string>
+  <string name="menu_scan">Skenēt BridgeQR</string>
+  <string name="menu_share_bridge">Koplietot BridgeQR</string>
+  <string name="press_to_start">Lai startētu, nospiediet ilgi</string>
+  <string name="pref_trans_proxy_group">Pārredzama starpniekošana (nepieciešamas saknes pilnvaras)</string>
+  <string name="pref_trans_proxy_title">Pārredzama starpniekošana</string>
+  <string name="pref_trans_proxy_summary">Lietotņu automātiska torificēšana</string>
+  <string name="pref_transparent_all_title">Tor\'ēt visu</string>
+  <string name="pref_transparent_all_summary">Visu lietotņu starpnieku datplūsma caur Tor</string>
+  <string name="pref_transparent_port_fallback_title">Porta starpnieka atkāpnorāde</string>
+  <string name="pref_transparent_port_fallback_summary">BRĪDINĀJUMS: Apiet parastos portus (80., 443., u.tml.). *IZMANTOJIET VIENĪGI* ja nestrādā \'All\' vai \'App\' režīmi.</string>
+  <string name="pref_transparent_port_title">Portu saraksts</string>
+  <string name="pref_transparent_port_summary">Saraksts portiem uz starpnieku. *IZMANTOJIET VIENĪGI* ja nestrādā \'All\' vai \'App\' režīmi.</string>
+  <string name="pref_transparent_port_dialog">Ievadiet portus uz starpnieku</string>
+  <string name="pref_has_root">Pieprasīt piekļuves saknes tiesības</string>
+  <string name="pref_has_root_summary">Pieprasīt piekļuves saknes tiesības pārredzamai starniekošanai</string>
+  <string name="status_install_success">Sekmīgi instalētas Tor binārās datnes!</string>
+  <string name="status_install_fail">Nebija iespējams instalēt Tor binārās datnes. Lūdzu pārbaudiet žurnālu, un informējiet tor-assistants at torproject.org </string>
+  <string name="title_error">Lietojumprogrammas kļūda</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Par Orbot</string>
+  <string name="btn_next">Tālāk</string>
+  <string name="btn_back">Atpakaļ</string>
+  <string name="btn_finish">Beigt</string>
+  <string name="btn_okay">Labi</string>
+  <string name="btn_cancel">Atcelt</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Vairāk informācijas par Orbot</string>
+  <string name="wizard_details_msg">Orbot ir atvērta koda lietojumprogramma, kura ietver Tor, LibEvent un Polipo. Programma nodrošina vietēju HTTP starpniekseveri (8118) un SOCKS starpniekserveri (9050) uz Tor tīklu. Turklāt saknes tiesību līmenī strādājošā ierīcē, Orbot spēj pārsūtīt visu interneta datplūsmu caur Tor.</string>
+  <string name="wizard_permissions_root">Tiesības piešķirtas</string>
+  <string name="wizard_permissions_stock">Orbot tiesības</string>
+  <string name="wizard_premissions_msg_root">Ļoti labi! Mēs konstatējām, ka Orbot\'am ir iespējotas saknes tiesības. Mēs apdomīgi izmantosim šīs tiesības.</string>
+  <string name="wizard_permissions_msg_stock">Lai gan tas nav obligāti, Orbot kļūst par vēl ietekmīgāku rīku, ja Jūsu ierīcei ir saknes piekļuves tiesības. Izmantojiet zemāk atrodošos pogu, lai piešķirtu Orbot\'am īpašu spēku!  </string>
+  <string name="wizard_permissions_no_root">Ja Jums nav saknes piekļuves tiesību vai Jums nav nojausmas par ko te ir runa, pārliecinieties, ka izmantojat lietotnes, kuras paredzētas darbam ar Orbot.</string>
+  <string name="wizard_permissions_consent">Es saprotu un vēlos turpināt bez superlietotāja tiesībām.</string>
+  <string name="wizard_permission_enable_root">Piešķirt Orbot saknes tiesības</string>
+  <string name="wizard_configure">Konfigurēt torifikāciju</string>
+  <string name="wizard_configure_msg">Orbot sniedz iespēju maršrutēt visu lietojumu datplūsmu caur Tor\'u vai izvēlēties lietojumprogrammas tās norādot individuāli.</string>
+  <string name="wizard_configure_all">Visas lietotnes izmantot starpniecības režīmā caur Tor</string>
+  <string name="wizard_configure_select_apps">Izvēlēties individuālas lietotnes Tor\'am</string>
+  <string name="wizard_tips_tricks">Orbot-iespējotas lietotnes</string>
+  <string name="wizard_tips_msg">Zemāk norādītās lietotnes ir izveidotas darbam ar Orbot. Noklikšķiniet katru no pogām, lai instalētu tūliņ, vai varat tās uzmeklēt vēlāk Android Tirgū.</string>
+  <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="wizard_tips_twitter">Twitter atbalsta http starpnieku \"localhost:8118\"</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Sagatavojiet stāstu un, lai uzlabotu drošību, atstājiet to Tor!</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>
+  <string name="wizard_proxy_help_msg">Ja Jūsu lietotā Android lietotne spēj nodrošināt HTTP vai SOCKS starpniekserveri, tad varat to nokonfigurēt tā, lai tā savienotos ar Orbot un lietotu Tor. Viesotāja iestatījumi ir 127.0.0.1 vai „localhost”. HTTP porta iestatījums ir 8118. SOCKS starpniekserveris ir 9050. Pēc iespējas izmantojiet SOCKS4A vai SOCKS5. Uzziniet vairāk par starpniekošanu Android platformā un tīmekļa vietnē lasiet atbildes, kuras sagatavotas biežāk uzdotiem jautājumiem jeb FAQ: http://tinyurl.com/proxyandroid</string>
+  <string name="wizard_final">Orbot ir gatavs darbam!</string>
+  <string name="wizard_final_msg">Miljoniem ļaužu visā pasaulē lieto Tor dažādiem mērķiem. Žurnālisti un emuāru autori, cilvēktiesību aizstāvji, likumsargi, karavīri, korporācijas, apspiestībā dzīvojuši iedzīvotāji, un vienkārši parasti cilvēki ... un tagad arī Jūs esat tam gatavs!</string>
+  <string name="wizard_exit_at_first_screen_toast">Lūdzu nokonfigurējiet Orbot pirms sākat to lietot!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Šī darbība tīmekļa pārlūkā atvērs https://check.torproject.org , lai redzētu vai Orbot ir konfigurēts un esat izveidojies savienojumu ar Tor.</string>
+  <string name="pref_hs_group">Slēptu pakalpojumu viesošana</string>
+  <string name="pref_general_group">Vispārīgi</string>
+  <string name="pref_start_boot_title">Startēt Orbot, kad ielādējas</string>
+  <string name="pref_start_boot_summary">Automātiski startēt Orbot, un veidot savienojumu ar Tor, kad Jūsu Android ierīce ielādējas</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot ieved Tor Android\'u pasaulē! Tor palīdz aizsargāties pret satura filtrēšanu, datplūsmas analīzi un tīkla novērošanu, kuras apdraud privātumu, konfidenciālu informāciju un personiskās attiecības. Šis vednis palīdzēs Jūsu iekārtā nokonfigurēt Orbot\'u un Tor\'u.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Brīdinājums</string>
+  <string name="wizard_warning_msg">Pati Orbot instalēšana vēl nepadarīs anonīmu Jūsu mobilo datplūsmu.\n\nJums pareizi jānokonfigurē Orbot, sava ierīce un citas lietotnes, lai sekmīgi lietotu Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Tesības</string>
+  <string name="wizard_permissions_root_msg1">Pēc izvēles variet piešķirt Orbot\'am \'Superlietotāja\' piekļuves tiesības, lai iespēju lietpratīgus līdzekļus, tādus kā Transparent Proxying jeb Pārredzamā .</string>
+  <string name="wizard_permissions_root_msg2">Ja nevēlaties šo darīt, lūdzu, pārliecinieties, ka izmantojat lietotnes, kuras paredzētas darbam ar Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Šķiet, ka Jūsu ierīce nav saknēta vai arī nenodrošina saknes jeb superlietotāja piekļuvi.\n\nLūdzu pamēģiniet citādi - galvenajā ekrānā lietojiet režīmu „Lietotnes”.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Visas Guardian Project\'a lietotnes atrodamas Google Play\'ā</string>
+  <string name="wizard_tips_fdroid">Atrodiet visas Guardian Project lietotnes F-Droid\'ā</string>
+  <string name="wizard_tips_fdroid_org">Atrodiet visas Guardian Project lietotnes https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Pārredzama starpniekošana</string>
+  <string name="wizard_transproxy_msg">Šis ļauj Jūsu lietotnēm automātiski, bez jebkādas papildu konfigurācijas darboties caur Tor tīklu.</string>
+  <string name="wizard_transproxy_hint">(Atzīmējiet šo kastīti gadījumā ja Jums nav ne mazākās nojausmas par to, ko mēs te runājam)</string>
+  <string name="wizard_transproxy_none">Neviens</string>
+  <string name="pref_transparent_tethering_title">Tor valgošana</string>
+  <string name="pref_transparent_tethering_summary">Iespējot Tor Pārredzamo starpniekošanu Wifi\'m un USB valgošanas ierīcēm (nepieciešams pārstartēt)</string>
+  <string name="button_grant_superuser">Pieprasīt superlietotāja piekļuvi</string>
+  <string name="pref_select_apps">Izvēlēties lietotnes</string>
+  <string name="pref_select_apps_summary">Izvēlēties lietotnes, lai maršrutētu caur Tor</string>
+  <string name="pref_node_configuration">Mezglu konfigurācija</string>
+  <string name="pref_node_configuration_summary">Šie it lietpratīgie iestatījumi, kuri var samazināt Jūsu anonimitāti</string>
+  <string name="pref_entrance_node">Ieejas mezgli</string>
+  <string name="pref_entrance_node_summary">Ciparvirknes, segvārdi, valstis un adreses pirmajam lēkumam</string>
+  <string name="pref_entrance_node_dialog">Ievadiet ieejas mezglus</string>
+  <string name="button_proxy_all">Lietot starpniekserveri visam</string>
+  <string name="button_proxy_none">Nekam nelietot starpniekserveri</string>
+  <string name="button_invert_selection">Mainīt atlasi uz pretējo</string>
+  <string name="pref_proxy_title">Tīkla ārejošais starpnieks (neobligāts)</string>
+  <string name="pref_proxy_type_title">Ārvērstā starpnieka tips</string>
+  <string name="pref_proxy_type_summary">Starpnieka serverim izmantojamais protokols: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Ievadiet starpnieka tipu</string>
+  <string name="pref_proxy_host_title">Ārvērstā starpnieka viesotājs</string>
+  <string name="pref_proxy_host_summary">Starpniekservera mitinātājvārds</string>
+  <string name="pref_proxy_host_dialog">Ievadiet starpnieka viesotāju</string>
+  <string name="pref_proxy_port_title">Ārvērstā starpnieka ports</string>
+  <string name="pref_proxy_port_summary">Starpniekservera ports</string>
+  <string name="pref_proxy_port_dialog">Ievadiet starpnieka portu</string>
+  <string name="pref_proxy_username_title">Ārvērstā starpnieka lietotājvārds</string>
+  <string name="pref_proxy_username_summary">Starpnieka lietotājvārds (neobligāts)</string>
+  <string name="pref_proxy_username_dialog">Ievadīt starpnieka lietotājvardu</string>
+  <string name="pref_proxy_password_title">Ārvērstā starpnieka parole</string>
+  <string name="pref_proxy_password_summary">Starpnieka parole (neobligāti)</string>
+  <string name="pref_proxy_password_dialog">Ievadīt starpnieka paroli</string>
+  <string name="status">Statuss</string>
+  <string name="setting_up_full_transparent_proxying_">Iestata pilnībā pārredzamu starpniekošanu...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Iestata lietotņu nodrošinātu starpniekošanu...</string>
+  <string name="transparent_proxying_enabled">Pārredzama starpniekošana IESPĒJOTA</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy iespējots valgošanai!</string>
+  <string name="warning_error_starting_transparent_proxying_">BRĪDINĀJUMS: kļūda uzsākot pārredzamu starpniekošanu!</string>
+  <string name="transproxy_rules_cleared">TransProxy kārtulas notīrītas</string>
+  <string name="couldn_t_start_tor_process_">Neizdevās palaist Tor\'a procesu:</string>
+  <string name="privoxy_is_running_on_port_">Polipo strādā caur portu: </string>
+  <string name="setting_up_port_based_transparent_proxying_">Iestata portu nodrošinātu pārredzamu starpniekošanu...</string>
+  <string name="bridge_error">Tilta kļūda</string>
+  <string name="bridge_requires_ip">Lai izmantotu tilta līdzekli, jāievada vismaz viena tilta IP adrese.</string>
+  <string name="send_email_for_bridges">No Gmail konta sūtiet e-pastu uz bridges at torproject.org ar rindu \"get bridges\" e-pasta ziņojuma korpusā.</string>
+  <string name="error">Kļūda</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Jūsu ReachableAddresses iestatījumi izraisīja izņēmuma stāvokli!</string>
+  <string name="your_relay_settings_caused_an_exception_">Jūsu retranslatora iestatījumi izraisīja izņēmuma situāciju!</string>
+  <string name="exit_nodes">Izejas mezgli</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Pēdējā lēkuma ciparvirknes, segvārdi, valstis un adreses</string>
+  <string name="enter_exit_nodes">Ievadiet izejas mezglus</string>
+  <string name="exclude_nodes">Neiekļautie mezgli</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Izslēdzamās ciparvirknes, segvārdi, valstis un adreses</string>
+  <string name="enter_exclude_nodes">Ievadīt Neiekļaujamos mezglus</string>
+  <string name="strict_nodes">Precīzie mezgli</string>
+  <string name="use_only_these_specified_nodes">Izmantojiet *vienīgi* šos norādītos mezglus</string>
+  <string name="bridges">Tilti</string>
+  <string name="use_bridges">Lietot tiltus</string>
+  <string name="bridges_obfuscated">Nomaskētie tilti</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Iespējot alternatīvus tīkla Tor ieejas mezglus </string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Iespējot, ja konfigurētie tilti ir nomaskētie tilti</string>
+  <string name="ip_address_and_port_of_bridges">Tiltu ports un IP addrese</string>
+  <string name="enter_bridge_addresses">Ievadiet tiltu adreses</string>
+  <string name="relays">Retranslatori</string>
+  <string name="relaying">Retranslēšana</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Iespējot Jūsu iekārtu par bezapstājas retranslatoru</string>
+  <string name="relay_port">Retranslatora ports</string>
+  <string name="listening_port_for_your_tor_relay">Jūsu Tor retranslatora klausīšanās ports</string>
+  <string name="enter_or_port">Ievadiet OR portu</string>
+  <string name="relay_nickname">Retranslatora segvārds</string>
+  <string name="the_nickname_for_your_tor_relay">Jūsu Tor\'a retranslatora segvārds</string>
+  <string name="enter_a_custom_relay_nickname">Ievadiet brīvi izraudzītu rertranslatora segvārdu</string>
+  <string name="reachable_addresses">Sasniedzamās adreses</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Izpildīt kā klientprogrammu aiz ugunsmūra, kurš nodrošina ierobežojošu kārtību</string>
+  <string name="reachable_ports">Sasniedzamie porti</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Porti, kuri sasniedzami otrpus ierobežojoša ugunsmūra</string>
+  <string name="enter_ports">Ievadiet portus</string>
+  <string name="enable_hidden_services">Slēptu pakalpojumu viesošana</string>
+  <string name="run_servers_accessible_via_the_tor_network">ļaut no tīkla Tor piekļūt serverim, kurš ir ierīcē.  </string>
+  <string name="enter_localhost_ports_for_hidden_services">ievadiet slēpto pakalpojumu localhost portus</string>
+  <string name="hidden_service_ports">Slēptu pakalpojumu porti</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Jūsu slēptā pakalpojuma adresējams vārds (tiek ģenerēts automātiski)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">iespējot atkļūdošanas žurnālu izvadei (jālieto adb vai aLogCat , lai skatītu)</string>
+  <string name="project_home">Projekta mājas:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor licence</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Trešo personu programmatūra:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Lietotne vēlas atvērt slēptu servera portu %S uz tīklu Tor. Tas ir droši, ja uzticaties lietotnei.</string>
+  <string name="found_existing_tor_process">Atrada esošu Tor procesu...</string>
+  <string name="something_bad_happened">Nav labi. Pārbaudiet žurnālu</string>
+  <string name="hidden_service_on">Slēpts pakalpojums uz:</string>
+  <string name="unable_to_read_hidden_service_name">Nespēj lasīt slēpta pakalpojuma nosaukumu</string>
+  <string name="unable_to_start_tor">Nevar startēt Tor:</string>
+  <string name="unable_to_reset_tor">Nespēja atiestatīt Tor, sāknējiet ierīci atkārtoti!</string>
+  <string name="pref_use_sys_iptables_title">Izmantot noklusējuma Iptables</string>
+  <string name="pref_use_sys_iptables_summary">lietot iebūvēto bināro datni iptables nevis to, kura ir Orbot komplektācijā</string>
+  <string name="error_installing_binares">Tor binārās datnes nebija iespējams ne instalēt, ne jaunināt.</string>
+  <string name="pref_use_persistent_notifications">Vienmēr paturēt ikonu rīkjoslā, kad Orbot ir savienots</string>
+  <string name="pref_use_persistent_notifications_title">Vienmēr ieslēgtie paziņojumi</string>
+  <string name="pref_use_expanded_notifications">Rādīt paplašinātus paziņojumus, kur norādīts IP un Tor izejas valsts</string>
+  <string name="pref_use_expanded_notifications_title">Paplašināti paziņojumi</string>
+  <string name="notification_using_bridges">Tilti ir iespējoti!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Valoda</string>
+  <string name="set_locale_summary">Iestatiet Orbot lokalizāciju un valodu</string>
+  <string name="wizard_locale_title">Izvēlēties valodu</string>
+  <string name="wizard_locale_msg">Atstājiet noklusējuma vērtības, vai pārslēdziet pašreizējo valodu.</string>
+  <string name="powered_by">strādā ar Tor</string>
+  <string name="btn_save_settings">Saglabāt iestatījumus</string>
+  <string name="no_internet_connection_tor">Nav interneta savienojuma; Tor ir gaidstāvē...</string>
+  <string name="bandwidth_">Joslas platums:</string>
+  <string name="down">lejup</string>
+  <string name="up">augšup</string>
+  <string name="pref_disable_network_title">Neizmantot tīkla automātiskā miega režīmu</string>
+  <string name="pref_disable_network_summary">Kad nav interneta, pārslēgt Tor\'u uz miega režīmu</string>
+  <string name="newnym">Jūs pārslēdzāties uz jaunu Tor\'a identitāti!</string>
+  <string name="menu_use_chatsecure">Lietot ChatSecure</string>
+  <string name="permission_manage_tor_label">Pārvaldīt Tor\'u</string>
+  <string name="permission_manage_tor_description">Iespējot šo lietotni kontrolēt pakalpojumu Tor</string>
+  <string name="install_apps_">Vai instalēt lietotnes?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Nav tīkla savienojuma. Tor\'am iestata miega režīmu...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Labs tīkla savienojums. Aktivizē Tor\'u...</string>
+  <string name="updating_settings_in_tor_service">atjaunina Tor pakalpojuma iestatījumus </string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Ports, uz kura Tor piedāvā savu SOCKS starpniekserveri (noklusējumvērtība: 9050 vai 0 lai atspējotu)</string>
+  <string name="pref_socks_dialog">SOCKS Port Config</string>
+  <string name="pref_transport_title">Tor TransProxy Port</string>
+  <string name="pref_transport_summary">Ports, uz kura Tor piedāvā savu Transparent starpniekserveri (noklusējumvērtība: 9040 vai 0 lai atspējotu)</string>
+  <string name="pref_transport_dialog">TransProxy Port Config</string>
+  <string name="pref_dnsport_title">Tor DNS Ports</string>
+  <string name="pref_dnsport_summary">Ports, uz kura Tor piedāvā savu DNS (noklusējumvērtība: 5400 vai 0 lai atspējotu)</string>
+  <string name="pref_dnsport_dialog">DNS Port konfigurēšana</string>
+  <string name="pref_torrc_title">Torrc pielāgota konfigurēšana</string>
+  <string name="pref_torrc_summary">VIENĪGI EKSPERTIEM: tieši ievadīt torrc konfigurēšanas rindas</string>
+  <string name="pref_torrc_dialog">Pielāgot Torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus - Benetech\'a cilvēktiesību dokumentācijas lietotne</string>
+  <string name="your_tor_public_ips_">Jūsu Tor publiskās IP:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Lūdzu atspējojiet šo lietotni Android->Settings->Apps , ja rodas ar Orbot saistītas problēmas: </string>
+  <string name="app_conflict">Lietotņu konflikts</string>
+  <string name="pref_transproxy_refresh_title">Pārredzamā starpniekservera automātiska atsvaidzināšana</string>
+  <string name="pref_transproxy_refresh_summary">Kad mainās tīkla stāvoklis, atkārtoti lietot Pārredzamā starpniekserva kārtulas</string>
+  <string name="pref_transproxy_flush_title">Pārredzamā starpniekservera  PIESPIEDU NOŅEMŠANA</string>
+  <string name="pref_transproxy_flush_summary">Pieskarties te, lai TŪLĪT iztīrītu visas pārredzamā starpniekservera tīkla kārtulas</string>
+  <string name="transparent_proxy_rules_flushed_">Pārredzamā starpniekservera kārtulas ir iztīrītas!</string>
+  <string name="you_do_not_have_root_access_enabled">SAKNES piekļuve nav iespējota</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Lai iestatījumu maiņa tiktu iespējota, Jums var nākties apturēt un startēt Orbot.</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Tilti ir atjaunināti</string>
+  <string name="restart_orbot_to_use_this_bridge_">Lūdzu pārstartējiet Orbot, lai iespējotu izmaiņas</string>
+  <string name="menu_qr">QR kodi</string>
+  <string name="bridge_mode">Tiltu režīms</string>
+  <string name="get_bridges_email">E-pasts</string>
+  <string name="get_bridges_web">Tīmeklis</string>
+  <string name="activate">Aktivizēt</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Jūs varat iespējot visas savas ierīces lietotnes strādāt Tor tīklā, izmantojot Android VPN raksturiezīmi.\n\n*BRĪDINĀJUMS* Šī ir jauna, eksperimentāla raksturiezīme un dažos gadījumos tā var nesākt darbu automātiski, bet citos tā var pati pārtraukt darboties. To NEVAJAG izmantot anonimitātes nodrošināšanai, bet to var izmantot VIENĪGI lai strādātu caur ugunsmūriem un filtriem.</string>
+  <string name="send_email">Nosūtīt e-pastu</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Jūs varat saņemt tiltu adreses e-pastā, tīmeklī vai skenējot tiltu QR kodu. Zemāk atlasiet „E-pasts” vai „Tīmeklis”, lai pieprasītu tiltu adreses. Kad esat saņēmis adreses, tad tās iekopējiet un ielīmējiet Orbot iestatījumu preferencēs „Tilti” un pārstartējiet.</string>
+  <string name="standard_browser">Standarta pārlūks</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">PIEZĪME: Uz Intel X86/ATOM ierīcēm darbosies tikai standarta Tor tilti</string>
+</resources>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
new file mode 100644
index 0000000..c5ca87f
--- /dev/null
+++ b/app/src/main/res/values-mk/strings.xml
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot е слободна прокси апликација која им овозможува на другите апликации да го користат интернетот побезбедно. Orbot користи Tor за шифрирање на интернет-сообраќајот, а потоа го сокрива и го доставува преку неколку компјутери во целиот свет. Tor е слободен софтвер и отворена мрежа која се справува со вид надзор на мрежата која штети на личната слобода и приватноста, доверливи деловни активности и односи, и државната безбедност позната како анализа на сообраќајот.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">стартувај и стопирај ја Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Орбот се стартува...</string>
+  <string name="status_activated">Поврзан на мрежата на Tor</string>
+  <string name="status_disabled">Орбот е деактивиран</string>
+  <string name="tor_process_starting">Стартување на клиентот на Tor...</string>
+  <string name="tor_process_complete">завршено.</string>
+  <string name="tor_process_waiting">чекање.</string>
+  <string name="not_anonymous_yet">ВНИМАНИЕ: Вашиот сообраќај сè уште не е анонимен! Потребно е да ги конфигурирате Вашите апликации за да го користат проксито за HTTP, 127.0.0.1:8118, или проксито за SOCKS4A или SOCKS5, 127.0.0.1:9050</string>
+  <string name="menu_home">Дома</string>
+  <string name="menu_browse">Прелистување</string>
+  <string name="menu_settings">Поставки</string>
+  <string name="menu_log">Дневник</string>
+  <string name="menu_info">Помош</string>
+  <string name="menu_start">Стартувај</string>
+  <string name="menu_stop">Стопирај</string>
+  <string name="menu_about">За</string>
+  <string name="main_layout_download">Преземи</string>
+  <string name="main_layout_upload">Прикачи</string>
+  <string name="button_help">Помош</string>
+  <string name="button_close">Затвори</string>
+  <string name="button_about">За</string>
+  <string name="button_clear_log">Избриши дневник</string>
+  <string name="menu_verify">Провери</string>
+  <string name="menu_exit">Излез</string>
+  <string name="menu_scan">Скенирај BridgeQR</string>
+  <string name="menu_share_bridge">Сподели BridgeQR</string>
+  <string name="press_to_start">- пристисни подолго за старт -</string>
+  <string name="pref_trans_proxy_group">Транспарентно проксирање (бара root пристап)</string>
+  <string name="pref_trans_proxy_title">Транспарентно проксирање</string>
+  <string name="pref_trans_proxy_summary">Автоматско торифицирање на апликациите</string>
+  <string name="pref_transparent_all_title">Целосно торифицирање</string>
+  <string name="pref_transparent_all_summary">Проксирај го сообраќајот на сите апликации преку Tor</string>
+  <string name="pref_transparent_port_fallback_title">Резервна порта за прокси</string>
+  <string name="pref_transparent_port_fallback_summary">ВНИМАНИЕ: Избегни ги често користените порти (80, 443, итн). *USE ONLY* ако режимите \'All\' или \'App\' не работат.</string>
+  <string name="pref_transparent_port_title">Листа на порти</string>
+  <string name="pref_transparent_port_summary">Листа на порти за прокси. *USE ONLY* ако режимите \'All\' или \'App\' не работат.</string>
+  <string name="pref_transparent_port_dialog">Внесете порти за прокси</string>
+  <string name="pref_has_root">Барање за пристап до root</string>
+  <string name="pref_has_root_summary">Барање за пристап до root за транспарентно проксирање</string>
+  <string name="status_install_success">Извршните програми за Tor се успешно инсталирани!</string>
+  <string name="status_install_fail">Извршните фајлови на Tor не можат да се инсталираат. Проверете во дневникот и известете нè на tor-assistants at torproject.org</string>
+  <string name="title_error">Апликациска грешка</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">За Орбот</string>
+  <string name="btn_next">Следно</string>
+  <string name="btn_back">Назад</string>
+  <string name="btn_finish">Крај</string>
+  <string name="btn_okay">Во ред</string>
+  <string name="btn_cancel">Откажи</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Неколку детали за Орбот</string>
+  <string name="wizard_details_msg">Orbot е апликација со отворен код која ги содржи Tor, LibEvent и Polipo. Обезбедува локален HTTP прокси (8118) и SOCKS прокси (9050) во мрежата на Tor. Orbot, исто така, има опција кај основниот уред да го испраќа целиот интернет-сообраќај преку Tor.</string>
+  <string name="wizard_permissions_root">Дозволата е издадена</string>
+  <string name="wizard_permissions_stock">Дозволи на Orbot</string>
+  <string name="wizard_premissions_msg_root">Одлично! Откривме дека овозможивте root пристап за Orbot. Внимателно ќе ја користиме оваа опција.</string>
+  <string name="wizard_permissions_msg_stock">Иако не е задолжително, Orbot може да стане помоќна алатка доколку вашиот уред има root пристап. Со копчето подолу Orbot може да добие супер-моќ.</string>
+  <string name="wizard_permissions_no_root">Ако немате root пристап или ако не разбирате за што зборуваме, осигурајте се дека користите апликации кои што работат со Orbot.</string>
+  <string name="wizard_permissions_consent">Разбирам и сакам да продолжам без администраторски привилегии</string>
+  <string name="wizard_permission_enable_root">Додели root за Orbot</string>
+  <string name="wizard_configure">Конфигурација на торифицирањето</string>
+  <string name="wizard_configure_msg">Orbot преку Tor овозможува да се рутира целиот сообраќај на сите апликации или на секоја апликација одделно.</string>
+  <string name="wizard_configure_all">Проксирај ги сите апликации преку Tor</string>
+  <string name="wizard_configure_select_apps">Избери посебни апликации за Tor</string>
+  <string name="wizard_tips_tricks">Апликации кои го поддржуваат Orbot</string>
+  <string name="wizard_tips_msg">Апликациите подолу се креирани да работат со Orbot. Притисни го секое копче за инсталација или може да се најдат на Google Play, на веб-локацијата GuardianProject.info  или преку F-Droid.org.</string>
+  <string name="wizard_tips_otrchat">ChatSecure - Безбедносен инстант клиент за разговор за Android</string>
+  <string name="wizard_tips_proxy">Поставки за прокси - Дознај како да се конфигурираат апликациите да работат со Orbot</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo апликација за пребарување</string>
+  <string name="wizard_tips_twitter">Подесете Twitter прокси на компјутерот \"localhost\" и порта 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Направи приказна и остави ја нејзината безбедност на Tor!</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_proxy_help_msg">Доколку Android апликацијата што се користи поддржува HTTP или SOCKS прокси, тогаш може да се конфигурира да се поврзе со Orbot и да користи Tor.\n\n\n Поставките за компјутерот се 127.0.0.1 или \"localhost\". За HTTP подесувањата на порта се 8118. За SOCKS проксито е 9050. Доколку е возможно треба да се користи SOCKS4A или SOCKS5.\n \n\n\n Може да дознаете повеќе за проксирање на Android преку ЧПП на: http://tinyurl.com/proxyandroid\n </string>
+  <string name="wizard_final">Orbot е спремен!</string>
+  <string name="wizard_final_msg">Милиони луѓе низ целиот свет го користат Tor за различни причини.\n\nНовинари и блогери, борци за човекови права, адвокати, војници, корпорации, граѓаните на репресивните режими и обичните граѓани ... а од сега и вие!</string>
+  <string name="wizard_exit_at_first_screen_toast">Ве молиме конфигурирајте го Орбот пред да започнете да го користите!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Ова ќе ја отвори страницата https://check.torproject.org во Вашиот веб-прелистувач за да видете дали Orbot е правилно конфигуриран и дали сте поврзани на Тор.</string>
+  <string name="pref_hs_group">Скриени сервиси за хостирање</string>
+  <string name="pref_general_group">Општо</string>
+  <string name="pref_start_boot_title">Стартувај го Orbot за бутирање</string>
+  <string name="pref_start_boot_summary">Автоматски стартувај го Orbot и поврзи го Tor кога твојот Android уред се стартува</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot го овозможува Tor за Android!\n\nTor помага против филтрирање на содржината, анализа на сообраќајот и надзор на мрежата кои штетат на приватноста, доверливи инфомации и лични односи.\n\nОвој волшебник помага за конфигурација на Orbot и Tor на вашиот уред.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Внимание</string>
+  <string name="wizard_warning_msg">Само инсталирање на Orbot нема автоматски да го анонимизира вашиот мобилен сообраќај.\n\nМорате правилно да ги конфигурирате Orbot, вашиот уредот и други апликации, за да успешно го користите Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Дозволи</string>
+  <string name="wizard_permissions_root_msg1">Опционално може да се добие администраторски пристап за Orbot кој овозможува напредни функции, како што е транспарентно проксирање.</string>
+  <string name="wizard_permissions_root_msg2">Доколку не сакате да го направите ова, осигурајте се дека вашите апликации работат со Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Вашиот уред не е основен или не дозволува пристап до основен уред или администраторски пристап.\n\nПробајте го режимот \'Апликации\' на главниот екран.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Апликации кои го поддржуваат Orbot</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: Безбедносна апликација за разговор со енкрипција \'Off-the-Record\' </string>
+  <string name="wizard_tips_play">Најди ги сите Guardian Project апликации на Google Play</string>
+  <string name="wizard_tips_fdroid">Најди ги сите Guardian Project апликации на F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Најди ги сите Guardian Project апликации на https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Транспарентно проксирање</string>
+  <string name="wizard_transproxy_msg">Ова овозможува вашите апликации автоматски да се стартуваат преку мрежата Tor без конфигурација.</string>
+  <string name="wizard_transproxy_hint">(Селектирајте го ова поле ако не разбирате за што зборуваме)</string>
+  <string name="wizard_transproxy_none">Ништо</string>
+  <string name="pref_transparent_tethering_title">Tor поврзување</string>
+  <string name="pref_transparent_tethering_summary">Овозможи транспарентно проксирање на Tor за уреди поврзани преку Wifi и USB  (бара рестартирање)</string>
+  <string name="button_grant_superuser">Барање за пристап до администратор на системот</string>
+  <string name="pref_select_apps">Изберете апликации</string>
+  <string name="pref_select_apps_summary">Одбери апликации кои ќе се поврзуваат преку Тор</string>
+  <string name="pref_node_configuration">Конфигурација на јазол</string>
+  <string name="pref_node_configuration_summary">Ова се напредните поставувања кои можат да ја намалат вашата анонимност</string>
+  <string name="pref_entrance_node">Влезни јазли</string>
+  <string name="pref_entrance_node_summary">Отпечатоци од прсти, прекари, земји и адреси за првиот скок.</string>
+  <string name="pref_entrance_node_dialog">Внесете влезни јазли</string>
+  <string name="button_proxy_all">Се за проксирање</string>
+  <string name="button_proxy_none">Ништо за проксирање</string>
+  <string name="button_invert_selection">Преврти го изборот</string>
+  <string name="pref_proxy_title">Излезен прокси на мрежата (незадолжително)</string>
+  <string name="pref_proxy_type_title">Тип на излезен прокси</string>
+  <string name="pref_proxy_type_summary">Протокол за користење на прокси-сервер: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Внесете го типот на проски</string>
+  <string name="pref_proxy_host_title">Излезен домаќин на прокси</string>
+  <string name="pref_proxy_host_summary">Име на домаќин на серверот на прокси</string>
+  <string name="pref_proxy_host_dialog">Внесете домаќин на прокси</string>
+  <string name="pref_proxy_port_title">Излезна порта на прокси</string>
+  <string name="pref_proxy_port_summary">Порта на серверот на прокси</string>
+  <string name="pref_proxy_port_dialog">Внесете порта на прокси</string>
+  <string name="pref_proxy_username_title">Kорисничко име на излезен прокси</string>
+  <string name="pref_proxy_username_summary">Корисничко име на прокси (незадолжително)</string>
+  <string name="pref_proxy_username_dialog">Внесете корисничко име на прокси</string>
+  <string name="pref_proxy_password_title">Лозинка на излезен прокси</string>
+  <string name="pref_proxy_password_summary">Лозинка на прокси (незадолжително)</string>
+  <string name="pref_proxy_password_dialog">Внесете лозинка на прокси</string>
+  <string name="status">Статус</string>
+  <string name="setting_up_full_transparent_proxying_">Поставување на целосно транспарентно проксирање...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Поставување транспарентно проксирање базирано на апликација...</string>
+  <string name="transparent_proxying_enabled">Tранспарентното проксирање е ОВОЗМОЖЕНО</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy е овозможен за поврзување!</string>
+  <string name="warning_error_starting_transparent_proxying_">ВНИМАНИЕ: Грешка при стартување на транспарентно проксирање!</string>
+  <string name="transproxy_rules_cleared">Избришани правила за TransProxy </string>
+  <string name="couldn_t_start_tor_process_">Не може да се започне Tor-процесот:</string>
+  <string name="privoxy_is_running_on_port_">Polipo работи на порта: </string>
+  <string name="setting_up_port_based_transparent_proxying_">Поставување на транспарентно проксирање базирано на порта...</string>
+  <string name="bridge_error">Грешка во мостот</string>
+  <string name="bridge_requires_ip">За да ја користите функцијата на мостот, морате да внесете барем една ИП-адреса на мост.</string>
+  <string name="send_email_for_bridges">Испратете е-пошта од вашата gmail сметка на bridges at torproject.org со содржина \"get bridges\".</string>
+  <string name="error">Грешка</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Вашите поставки за достапните адреси предизвикаа грешка!</string>
+  <string name="your_relay_settings_caused_an_exception_">Вашите поставки за реле предизвикаа грешка!</string>
+  <string name="exit_nodes">Излезни јазли</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Отпечатоци од прсти, прекари, земји и адреси за последниот скок.</string>
+  <string name="enter_exit_nodes">Внесете излезни јазли</string>
+  <string name="exclude_nodes">Исклучи јазли</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Отпечатоци од прсти, прекари, земји и адреси кои треба да се исклучат</string>
+  <string name="enter_exclude_nodes">Внесете ги јазлите кои треба да се исклучат</string>
+  <string name="strict_nodes">Задолжителни јазли</string>
+  <string name="use_only_these_specified_nodes">Користете ги *само* овие наведени јазли</string>
+  <string name="bridges">Мостови</string>
+  <string name="use_bridges">Користи мостови</string>
+  <string name="bridges_obfuscated">Скриени мостови</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Овозможи алтернативни влезни јазли во мрежата Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Овозможи, ако мостовите се скриени мостови</string>
+  <string name="ip_address_and_port_of_bridges">ИП-адреса и порта на мостовите</string>
+  <string name="enter_bridge_addresses">Внесете адреси на мостовите</string>
+  <string name="relays">Релеа</string>
+  <string name="relaying">Пренесување</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Овозможи го уредот да биде реле без излез </string>
+  <string name="relay_port">Порта на реле</string>
+  <string name="listening_port_for_your_tor_relay">Порта за слушање на вашиот реле на Tor</string>
+  <string name="enter_or_port">Внесете OR порта</string>
+  <string name="relay_nickname">Назив на релето</string>
+  <string name="the_nickname_for_your_tor_relay">Назив на вашето реле за Tor</string>
+  <string name="enter_a_custom_relay_nickname">Внесете произволно име за релето</string>
+  <string name="reachable_addresses">Достапни адреси</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Стартувајте го како клиент зад безбедносен ѕид со ограничени полиси</string>
+  <string name="reachable_ports">Достапни порти</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Порти достапни зад рестрективен заштитен ѕид(firewall)</string>
+  <string name="enter_ports">Внесете порти</string>
+  <string name="enable_hidden_services">Скриени сервиси за хостирање</string>
+  <string name="run_servers_accessible_via_the_tor_network"> Овозможи on-device серверот да се пристапи преку мрежата на Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">Внеси ги портите за localhost за скриени сервиси </string>
+  <string name="hidden_service_ports">Порти на скриени сервиси</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Достапно име за вашиот скриен сервис (се генерира автоматски)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Активирај го дневникот за отстранување грешки за излез (за да се прикаже мора да се користи adb или aLogCat)</string>
+  <string name="project_home">Почетна страница:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Лиценца за Tor </string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Софтвер од друг производител:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Апликација сака да отвори скриена порта на серверот %S на мрежата на Tor. Ова е безбедно, ако и\' веруваш на апликацијата.</string>
+  <string name="found_existing_tor_process">Пронајден постоечки Tor-процес ...</string>
+  <string name="something_bad_happened">Настана грешка. Проверете во дневникот</string>
+  <string name="hidden_service_on">Вклучен е скриениот сервис:</string>
+  <string name="unable_to_read_hidden_service_name">не може да се прочита името на скриениот сервис</string>
+  <string name="unable_to_start_tor">Tor не може да се стартува:</string>
+  <string name="unable_to_reset_tor">Рестартирајте го вашиот уред, Tor не може да се ресетира! </string>
+  <string name="pref_use_sys_iptables_title">Користи стандарден Iptables</string>
+  <string name="pref_use_sys_iptables_summary">Користи ги вградените бинарни ИП табели наместо таа што оди со Orbot</string>
+  <string name="error_installing_binares">Извршните датотеки на Tor не можат да се инсталираат или надградат</string>
+  <string name="pref_use_persistent_notifications">Секогаш чувајте ja иконата во лентата со алатки кога Orbot е поврзан</string>
+  <string name="pref_use_persistent_notifications_title">Известувања секогаш вклучени</string>
+  <string name="pref_use_expanded_notifications">Прикажи проширено известување со излезната земја и ИП на Tor</string>
+  <string name="pref_use_expanded_notifications_title">Прошири известувања</string>
+  <string name="notification_using_bridges">Вклучени мостови!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Јазик</string>
+  <string name="set_locale_summary">Избери локални поставки и јазик за Orbot</string>
+  <string name="wizard_locale_title">Избери јазик</string>
+  <string name="wizard_locale_msg">Остави го стандардниот или промени го постоечкиот јазик</string>
+  <string name="powered_by">Овозможено од Tor</string>
+  <string name="btn_save_settings">Сочувај поставки</string>
+  <string name="no_internet_connection_tor">Нема интернет-врска; Tor е во мирување...</string>
+  <string name="bandwidth_">Проток:</string>
+  <string name="down">долу</string>
+  <string name="up">горе</string>
+  <string name="pref_disable_network_title">Нема Auto-Sleep на мрежата</string>
+  <string name="pref_disable_network_summary">Стави го Тор на sleep кога интернетот не е достапен</string>
+  <string name="newnym">Се префрливте на нов идентитет на Tor!</string>
+  <string name="menu_use_chatsecure">Користи ChatSecure</string>
+  <string name="permission_manage_tor_label">Управувај со Tor</string>
+  <string name="permission_manage_tor_description">Дозволи оваа апликација да го управува со сервисот на Tor</string>
+  <string name="install_apps_">Инсталирај апликации?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Нема мрежно поврзување. Ставете го Тор на режимот на спиење...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Мрежното поврзување е добро. Го буди Tor...</string>
+  <string name="updating_settings_in_tor_service">ажурирање на поставките во сервисот Tor </string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Порта на која Тор и\' го нуди својот SOCKS-прокси (стандардно: 9050 или 0 за да се исклучи)</string>
+  <string name="pref_socks_dialog">Kонфигурирање на портата за SOCKS</string>
+  <string name="pref_transport_title">Tor TransProxy порта</string>
+  <string name="pref_transport_summary">Порта на која Tor и го нуди својот транспарентен прокси (стандардно: 9040 или 0 за да се исклучи)</string>
+  <string name="pref_transport_dialog">Kонфигурирање на портата за TransProxy</string>
+  <string name="pref_dnsport_title">DNS-порта за Tor </string>
+  <string name="pref_dnsport_summary">Порта на која Tor го нуди DNS (стандардно: 5400 или 0 за да се исклучи)</string>
+  <string name="pref_dnsport_dialog">конфигурирање на DNS-портата </string>
+  <string name="pref_torrc_title">Произволно конфигурирање на torrc</string>
+  <string name="pref_torrc_summary">САМО ЗА ЕКСПЕРТИ: внесете директни команди за конфигурирање на torrc</string>
+  <string name="pref_torrc_dialog">Произволен torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus - Benetech апликација за документирање на човековите права</string>
+  <string name="your_tor_public_ips_">Вашата јавна ИП за Tor</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Ве молиме исклучете ја оваа апликација во Android->Settings->Apps ако имате проблем со Orbot:</string>
+  <string name="app_conflict">Конфликт со апликацијата</string>
+  <string name="pref_transproxy_refresh_title">Автоматско освежување на Transproxy </string>
+  <string name="pref_transproxy_refresh_summary">Примени ги повторно правилата за TransProxy кога се менува состојбата на мрежата</string>
+  <string name="pref_transproxy_flush_title">ПРИСИЛНО ОТСТРАНУВАЊЕ на Transproxy </string>
+  <string name="pref_transproxy_flush_summary">Допрете овде за да се избришат сите transproxy правила на мрежата СЕГА </string>
+  <string name="transparent_proxy_rules_flushed_">Избришани транспарентни прокси правила</string>
+  <string name="you_do_not_have_root_access_enabled">Немате вклучено пристап до корен</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Може би ќе треба да се стопира и стартува Orbot за да бидат овозможени промените во поставките.</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Ажурирани мостови</string>
+  <string name="restart_orbot_to_use_this_bridge_">Ве молиме рестартирајте го Orbot за да се овозможат промените</string>
+  <string name="menu_qr">QR-кодови</string>
+  <string name="bridge_mode">Режим на работа на мостот</string>
+  <string name="get_bridges_email">Е-пошта</string>
+  <string name="get_bridges_web">Веб</string>
+  <string name="activate">Активирај</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Можете да ги овозможите сите апликации на вашиот уред да работат низ мрежата Tor користејќи VPN-функција на Андроид.\n\n*ВНИМАНИЕ* нова, експериментална функција и во некои случаи нема да стартува автоматски, или може да се стопира. Не треба да се користи за анонимност, и САМО да се користи за минување низ заштитни ѕидови и филтри.</string>
+  <string name="send_email">Испрати е-пошта</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Aдреса на мостови можете да добивате преку е-пошта, веб или со скенирање на QR код. Изберете подолу \'Е-пошта\' или \'Web\', за да побарате адреса за мостот. \n\nОткако ќе ја добиете адресата, копирајте го & и залепете го во делот \"Мостови\" во подесувањето на Orbot и рестартирајте.</string>
+  <string name="standard_browser">Стандарден прелистувач</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">ЗАБЕЛЕШКА: Само стандардните мостови на Tor функционираат на уредите Intel X86/ATOM</string>
+</resources>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/app/src/main/res/values-ml/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-mn/strings.xml b/app/src/main/res/values-mn/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/app/src/main/res/values-mn/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-mr-rIN/strings.xml b/app/src/main/res/values-mr-rIN/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/app/src/main/res/values-mr-rIN/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-ms-rMY/strings.xml b/app/src/main/res/values-ms-rMY/strings.xml
new file mode 100644
index 0000000..e281414
--- /dev/null
+++ b/app/src/main/res/values-ms-rMY/strings.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">mula dan henti Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot telah dimulakan..</string>
+  <string name="status_activated">Bersambung ke rangkaian Tor</string>
+  <string name="status_disabled">\"Orbot telah dinyah-aktifkan</string>
+  <string name="tor_process_starting">Memulakan klien Tor..</string>
+  <string name="tor_process_complete">selesai.</string>
+  <string name="tor_process_waiting">menunggu.</string>
+  <string name="not_anonymous_yet">AMARAN: Trafik anda tidak anonymous lagi! Sila tetapkan aplikasi anda untuk menggunakan proxy HTTP 127.0.0.1:8118 atau proxy SOCKS4A atau SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Rumah</string>
+  <string name="menu_browse">Carian</string>
+  <string name="menu_settings">Tetapan</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Bantuan</string>
+  <string name="menu_start">Mula</string>
+  <string name="menu_stop">Henti</string>
+  <string name="menu_about">Tentang</string>
+  <string name="main_layout_download">Muat turun</string>
+  <string name="main_layout_upload">Muat naik</string>
+  <string name="button_help">Bantuan</string>
+  <string name="button_close">Tutup</string>
+  <string name="button_about">Tentang</string>
+  <string name="button_clear_log">Padam Log</string>
+  <string name="menu_verify">Semak</string>
+  <string name="menu_exit">Keluar</string>
+  <string name="press_to_start">- Tekan lama untuk mulakan - </string>
+  <string name="pref_trans_proxy_group">Proxy Telus (Memerlukan akses Root)</string>
+  <string name="pref_trans_proxy_title">Proxy Telus</string>
+  <string name="pref_trans_proxy_summary">Tetapan Automatik Tor pada Apps</string>
+  <string name="pref_transparent_all_title">Tor segalanya</string>
+  <string name="pref_transparent_all_summary">Trafik proxy untuk semua aplikasi yang melalui Tor</string>
+  <string name="pref_transparent_port_fallback_title">Port proxy undur</string>
+  <string name="pref_transparent_port_fallback_summary">AMARAN: memintasi port biasa (80, 443, dll). * CUMA GUNA * jika mod \'Semua\' atau \'App\' idak berfungsi.</string>
+  <string name="pref_transparent_port_title">Senarai Port</string>
+  <string name="pref_transparent_port_summary">Senarai port untuk proxy. *GUNA HANYA* jika mod \'Semua\' atau \'App\' tidak berfungsi</string>
+  <string name="pref_transparent_port_dialog">Masukkan port untuk proxy</string>
+  <string name="pref_has_root">Minta Akses Root</string>
+  <string name="pref_has_root_summary">Minta akses root untuk proxy telus</string>
+  <string name="status_install_success">Tor berjaya dipasang!</string>
+  <string name="status_install_fail">Fail Tor gagal dipasang. Sila semak log dan maklumkan kepada tor-assistants at torproject.org</string>
+  <string name="title_error">Ralat Aplikasi</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Tentang Orbot</string>
+  <string name="btn_next">Seterusnya</string>
+  <string name="btn_back">Kembali</string>
+  <string name="btn_finish">Tamat</string>
+  <string name="btn_okay">Okay</string>
+  <string name="btn_cancel">Batal</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Maklumat Orbot</string>
+  <string name="wizard_permissions_root">Kebenaran disahkan</string>
+  <string name="wizard_permissions_stock">Kebenaran Orbot</string>
+  <string name="wizard_premissions_msg_root">Bagus! Kami mendapati anda ada akses root yang dibenarkan untuk Orbot. Kami akan gunakan kuasa ini dengan bijak.</string>
+  <string name="wizard_permissions_msg_stock">Walaupun ia tidak diperlukan, Orbot boleh menjadi alat yang berguna jika peranti anda mempunyai akses root. Guna butang di bawah untuk memberi Orbot superpower!</string>
+  <string name="wizard_permissions_no_root">Jika anda tidak mempunyai akses root atau tidak tahu mengenai ini, cuma pastikan anda menggunakan aplikasi yang boleh digunakan dengan Orbot.</string>
+  <string name="wizard_permissions_consent">Saya faham dan mahu teruskan tanpa Superuser</string>
+  <string name="wizard_permission_enable_root">Beri akses Root pada Orbot</string>
+  <string name="wizard_configure">Konfigurasi Torification</string>
+  <string name="wizard_configure_msg">Orbot memberi anda pilihan untuk menghala semua trafik aplikasi melalui Tor ATAU untuk memilih aplikasi untuk digunakan secara individual.</string>
+  <string name="wizard_configure_all">Proxy Semua Aplikasi Melalui Tor</string>
+  <string name="wizard_configure_select_apps">Pilih Aplikasi Untuk Tor</string>
+  <string name="wizard_tips_tricks">Aplikasi Yang Dibenar Menggunakan Orbot</string>
+  <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="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>
+  <string name="wizard_final">Orbot sudah sedia!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Ini akan membuka pelayar web anda untuk https://check.torproject.org untuk melihat jika Orbot mungkin ditetapkan dan anda disambungkan kepada Tor.</string>
+  <string name="pref_hs_group">Perkhidmatan tersembunyi</string>
+  <string name="pref_general_group">Umum</string>
+  <string name="pref_start_boot_title">Mulakan Orbot semasa Boot</string>
+  <string name="pref_start_boot_summary">Mula Orbot secara automatik dan sambung Tor ketika peranti Android boot</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Amaran</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">kebenaran</string>
+  <string name="wizard_permissions_root_msg1">Anda juga boleh memberikan akses Orbot \'SuperUser\' untuk membolehkan ciri-ciri yang maju, seperti Proxying Telus.</string>
+  <string name="wizard_permissions_root_msg2">Jika anda tidak mahu berbuat demikian, sila pastikan untuk menggunakan aplikasi yang dibuat untuk bekerjasama dengan Orbot</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Aplikasi yang membenarkan Orbot</string>
+  <string name="wizard_tips_play">Cari semua projek Guardian di Google play</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxy Telus</string>
+  <string name="wizard_transproxy_msg">Ini membolehkan aplikasi anda secara automatik melalui rangkaian Tor tanpa apa apa konfigurasi</string>
+  <string name="wizard_transproxy_hint">(Tanda kotak ini jika anda belen)</string>
+  <string name="wizard_transproxy_none">Tiada</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Membolehkan Proxying Telus Tor untuk Wifi dan USB Devices terikat (memerlukan restart)</string>
+  <string name="button_grant_superuser">Minta Akses Superuser</string>
+  <string name="pref_select_apps">Pilih Aplikasi</string>
+  <string name="pref_select_apps_summary">Pilih Aplikasi untuk dihalakan melalui Tor</string>
+  <string name="pref_node_configuration">Konfigurasi Nod</string>
+  <string name="pref_node_configuration_summary">Ini ialah tetapan lanjutan yang boleh mengurangkan kadar anonymity anda</string>
+  <string name="pref_entrance_node">Nod Kemasukan</string>
+  <string name="pref_entrance_node_summary">Cap jari, nama samaran, negara, dan alamat untuk lompatan pertama</string>
+  <string name="pref_entrance_node_dialog">Masukkan Nod Kemasukan</string>
+  <string name="pref_proxy_title">Laluan keluar jaringan proxy (tambahan)</string>
+  <string name="pref_proxy_type_title">Jenis Proxy</string>
+  <string name="pref_proxy_type_summary">Protokol untuk digunakan pada pelayan proxy: HTTP,HTTPS,Socks4,Socks5</string>
+  <string name="pref_proxy_type_dialog">Masukkan Jenis Proxy</string>
+  <string name="pref_proxy_host_title">Hos Proxy</string>
+  <string name="pref_proxy_host_summary">Nama hos pelayan proxy</string>
+  <string name="pref_proxy_host_dialog">Masukkan Hos Proxy</string>
+  <string name="pref_proxy_port_title">Port Proxy</string>
+  <string name="pref_proxy_port_summary">Port pelayan proxy</string>
+  <string name="pref_proxy_port_dialog">Masukkan port Proxy</string>
+  <string name="pref_proxy_username_title">Laluan keluar kata nama proxy</string>
+  <string name="pref_proxy_username_summary">Kata nama proxy (tambahan)</string>
+  <string name="pref_proxy_username_dialog">Masukkan kata nama proxy</string>
+  <string name="pref_proxy_password_title">Laluan keluar kata laluan proxy</string>
+  <string name="pref_proxy_password_summary">Kata laluan proxy (tambahan)</string>
+  <string name="pref_proxy_password_dialog">Masukkan kata laluan proxy</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Tetapkan proxy telus secara keseluruhan</string>
+  <string name="setting_up_app_based_transparent_proxying_">Tetapkan proxy telus berdasarkan aplikasi</string>
+  <string name="transparent_proxying_enabled">Proxy telus dibolehkan</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy dibolehkan untuk Tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">AMARAN: ralat semasa memulakan proxy telus!</string>
+  <string name="transproxy_rules_cleared">Peraturan TransProxy dipadam</string>
+  <string name="couldn_t_start_tor_process_">Tidak boleh memulakan proses Tor:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Menetap proxy telus berdasarkan port..</string>
+  <string name="bridge_error">Ralat jambatan</string>
+  <string name="bridge_requires_ip">Untuk menggunakan ciri jambatan, anda mesti masukkan sekurang-kurangnya satu alamat IP jambatan.</string>
+  <string name="send_email_for_bridges">Hantar e-mel kepada bridges at torproject.org dengan garisan \"jambatan\" dengan sendirinya dalam badan mel dari akaun gmail.</string>
+  <string name="error">Ralat</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Tetapan ReachableAddresses anda menyebabkan pengecualian!</string>
+  <string name="your_relay_settings_caused_an_exception_">Tetapan relay anda menyebabkan pengecualian!</string>
+  <string name="exit_nodes">Keluar Nod</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Cap jari, nama samaran, negara, dan alamat untuk lompatan terakhir</string>
+  <string name="enter_exit_nodes">Masukkan Nod Keluar</string>
+  <string name="exclude_nodes">Keluarkan Nod</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Cap jari, nama samaran, negara dan alamat untuk dikeluarkan</string>
+  <string name="enter_exclude_nodes">Masukkan Nod Keluar</string>
+  <string name="strict_nodes">Nod Ketat</string>
+  <string name="use_only_these_specified_nodes">Guna *hanya* nod-nod ini</string>
+  <string name="bridges">Jambatan</string>
+  <string name="use_bridges">Guna Jambatan</string>
+  <string name="bridges_obfuscated">Jambatan Keliru</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Membolehkan nod pintu masuk ganti ke Rangkaian Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Benarkan jika konfigurasi jambatan adalah jambatan keliru</string>
+  <string name="ip_address_and_port_of_bridges">Alamat IP dan pelabuhan jambatan</string>
+  <string name="enter_bridge_addresses">Masukkan Alamat Jambatan</string>
+  <string name="relays">Relays</string>
+  <string name="relaying">Relaying</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Membolehkan peranti anda untuk menjadi geganti bukan keluar</string>
+  <string name="relay_port">Relay Port</string>
+  <string name="listening_port_for_your_tor_relay">Mendapatkan port untuk tetapan relay Tor anda</string>
+  <string name="enter_or_port">Masukkan port OR</string>
+  <string name="relay_nickname">Nama samaran relay</string>
+  <string name="the_nickname_for_your_tor_relay">Nama samaran ini untuk relay Tor anda</string>
+  <string name="enter_a_custom_relay_nickname">Masukkan nama samaran gantian untuk relay</string>
+  <string name="reachable_addresses">Alamat yang dapat dicapai</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Jalan sebagai klien dibelakang firewall dengan peraturan ketat</string>
+  <string name="reachable_ports">Port yang dapat dicapai</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Port yang dapat dicapai dibelakang firewall dengan kawalan ketat</string>
+  <string name="enter_ports">Masukkan port</string>
+  <string name="enable_hidden_services">Benarkan Servis Tersembunyi</string>
+  <string name="run_servers_accessible_via_the_tor_network">Jalankan pelayan boleh diakses melalui rangkaian Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">Masuk port localhost untuk servis tersembunyi</string>
+  <string name="hidden_service_ports">Port servis tersembunyi</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Nama beralamat untuk servis tersembunyi anda (dijana secara automatik)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">benarkan log debug pada output (mesti guna adb atau aLogCat untuk lihat)</string>
+  <string name="project_home">Rumah Projek(s):</string>
+  <string name="the_tor_license">Lesen Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3rd-Party-Software: </string>
+  <string name="hidden_service_request">Satu aplikasi mahu membuka port tersembunyi %S pada rangkaian Tor. Ia selamat jika anda percaya pada aplikasi itu.</string>
+  <string name="found_existing_tor_process">Proses Tor sedia ada ditemui..</string>
+  <string name="something_bad_happened">Sesuatu yang buruk berlaku. Semak log.</string>
+  <string name="hidden_service_on">port tersembunyi pada:</string>
+  <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
+  <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
+  <string name="pref_use_sys_iptables_title">Guna default Iptables</string>
+  <string name="pref_use_sys_iptables_summary">Guna binari built-in iptables daripada yang didatangkan bundle dengan Orbot</string>
+  <string name="error_installing_binares">Tor binari tidak boleh dipasang atau dinaiktaraf</string>
+  <string name="pref_use_persistent_notifications">Sentiasa biar ikon pada toolbar apabila Orbot bersambung</string>
+  <string name="pref_use_persistent_notifications_title">Sentiasa On Notifikasi</string>
+  <string name="notification_using_bridges">Jambatan dibenarkan!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Pilihan tempatan dan bahasa untuk Orbot</string>
+  <string name="wizard_locale_title">Pilih Bahasa</string>
+  <string name="wizard_locale_msg">Biar default atau ubah ke bahasa sekarang</string>
+  <string name="btn_save_settings">Simpan Tetapan</string>
+</resources>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
new file mode 100644
index 0000000..c327e57
--- /dev/null
+++ b/app/src/main/res/values-ms/strings.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">mula dan henti Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot telah dimulakan..</string>
+  <string name="status_activated">Bersambung ke rangkaian Tor</string>
+  <string name="status_disabled">\"Orbot telah dinyah-aktifkan</string>
+  <string name="status_shutting_down">Orbot sedang ditutup</string>
+  <string name="tor_process_starting">Memulakan klien Tor..</string>
+  <string name="tor_process_complete">selesai.</string>
+  <string name="tor_process_waiting">menunggu.</string>
+  <string name="not_anonymous_yet">AMARAN: Trafik anda tidak anonymous lagi! Sila tetapkan aplikasi anda untuk menggunakan proxy HTTP 127.0.0.1:8118 atau proxy SOCKS4A atau SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Rumah</string>
+  <string name="menu_browse">Carian</string>
+  <string name="menu_settings">Tetapan</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Bantuan</string>
+  <string name="menu_apps">Apps</string>
+  <string name="menu_start">Mula</string>
+  <string name="menu_stop">Henti</string>
+  <string name="menu_about">Tentang</string>
+  <string name="button_help">Bantuan</string>
+  <string name="button_close">Tutup</string>
+  <string name="button_about">Tentang</string>
+  <string name="button_clear_log">Padam Log</string>
+  <string name="menu_verify">Semak</string>
+  <string name="menu_exit">Keluar</string>
+  <string name="press_to_start">- Tekan lama untuk mulakan - </string>
+  <string name="pref_trans_proxy_group">Proxy Telus (Memerlukan akses Root)</string>
+  <string name="pref_trans_proxy_title">Proxy Telus</string>
+  <string name="pref_trans_proxy_summary">Tetapan Automatik Tor pada Apps</string>
+  <string name="pref_transparent_all_title">Tor segalanya</string>
+  <string name="pref_transparent_all_summary">Trafik proxy untuk semua aplikasi yang melalui Tor</string>
+  <string name="pref_transparent_port_fallback_title">Port proxy undur</string>
+  <string name="pref_transparent_port_fallback_summary">AMARAN: memintasi port biasa (80, 443, dll). * CUMA GUNA * jika mod \'Semua\' atau \'App\' idak berfungsi.</string>
+  <string name="pref_transparent_port_title">Senarai Port</string>
+  <string name="pref_transparent_port_summary">Senarai port untuk proxy. *GUNA HANYA* jika mod \'Semua\' atau \'App\' tidak berfungsi</string>
+  <string name="pref_transparent_port_dialog">Masukkan port untuk proxy</string>
+  <string name="pref_has_root">Minta Akses Root</string>
+  <string name="pref_has_root_summary">Minta akses root untuk proxy telus</string>
+  <string name="status_install_success">Tor berjaya dipasang!</string>
+  <string name="status_install_fail">Fail Tor gagal dipasang. Sila semak log dan maklumkan kepada tor-assistants at torproject.org</string>
+  <string name="title_error">Ralat Aplikasi</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Tentang Orbot</string>
+  <string name="btn_next">Seterusnya</string>
+  <string name="btn_back">Kembali</string>
+  <string name="btn_finish">Tamat</string>
+  <string name="btn_okay">Okay</string>
+  <string name="btn_cancel">Batal</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Maklumat Orbot</string>
+  <string name="wizard_details_msg">Orbot merupakan aplikasi sumber terbuka yang mengandungi Tor, LibEvent dan Privoxy. Ia menyediakan seorang proksi HTTP tempatan (8118) dan proksi SOCKS (9050) ke dalam rangkaian Tor. Orbot juga mempunyai keupayaan, pada peranti berakar umbi, untuk menghantar semua trafik internet melalui Tor.</string>
+  <string name="wizard_permissions_root">Kebenaran disahkan</string>
+  <string name="wizard_permissions_stock">Kebenaran Orbot</string>
+  <string name="wizard_premissions_msg_root">Bagus! Kami mendapati anda ada akses root yang dibenarkan untuk Orbot. Kami akan gunakan kuasa ini dengan bijak.</string>
+  <string name="wizard_permissions_msg_stock">Walaupun ia tidak diperlukan, Orbot boleh menjadi alat yang berguna jika peranti anda mempunyai akses root. Guna butang di bawah untuk memberi Orbot superpower!</string>
+  <string name="wizard_permissions_no_root">Jika anda tidak mempunyai akses root atau tidak tahu mengenai ini, cuma pastikan anda menggunakan aplikasi yang boleh digunakan dengan Orbot.</string>
+  <string name="wizard_permissions_consent">Saya faham dan mahu teruskan tanpa Superuser</string>
+  <string name="wizard_permission_enable_root">Beri akses Root pada Orbot</string>
+  <string name="wizard_configure">Konfigurasi Torification</string>
+  <string name="wizard_configure_msg">Orbot memberi anda pilihan untuk menghala semua trafik aplikasi melalui Tor ATAU untuk memilih aplikasi untuk digunakan secara individual.</string>
+  <string name="wizard_configure_all">Proxy Semua Aplikasi Melalui Tor</string>
+  <string name="wizard_configure_select_apps">Pilih Aplikasi Untuk Tor</string>
+  <string name="wizard_tips_tricks">Aplikasi Yang Dibenar Menggunakan Orbot</string>
+  <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_otrchat">Gibberbot - Klien mesej ringkas selamat untuk Android</string>
+  <string name="wizard_tips_proxy">Tetapan Proksi - Belajar bagaimana untuk mengkonfigurasi aplikasi untuk bekerja dengan Orbot</string>
+  <string name="wizard_proxy_help_info">Tetapan proxy</string>
+  <string name="wizard_proxy_help_msg">Jika aplikasi Android yang anda gunakan boleh menyokong penggunaan proksi HTTP atau SOCKS, kemudian anda boleh menatarajah untuk menyambung kepada Orbot dan menggunakan Tor. ⏎\n⏎\n⏎\n    Tetapan tuan rumah adalah 127.0.0.1 atau \"localhost\". Untuk HTTP, tetapan pelabuhan 8118. Untuk SOCKS, proksi adalah 9050. Anda harus menggunakan SOCKS4A atau socks5 jika boleh. ⏎\n    ⏎\n⏎\n⏎\n    Anda boleh mengetahui lebih lanjut tentang proxying pada Android melalui FAQ di: http://tinyurl.com/proxyandroid ⏎</string>
+  <string name="wizard_final">Orbot sudah sedia!</string>
+  <string name="wizard_final_msg">Beratus-ratus ribu orang di seluruh dunia menggunakan Tor untuk pelbagai sebab-sebab yang luas. ⏎\n⏎\nWartawan dan blogger, pembela hak asasi manusia, pegawai penguatkuasa undang-undang, tentera, perbadanan, rakyat rejim menindas, dan warganegara sahaja, biasa … dan kini anda bersedia untuk, juga!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Anda telah berjaya disambungkan kepada rangkaian Tor - tetapi ini bukanlah bermakna peranti anda adalah selamat. Anda boleh menggunakan pilihan \'Check\' daripada menu untuk menguji pelayar anda. ⏎\n⏎\nMelawat kami pada https://guardianproject.info/apps/orbot atau menghantar e-mel ke help at guardianproject.info untuk mengetahui lebih lanjut.</string>
+  <string name="tor_check">Ini akan membuka pelayar web anda untuk https://check.torproject.org untuk melihat jika Orbot mungkin ditetapkan dan anda disambungkan kepada Tor.</string>
+  <string name="pref_hs_group">Perkhidmatan tersembunyi</string>
+  <string name="pref_general_group">Umum</string>
+  <string name="pref_start_boot_title">Mulakan Orbot semasa Boot</string>
+  <string name="pref_start_boot_summary">Mula Orbot secara automatik dan sambung Tor ketika peranti Android boot</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot membawa Tor untuk Android! ⏎\n⏎\nTor membantu anda mempertahankan terhadap penapisan kandungan, analisis dan pengawasan trafik rangkaian yang mengancam privasi, maklumat sulit dan hubungan peribadi. ⏎\n⏎\nWizard ini akan membantu anda mengkonfigurasi Orbot dan Tor pada peranti anda.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Amaran</string>
+  <string name="wizard_warning_msg">Hanya memasang Orbot tidak secara automatik akan anonymize trafik mudah alih anda. ⏎\n⏎\nAnda betul mesti menatarajah Orbot, peranti anda dan aplikasi lain untuk berjaya menggunakan Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">kebenaran</string>
+  <string name="wizard_permissions_root_msg1">Anda juga boleh memberikan akses Orbot \'SuperUser\' untuk membolehkan ciri-ciri yang maju, seperti Proxying Telus.</string>
+  <string name="wizard_permissions_root_msg2">Jika anda tidak mahu berbuat demikian, sila pastikan untuk menggunakan aplikasi yang dibuat untuk bekerjasama dengan Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Peranti anda tidak perlu berakar umbi atau menyediakan \'SuperUser\' akses. ⏎\n⏎\nDalam untuk anda mendapat manfaat daripada Tor, anda akan perlu menggunakan aplikasi yang dibina untuk bekerja dengan Orbot, atau yang HTTP sokongan atau tetapan proksi SOCKS. ⏎\n</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orweb: Privasi ditambah penyemak imbas yang bekerja melalui Tor</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxy Telus</string>
+  <string name="wizard_transproxy_msg">Ini membolehkan aplikasi anda secara automatik melalui rangkaian Tor tanpa apa apa konfigurasi</string>
+  <string name="wizard_transproxy_hint">(Tanda kotak ini jika anda belen)</string>
+  <string name="wizard_transproxy_none">Tiada</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Membolehkan Proxying Telus Tor untuk Wifi dan USB Devices terikat (memerlukan restart)</string>
+  <string name="button_grant_superuser">Minta Akses Superuser</string>
+  <string name="pref_select_apps">Pilih Aplikasi</string>
+  <string name="pref_select_apps_summary">Pilih Aplikasi untuk dihalakan melalui Tor</string>
+  <string name="pref_node_configuration">Konfigurasi Nod</string>
+  <string name="pref_node_configuration_summary">Ini ialah tetapan lanjutan yang boleh mengurangkan kadar anonymity anda</string>
+  <string name="pref_entrance_node">Nod Kemasukan</string>
+  <string name="pref_entrance_node_summary">Cap jari, nama samaran, negara, dan alamat untuk lompatan pertama</string>
+  <string name="pref_entrance_node_dialog">Masukkan Nod Kemasukan</string>
+  <string name="pref_proxy_type_title">Jenis Proxy</string>
+  <string name="pref_proxy_type_summary">Protokol untuk digunakan pada pelayan proxy: HTTP,HTTPS,Socks4,Socks5</string>
+  <string name="pref_proxy_type_dialog">Masukkan Jenis Proxy</string>
+  <string name="pref_proxy_host_title">Hos Proxy</string>
+  <string name="pref_proxy_host_summary">Nama hos pelayan proxy</string>
+  <string name="pref_proxy_host_dialog">Masukkan Hos Proxy</string>
+  <string name="pref_proxy_port_title">Port Proxy</string>
+  <string name="pref_proxy_port_summary">Port pelayan proxy</string>
+  <string name="pref_proxy_port_dialog">Masukkan port Proxy</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Tetapkan proxy telus secara keseluruhan</string>
+  <string name="setting_up_app_based_transparent_proxying_">Tetapkan proxy telus berdasarkan aplikasi</string>
+  <string name="transparent_proxying_enabled">Proxy telus dibolehkan</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy dibolehkan untuk Tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">AMARAN: ralat semasa memulakan proxy telus!</string>
+  <string name="transproxy_rules_cleared">Peraturan TransProxy dipadam</string>
+  <string name="couldn_t_start_tor_process_">Tidak boleh memulakan proses Tor:</string>
+  <string name="privoxy_is_running_on_port_">Privoxy sedang berjalan pada port:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Menetap proxy telus berdasarkan port..</string>
+  <string name="bridge_error">Ralat jambatan</string>
+  <string name="bridge_requires_ip">Untuk menggunakan ciri jambatan, anda mesti masukkan sekurang-kurangnya satu alamat IP jambatan.</string>
+  <string name="send_email_for_bridges">Hantar e-mel kepada bridges at torproject.org dengan garisan \"jambatan\" dengan sendirinya dalam badan mel dari akaun gmail.</string>
+  <string name="error">Ralat</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Tetapan ReachableAddresses anda menyebabkan pengecualian!</string>
+  <string name="your_relay_settings_caused_an_exception_">Tetapan relay anda menyebabkan pengecualian!</string>
+  <string name="exit_nodes">Keluar Nod</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Cap jari, nama samaran, negara, dan alamat untuk lompatan terakhir</string>
+  <string name="enter_exit_nodes">Masukkan Nod Keluar</string>
+  <string name="exclude_nodes">Keluarkan Nod</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Cap jari, nama samaran, negara dan alamat untuk dikeluarkan</string>
+  <string name="enter_exclude_nodes">Masukkan Nod Keluar</string>
+  <string name="strict_nodes">Nod Ketat</string>
+  <string name="use_only_these_specified_nodes">Guna *hanya* nod-nod ini</string>
+  <string name="bridges">Jambatan</string>
+  <string name="use_bridges">Guna Jambatan</string>
+  <string name="bridges_obfuscated">Jambatan Keliru</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Membolehkan nod pintu masuk ganti ke Rangkaian Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Benarkan jika konfigurasi jambatan adalah jambatan keliru</string>
+  <string name="ip_address_and_port_of_bridges">Alamat IP dan pelabuhan jambatan</string>
+  <string name="enter_bridge_addresses">Masukkan Alamat Jambatan</string>
+  <string name="relays">Relays</string>
+  <string name="relaying">Relaying</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Membolehkan peranti anda untuk menjadi geganti bukan keluar</string>
+  <string name="relay_port">Relay Port</string>
+  <string name="listening_port_for_your_tor_relay">Mendapatkan port untuk tetapan relay Tor anda</string>
+  <string name="enter_or_port">Masukkan port OR</string>
+  <string name="relay_nickname">Nama samaran relay</string>
+  <string name="the_nickname_for_your_tor_relay">Nama samaran ini untuk relay Tor anda</string>
+  <string name="enter_a_custom_relay_nickname">Masukkan nama samaran gantian untuk relay</string>
+  <string name="reachable_addresses">Alamat yang dapat dicapai</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Jalan sebagai klien dibelakang firewall dengan peraturan ketat</string>
+  <string name="reachable_ports">Port yang dapat dicapai</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Port yang dapat dicapai dibelakang firewall dengan kawalan ketat</string>
+  <string name="enter_ports">Masukkan port</string>
+  <string name="enable_hidden_services">Benarkan Servis Tersembunyi</string>
+  <string name="run_servers_accessible_via_the_tor_network">Jalankan pelayan boleh diakses melalui rangkaian Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">Masuk port localhost untuk servis tersembunyi</string>
+  <string name="hidden_service_ports">Port servis tersembunyi</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Nama beralamat untuk servis tersembunyi anda (dijana secara automatik)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">benarkan log debug pada output (mesti guna adb atau aLogCat untuk lihat)</string>
+  <string name="project_home">Rumah Projek(s):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android⏎ https://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Lesen Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3rd-Party-Software: </string>
+  <string name="hidden_service_request">Satu aplikasi mahu membuka port tersembunyi %S pada rangkaian Tor. Ia selamat jika anda percaya pada aplikasi itu.</string>
+  <string name="found_existing_tor_process">Proses Tor sedia ada ditemui..</string>
+  <string name="something_bad_happened">Sesuatu yang buruk berlaku. Semak log.</string>
+  <string name="hidden_service_on">port tersembunyi pada:</string>
+  <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
+  <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
+  <string name="pref_use_sys_iptables_title">Guna default Iptables</string>
+  <string name="pref_use_sys_iptables_summary">Guna binari built-in iptables daripada yang didatangkan bundle dengan Orbot</string>
+  <string name="error_installing_binares">Tor binari tidak boleh dipasang atau dinaiktaraf</string>
+  <string name="pref_use_persistent_notifications">Sentiasa biar ikon pada toolbar apabila Orbot bersambung</string>
+  <string name="pref_use_persistent_notifications_title">Sentiasa On Notifikasi</string>
+  <string name="notification_using_bridges">Jambatan dibenarkan!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Tetapan Tempatan</string>
+  <string name="set_locale_summary">Pilihan tempatan dan bahasa untuk Orbot</string>
+  <string name="wizard_locale_title">Pilih Bahasa</string>
+  <string name="wizard_locale_msg">Biar default atau ubah ke bahasa sekarang</string>
+  <string name="powered_by">Dijana oleh Projek Tor</string>
+  <string name="btn_save_settings">Simpan Tetapan</string>
+  <string name="menu_vpn">Apps</string>
+</resources>
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
new file mode 100644
index 0000000..07ab475
--- /dev/null
+++ b/app/src/main/res/values-my/strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_home">ပင်မ စာမျက်နှာ</string>
+  <string name="menu_browse">ဖွင့်ကြည့်ရန်</string>
+  <string name="menu_settings">ချိန်ညှိချက်များ</string>
+  <string name="menu_info">အကူအညီ</string>
+  <string name="menu_about">အကြောင်း</string>
+  <string name="button_help">အကူအညီ</string>
+  <string name="button_close">ပိတ်ရန်</string>
+  <string name="button_about">အကြောင်း</string>
+  <string name="menu_exit">ထွက်ရန်</string>
+  <string name="btn_back">နောက်သို့</string>
+  <string name="btn_cancel">ဖျက်သိမ်းရန်</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">ပရောက်ဇီ ချိန်ညှိချက်များ</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">ယေဘုယျ</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">သတိပေးချက်</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">ဘာမှမရှိ</string>
+  <string name="status">အနေအထား</string>
+  <string name="error">ချို့ယွင်းချက်</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">ချိန်ညှိချက်များကို သိမ်းဆည်းရန်</string>
+</resources>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
new file mode 100644
index 0000000..6fe4aeb
--- /dev/null
+++ b/app/src/main/res/values-nb/strings.xml
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot er en gratis proxy app som gjør det mulig for andre apps å bruke internett mer sikkert. Orbot bruker Tor for å kryptere din Internettrafikk, og skjuler da din trafikk ved å sende trafikken gjennom en lang rekke datamaskiner over hele verden. Tor er et gratis dataprogram, og et åpent nettverk som hjelper deg å forsvare deg mot en form for nettverksovervåking som truer din personlige frihet og privatliv, konfidensiell bedriftsvirksomhet og relasjoner, og statlig sikkerhet kjent som trafikkanalyse.</string>
+  <string name="internal_web_url">https://torproject.org</string>
+  <string name="default_web_url">https://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">start, og stopp Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot starter...</string>
+  <string name="status_activated">Koblet til Tor-nettverket</string>
+  <string name="status_disabled">Orbot er deaktivert</string>
+  <string name="tor_process_starting">Starter Tor klient...</string>
+  <string name="tor_process_complete">fullført.</string>
+  <string name="tor_process_waiting">venter.</string>
+  <string name="not_anonymous_yet">ADVARSEL: Trafikken din er enda ikke anonym! Vær vennlig og konfigurer applikasjonene dine til å bruke HTTP proxy 127.0.0.1:8118, eller SOCKS4A, eller SOCKS5 proxy 127.0.0.1:9050</string>
+  <string name="menu_home">Hjem</string>
+  <string name="menu_browse">Surfe</string>
+  <string name="menu_settings">Innstillinger</string>
+  <string name="menu_log">Logg</string>
+  <string name="menu_info">Hjelp</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Start</string>
+  <string name="menu_stop">Stopp</string>
+  <string name="menu_about">Om</string>
+  <string name="main_layout_download">Nedlast</string>
+  <string name="main_layout_upload">Last opp</string>
+  <string name="button_help">Hjelp</string>
+  <string name="button_close">Steng</string>
+  <string name="button_about">Om</string>
+  <string name="button_clear_log">Tøm logg</string>
+  <string name="menu_verify">Kontroller</string>
+  <string name="menu_exit">Avslutt</string>
+  <string name="press_to_start">- langt trykk for å starte -</string>
+  <string name="pref_trans_proxy_group">Transparent Proxying (Krever Root)</string>
+  <string name="pref_trans_proxy_title">Transparent Proxying</string>
+  <string name="pref_trans_proxy_summary">Automatisk Torifisering av applikasjoner</string>
+  <string name="pref_transparent_all_title">Tor alt</string>
+  <string name="pref_transparent_all_summary">Proxy trafikk for alle applikasjoner via Tor</string>
+  <string name="pref_transparent_port_fallback_title">Tilbakestill proxyport</string>
+  <string name="pref_transparent_port_fallback_summary">ADVARSEL: Omgår vanlige porter (80, 443, osv). *BRUKES KUN* hvis \'alle\', eller \'Applikasjon\'-modus ikke virker.</string>
+  <string name="pref_transparent_port_title">Port Liste</string>
+  <string name="pref_transparent_port_summary">Liste over porter som skal gå gjennom proxy. *BRUKES KUN* hvis \'Alle\', eller \'Applikasjon\'-modus ikke virker.</string>
+  <string name="pref_transparent_port_dialog">Angi porter som skal gå gjennom proxy</string>
+  <string name="pref_has_root">Be om Root tilgang</string>
+  <string name="pref_has_root_summary">Be om root-tilgang for transparent proxying</string>
+  <string name="status_install_success">Tor binære filer vellykket installert!</string>
+  <string name="status_install_fail">Tor-binære filer kunne ikke installeres. Vennligst sjekk loggen og varsle tor-assistants at torproject.org</string>
+  <string name="title_error">Applikasjonsfeil</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Om Orbot</string>
+  <string name="btn_next">Neste</string>
+  <string name="btn_back">Tilbake</string>
+  <string name="btn_finish">Ferdig</string>
+  <string name="btn_okay">Ok</string>
+  <string name="btn_cancel">Avbryt</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Noen Orbot detaljer</string>
+  <string name="wizard_permissions_root">Tillatelse gitt</string>
+  <string name="wizard_permissions_stock">Orbot tillatelser</string>
+  <string name="wizard_premissions_msg_root">Utmerket! Vi har oppdaget at du har root rettigheter aktivert for Orbot. Vi vil bruke denne makten med omhu.</string>
+  <string name="wizard_permissions_msg_stock">Selv om det ikke er er nødvendig, kan Orbot bli et mer kraftig verktøy hvis enheten har root-tilgang. Bruk knappen nedenfor til å innvilge Orbot superkrefter!</string>
+  <string name="wizard_permissions_no_root">Hvis du ikke har root-tilgang, eller ikke har noen anelse om hva vi snakker om, bare sørg for å bruke programmer laget for å fungere med Orbot.</string>
+  <string name="wizard_permissions_consent">Jeg forstår, og ønsker å fortsette uten superbruker</string>
+  <string name="wizard_permission_enable_root">Gi Orbot root-tilgang</string>
+  <string name="wizard_configure">Konfigurer Torification</string>
+  <string name="wizard_configure_msg">Orbot gir deg muligheten til å rute all applikasjonstrafikk gjennom Tor, ELLER å velge applikasjonene individuelt.</string>
+  <string name="wizard_configure_all">Bruk proxy for alle applikasjoner gjennom Tor</string>
+  <string name="wizard_configure_select_apps">Velg individuelle applikasjoner som skal brukes med Tor</string>
+  <string name="wizard_tips_tricks">Orbot aktiverte applikasjoner</string>
+  <string name="wizard_tips_msg">Applikasjonene nedenfor ble utviklet for å fungere med Orbot. Klikk på hver knapp for å installere nå, eller du kan finne dem senere på Google Play, på GuardianProject.info nettsiden, eller via F-Droid.org.</string>
+  <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="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>
+  <string name="wizard_final">Orbot er klar!</string>
+  <string name="wizard_final_msg">Millioner av mennesker over hele verden bruker Tor for en rekke grunner.\n\ nJournalists og bloggere, menneskerettighetsforkjempere, politi, soldater, bedrifter, borgere i undertrykkende regimer, og bare vanlige borgere ... og nå er du klar til å , også!</string>
+  <string name="wizard_exit_at_first_screen_toast">Vennligst konfigurere Orbot før du bruker det!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Dette vil åpne nettleseren din med adressen https://check.torproject.org for å se om Orbot er korrekt konfigurert, og at du er koblet til Tor.</string>
+  <string name="pref_hs_group">Skjult Service Hosting</string>
+  <string name="pref_general_group">Generelt</string>
+  <string name="pref_start_boot_title">Start Orbot ved oppstart</string>
+  <string name="pref_start_boot_summary">Start Orbot automatisk, og koble til Tor når din Android-enhet starter opp</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot bringer Tor til Android!\n\nTor hjelper deg å forsvare seg mot innholdsfiltrering, trafikk analyse og overvåking som truer personvern, konfidensiell informasjon og personlige relasjoner. \ N \ nDenne veiviseren vil hjelpe deg med å konfigurere Orbot og Tor på enheten.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Advarsel</string>
+  <string name="wizard_warning_msg">Ganske enkelt å installere Orbot vil ikke automatisk anonymmobiltrafikk .\n\nDu må konfigurere Orbot, enheten og andre applikasjoner for å kunne bruke Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Tillatelser</string>
+  <string name="wizard_permissions_root_msg1">Du kan eventuelt gi Orbot \'Superbruker\' adgang til å aktivere avanserte funksjoner, for eksempel Transparent proxy.</string>
+  <string name="wizard_permissions_root_msg2">Hvis du ikke ønsker å gjøre dette, må du sørge for å bruke applikasjoner som er laget for å fungere med Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Enheten ser ikke ut til å være forankret eller gi root eller \"superbruker\" tilgang.\n\nVennligst prøve \"apps\" modus på hovedskjermen i stedet.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot aktiverte applikasjoner</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: Sikret sludreprogram med OTR-kryptering</string>
+  <string name="wizard_tips_play">Finn alle Guardian Prosjekt sine applikasjoner på Google Play</string>
+  <string name="wizard_tips_fdroid">Finn alle Guardian Project applikasjoner på F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Finn alle Guardian Project applikasjoner på https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparent Proxying</string>
+  <string name="wizard_transproxy_msg">Dette tillater dine applikasjoner å kjøre automatisk gjennom Tor-nettverket uten noen konfigurasjon.</string>
+  <string name="wizard_transproxy_hint">(Marker denne boksen hvis du ikke har noen anelse om hva vi snakker om)</string>
+  <string name="wizard_transproxy_none">Ingen</string>
+  <string name="pref_transparent_tethering_title">Tor-deling</string>
+  <string name="pref_transparent_tethering_summary">Aktiver Tor Transparent proxyer for WiFi, og USB delte enheter (krever omstart)</string>
+  <string name="button_grant_superuser">Be om Superbruker tilgang</string>
+  <string name="pref_select_apps">Velg applikasjoner</string>
+  <string name="pref_select_apps_summary">Velg applikasjoner som skal rutes gjennom Tor</string>
+  <string name="pref_node_configuration">Node-konfigurasjon</string>
+  <string name="pref_node_configuration_summary">Dette er avanserte innstillinger som kan redusere din anonymitet</string>
+  <string name="pref_entrance_node">Inngangsnoder</string>
+  <string name="pref_entrance_node_summary">Fingeravtrykk, kallenavn, land, og adresser til det første hopp</string>
+  <string name="pref_entrance_node_dialog">Skriv inn inngangsnoder</string>
+  <string name="button_proxy_all">Mellomtjen alt</string>
+  <string name="button_proxy_none">Mellomtjen ingenting</string>
+  <string name="pref_proxy_title">Utgående nettverksproxy (Valgfritt)</string>
+  <string name="pref_proxy_type_title">Utgående proxytype</string>
+  <string name="pref_proxy_type_summary">Protokoll for proxy-server: HTTP, HTTPS, SOCKS4, SOCKS5</string>
+  <string name="pref_proxy_type_dialog">Skriv inn proxytype</string>
+  <string name="pref_proxy_host_title">Utgående proxyvert</string>
+  <string name="pref_proxy_host_summary">Proxyserver vertsnavn</string>
+  <string name="pref_proxy_host_dialog">Skriv inn proxyvert</string>
+  <string name="pref_proxy_port_title">Utgående proxyport</string>
+  <string name="pref_proxy_port_summary">Proxyserver port</string>
+  <string name="pref_proxy_port_dialog">Skriv inn proxyport</string>
+  <string name="pref_proxy_username_title">Utgående Proxy Brukernavn</string>
+  <string name="pref_proxy_username_summary">Proxy Brukernavn (valgfritt)</string>
+  <string name="pref_proxy_username_dialog">Skriv inn Proxy Brukernavn</string>
+  <string name="pref_proxy_password_title">Utgående Proxy Passord</string>
+  <string name="pref_proxy_password_summary">Proxy Passord (valgfritt)</string>
+  <string name="pref_proxy_password_dialog">Skriv inn Proxy Passord</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Konfigurerer full transparent proxying...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Konfigurerer applikasjonsbasert transparent proxying...</string>
+  <string name="transparent_proxying_enabled">Transparent proxying AKTIVERT</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy aktivert for nettdeling!</string>
+  <string name="warning_error_starting_transparent_proxying_">ADVARSEL: Feil under oppstart av transparent proxying!</string>
+  <string name="transproxy_rules_cleared">TransProxy regler fjernet</string>
+  <string name="couldn_t_start_tor_process_">Kunne ikke starte Tor prosessen:</string>
+  <string name="privoxy_is_running_on_port_">Polipo kjører på port:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Konfigurerer portbasert transparent proxying...</string>
+  <string name="bridge_error">Brofeil</string>
+  <string name="bridge_requires_ip">For å kunne bruke bro-funksjonen, må du oppgi minst én bro IP-adresse.</string>
+  <string name="send_email_for_bridges">Send en epost til bridges at torproject.org med teksten \"get bridges\" alene som eneste tekst i selve eposten fra en Gmail-konto.</string>
+  <string name="error">Feil</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Dine \"adresser som kan nås\"-innstillinger forårsaket et unntak!</string>
+  <string name="your_relay_settings_caused_an_exception_">Dine relé-innstillinger forårsaket et unntak!</string>
+  <string name="exit_nodes">Avslutt noder</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingeravtrykk, kallenavn, land og adresser for siste hopp</string>
+  <string name="enter_exit_nodes">Skriv inn utgående noder</string>
+  <string name="exclude_nodes">Ekskluder noder</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fineravtrykk, kallenavn, land og adresser som skal ekskluderes</string>
+  <string name="enter_exclude_nodes">Skriv inn ekskluderte noder</string>
+  <string name="strict_nodes">Strict noder</string>
+  <string name="use_only_these_specified_nodes">Bruk *bare* disse angitte nodene</string>
+  <string name="bridges">Broer</string>
+  <string name="use_bridges">Bruk broer</string>
+  <string name="bridges_obfuscated">Maskerte broer</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Aktiver alternative inngangsnoder til Tor-nettverket</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktiver hvis de konfigurerte broene er maskerte broer</string>
+  <string name="ip_address_and_port_of_bridges">IP-adresser og broporter</string>
+  <string name="enter_bridge_addresses">Skriv inn broadresser</string>
+  <string name="relays">Reléer</string>
+  <string name="relaying">Videresending</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Aktiver enheten din som et relé uten utgående trafikk</string>
+  <string name="relay_port">Relé-port</string>
+  <string name="listening_port_for_your_tor_relay">Porten Tor-reléet ditt lytter på</string>
+  <string name="enter_or_port">Skriv inn OR-port</string>
+  <string name="relay_nickname">Reléets kallenavn</string>
+  <string name="the_nickname_for_your_tor_relay">Kallenavnet på ditt Tor-relé</string>
+  <string name="enter_a_custom_relay_nickname">Skriv inn et egendefinert kallenavn på reléet</string>
+  <string name="reachable_addresses">Antreffbare adresser</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Kjør som en klient bak en brannmur med restriktive regler</string>
+  <string name="reachable_ports">Antreffbare porter</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Antreffbare porter bak en restriktiv brannmur</string>
+  <string name="enter_ports">Skriv inn porter</string>
+  <string name="enable_hidden_services">Skjult Service Hosting</string>
+  <string name="run_servers_accessible_via_the_tor_network">Tillat enhetsserveren å være tilgjengelig via Tor-nettverket</string>
+  <string name="enter_localhost_ports_for_hidden_services">Skriv inn localhost porter for skjulte tjenester</string>
+  <string name="hidden_service_ports">Skjulte tjenesteporter</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Det adresserbare navnet på din skjulte tjeneste (generert automatisk)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">aktiver feilsøkingslogg for output (må bruke adb eller aLogCat for å vise)</string>
+  <string name="project_home">Prosjektets nettside(r):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor-lisensen</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Tredjepartsprogramvare:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">En applikasjon vil åpne den skjulte tjenesteporten %S til Tor-nettverket. Dette er trygt hvis du stoler på applikasjonen. </string>
+  <string name="found_existing_tor_process">fant eksisterende Tor-prosess...</string>
+  <string name="something_bad_happened">Noe alvorlig skjedde. Sjekk loggen.</string>
+  <string name="hidden_service_on">skjult tjeneste på:</string>
+  <string name="unable_to_read_hidden_service_name">klarte ikke å lese skjult tjenestenavn</string>
+  <string name="unable_to_start_tor">Klarte ikke å starte Tor:</string>
+  <string name="unable_to_reset_tor">Gjør en omstart av din enhet, kan ikke tilbakestille Tor!</string>
+  <string name="pref_use_sys_iptables_title">Bruk standard Iptables</string>
+  <string name="pref_use_sys_iptables_summary">bruk de innebygde binære-iptables istedenfor de som kommer med Orbot</string>
+  <string name="error_installing_binares">Tor-binærfilene var ikke i stand til å bli installert, eller oppgradert.</string>
+  <string name="pref_use_persistent_notifications">Alltid behold ikonet i verktøyslinjen når Orbot er tilkoblet</string>
+  <string name="pref_use_persistent_notifications_title">Alltid-På Varslinger</string>
+  <string name="pref_use_expanded_notifications_title">Utvidede varsler</string>
+  <string name="notification_using_bridges">Broer slått på!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Språk</string>
+  <string name="set_locale_summary">Velg nasjonale innstillinger, og språk for Orbot</string>
+  <string name="wizard_locale_title">Velg språk</string>
+  <string name="wizard_locale_msg">Bruk standard, eller endre det gjeldende språket</string>
+  <string name="powered_by">Levert av Tor</string>
+  <string name="btn_save_settings">Lagre Inntillinger</string>
+  <string name="no_internet_connection_tor">Ingen Internett-tilkobling; Tor er i ventemodus... </string>
+  <string name="bandwidth_">Båndbredde:</string>
+  <string name="down">ned</string>
+  <string name="up">opp</string>
+  <string name="pref_disable_network_title">Inget automatisk hvilemodus for nettverk</string>
+  <string name="pref_disable_network_summary">Legg Tor i hvilemodus når nettilkobling til internett ikke er tilgjengelig</string>
+  <string name="newnym">Du har byttet til en ny Tor-identitet!</string>
+  <string name="menu_verify_browser">Nettleser</string>
+  <string name="menu_use_chatsecure">Bruk ChatSecure</string>
+  <string name="permission_manage_tor_label">Håndter Tor</string>
+  <string name="permission_manage_tor_description">La dette programmet kontrollere Tor-tjenesten</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Det ser ikke ut til at du har Orfox installert. Ønsker du hjelp med dette, eller skal vi bare åpne nettleseren?</string>
+  <string name="install_apps_">Installere programmer?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Ingen nettverkstilkobling. Putting Tor å sove ...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Nettverkstilkobling er bra. Våkne Tor opp ...</string>
+  <string name="updating_settings_in_tor_service">Oppdaterer innstillinger i Tor service</string>
+  <string name="pref_socks_summary">Port som Tor tilbyr er SOCKS proxy på (standard: 9050 eller 0 for å slå av)</string>
+  <string name="pref_socks_dialog">SOCKS Port Konfigurasjon</string>
+  <string name="pref_transport_title">Tor TransProxy Port</string>
+  <string name="pref_transport_dialog">TransProxy Port Konfigurasjon</string>
+  <string name="pref_dnsport_title">Tor DNS Port</string>
+  <string name="pref_dnsport_dialog">DNS Port Configurer</string>
+  <string name="your_tor_public_ips_">Din Tor offentlige IP:</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Broer oppdatert</string>
+  <string name="restart_orbot_to_use_this_bridge_">Gjør omstart av Orbot før endringer trer i kraft</string>
+  <string name="menu_qr">QR-koder</string>
+  <string name="get_bridges_email">E-post</string>
+  <string name="get_bridges_web">Vev</string>
+  <string name="activate">Aktiver</string>
+  <string name="send_email">Send e-post</string>
+  <string name="install_orweb">Installer Orfox</string>
+  <string name="standard_browser">Forvalgt nettleser</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Merk: Bare vanlige Tor-broer fungerer på Intel X86/Atom-enheter</string>
+</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
new file mode 100644
index 0000000..bbd3c17
--- /dev/null
+++ b/app/src/main/res/values-nl/strings.xml
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot is een gratis en vrije proxy-app die het andere apps mogelijk maakt het internet veiliger te gebruiken. Orbot gebruikt Tor om je internetverkeer te coderen en het vervolgens te verhullen het door het door een serie computers over de hele wereld te routeren. Tor is vrije software en een open netwerk dat je helpt te verdedigen tegen een vorm van netwerktoezicht die persoonlijke vrijheid en privacy, vertrouwelijke bedrijfsactiviteiten en relaties en staatsveiligheid genaamd \'traffic analyse\' bedreigt.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">start en stop Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot is bezig met starten…</string>
+  <string name="status_activated">Verbonden met het Tor-netwerk</string>
+  <string name="status_disabled">Orbot is uitgeschakeld</string>
+  <string name="status_shutting_down">TorService wordt afgesloten</string>
+  <string name="tor_process_starting">Bezig met Tor client starten…</string>
+  <string name="tor_process_complete">klaar.</string>
+  <string name="tor_process_waiting">bezig met wachten.</string>
+  <string name="not_anonymous_yet">WAARSCHUWING: je verkeer is nog niet anononiem! Stel je programma\'s in om gebruik te maken van HTTP-proxy 127.0.0.1:8118 of SOCKS4A- of SOCKS5-proxy 127.0.0.1:9050</string>
+  <string name="menu_home">Thuis</string>
+  <string name="menu_browse">Bladeren</string>
+  <string name="menu_settings">Instellingen</string>
+  <string name="menu_log">Logboek</string>
+  <string name="menu_info">Hulp</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Start</string>
+  <string name="menu_stop">Stop</string>
+  <string name="menu_about">Over</string>
+  <string name="menu_promo_apps">Apps ophalen...</string>
+  <string name="main_layout_download">Download</string>
+  <string name="main_layout_upload">Upload</string>
+  <string name="button_help">Hulp</string>
+  <string name="button_close">Afsluiten</string>
+  <string name="button_about">Over</string>
+  <string name="button_clear_log">Logboek wissen</string>
+  <string name="menu_verify">Controleren</string>
+  <string name="menu_exit">Sluiten</string>
+  <string name="menu_scan">BridgeQR scannen</string>
+  <string name="menu_share_bridge">BridgeQR delen</string>
+  <string name="press_to_start">- lang indrukken om te starten -</string>
+  <string name="pref_trans_proxy_group">Transparant proxyen (vereist root)</string>
+  <string name="pref_trans_proxy_title">Transparant proxyen</string>
+  <string name="pref_trans_proxy_summary">Automatisch Torificeren van apps</string>
+  <string name="pref_transparent_all_title">Tor alles</string>
+  <string name="pref_transparent_all_summary">Proxy verkeer van alle apps door Tor</string>
+  <string name="pref_transparent_port_fallback_title">Poort proxy fallback</string>
+  <string name="pref_transparent_port_fallback_summary">WAARSCHUWING: omzeilt veel voorkomende poorten (80, 443, etc). *GEBRUIK ENKEL* indien de \'Alles\' of \'Apps\'-modus niet werkt.</string>
+  <string name="pref_transparent_port_title">Poortlijst</string>
+  <string name="pref_transparent_port_summary">Lijst van poorten om te proxyen. *GEBRUIK ENKEL* indien \'Alles\' of \'Apps\'-modus niet werkt</string>
+  <string name="pref_transparent_port_dialog">Voer poorten in voor proxy</string>
+  <string name="pref_has_root">Vraag root-toegang aan</string>
+  <string name="pref_has_root_summary">Vraag root-toegang aan voor transparant proxyen</string>
+  <string name="status_install_success">Binaire bestanden van Tor succesvol geïnstalleerd!</string>
+  <string name="status_install_fail">De binaire bestanden konden niet worden geïnstalleerd. Gelieve de log te raadplegen en tor-assistants at torproject.org op de hoogte te stellen</string>
+  <string name="title_error">Toepassingsfout</string>
+  <string name="wizard_title">Welkom bij Orbot</string>
+  <string name="wizard_btn_tell_me_more">Over Orbot</string>
+  <string name="btn_next">Volgende</string>
+  <string name="btn_back">Vorige</string>
+  <string name="btn_finish">Einde</string>
+  <string name="btn_okay">OK</string>
+  <string name="btn_cancel">Annuleren</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Enkele Orbot-gegevens</string>
+  <string name="wizard_details_msg">Orbot is een open-bron-applicatie die Tor, LibEvent en Polipo bevat. Het biedt een lokale HTTP-proxy (8118) en een SOCKS-proxy (9050) naar het Tor-netwerk. Orbot heeft ook de mogelijkheid om op een toestel met root-toegang alle internetverkeer door Tor te sturen.</string>
+  <string name="wizard_permissions_root">Rechten toegewezen</string>
+  <string name="wizard_permissions_stock">Orbot-rechten</string>
+  <string name="wizard_premissions_msg_root">Uitstekend! We hebben gedetecteerd dat je root-rechten hebt aangezet voor Orbot. We gebruiken deze kracht met verstand.</string>
+  <string name="wizard_permissions_msg_stock">Hoewel het niet noodzakelijk is kan Orbot nog krachtiger worden als je toestel root-rechten heeft. Gebruik de knop onderaan om Orbot superkrachten te geven!</string>
+  <string name="wizard_permissions_no_root">Als je niet over root-toegang beschikt en geen idee hebt waarover we bezig zijn, let er dan op dat je apps gebruikt die geschikt zijn voor Orbot.</string>
+  <string name="wizard_permissions_consent">Ik begrijp dit en wil verdergaan zonder Superuser</string>
+  <string name="wizard_permission_enable_root">Root toestaan voor Orbot</string>
+  <string name="wizard_configure">Torificatie instellen</string>
+  <string name="wizard_configure_msg">Orbot geeft je de mogelijkheid om al het verkeer via Tor te laten gaan OF om individueel je applicaties te kiezen.</string>
+  <string name="wizard_configure_all">Proxy alle apps door Tor</string>
+  <string name="wizard_configure_select_apps">Selecteer individuele apps voor Tor</string>
+  <string name="wizard_tips_tricks">Orbot-geschikte apps</string>
+  <string name="wizard_tips_msg">De apps hieronder zijn gemaakt om met Orbot te werken. Klik op de knoppen om ze te installeren, of vind ze later op GuardianProject.info, F-Droid.org of Google Play.</string>
+  <string name="wizard_tips_otrchat">ChatSecure - Beveiligde instant messaging-cliënt voor Android</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="wizard_tips_twitter">Stel Twitter-proxy in als host \"localhost\" en poort 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Maak een verhaal en laat de veiligheid aan Tor over!</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>
+  <string name="wizard_proxy_help_msg">Als de Android-applicatie die je gebruikt het gebruik van een HTTP- of SOCKS-proxy ondersteunt kan je het instellen om te verbinden met Orbot en Tor te gebruiken.\n\n\n De hostinstelling is 127.0.0.1 of \"localhost\". Voor HTTP is de poort 8118, voor SOCKS is de proxy 9050. Indien mogelijk zou je SOCKS4A of SOCKS5 moeten gebruiken.\n \n\n\n Je kan meer te weten komen over proxyen op Android in de VGV op: http://tinyurl.com/proxyandroid\n</string>
+  <string name="wizard_final">Orbot is klaar!</string>
+  <string name="wizard_final_msg">Miljoenen mensen de wereld rond gebruiken Tor voor uiteenlopende redenen.\n\nJournalisten en bloggers, verdedigers van mensenrechten, politie, soldaten, bedrijven, burgers van onderdrukkende regimes, en gewone burgers… en nu ben jij er ook klaar voor!</string>
+  <string name="wizard_exit_at_first_screen_toast">Je moet Orbot eerst configureren vooraleer je het kan gebruiken!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">De verbinding met het Tor netwerk is gelukt - maar dit betekent NIET dat je apparaat veilig is. Je kunt de \'Browser\' knop gebruiken om je verbinding te testen. \n\nBezoek ons op https://guardianproject.info/apps/orbot of stuur een email aan help at guardianproject.info om meer te weten te komen.</string>
+  <string name="tor_check">Dit opent je standaardbrowser naar https://check.torproject.org om te controleren of Orbot succesvol is geconfigureerd om te verbinden met het Tor-netwerk.</string>
+  <string name="pref_hs_group">Verborgen diensten hosten</string>
+  <string name="pref_general_group">Algemeen</string>
+  <string name="pref_start_boot_title">Start Orbot bij opstarten</string>
+  <string name="pref_start_boot_summary">Start Orbot en verbind automatisch met Tor wanneer je Android-toestel opstart</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot brengt Tor naar Android!\n\nTor helpt je te verdedigen tegen het filteren van inhoud, verkeersanalyse en netwerktoezicht die je privacy, vertrouwelijke informatie en persoonlijke relaties bedreigt.\n\nDeze wizard helpt je bij het instellen van Orbot en Tor op je toestel.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Waarschuwing</string>
+  <string name="wizard_warning_msg">Gewoonweg Orbot installeren zal je mobiele verkeer niet automatisch anonimiseren.\n\nJe moet Orbot, je toestel en andere applicaties juist instellen om Tor succesvol te gebruiken.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Rechten</string>
+  <string name="wizard_permissions_root_msg1">Je kan optioneel Orbot \'Superuser\'-toegang geven om geavanceerde functies beschikbaar te stellen, zoals transparant proxyen.</string>
+  <string name="wizard_permissions_root_msg2">Als je dit niet wil doen, let er dan op dat je apps gebruikt die geschikt zijn voor Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Je toestel is niet geroot of biedt geen root of \'Superuser\'-toegang.\n\nProbeer de \'Apps\'-modus op het hoofdscherm.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot-geschikte apps</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: beveiligde chat-applicatie met Off-the-Record-versleuteling</string>
+  <string name="wizard_tips_orweb">Orfox: Browser met pricavy functies die werkt met Tor</string>
+  <string name="wizard_tips_play">Vind alle Guardian Project-applicaties op Google Play</string>
+  <string name="wizard_tips_fdroid">Vind alle Guardian Project-applicaties op F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Vind alle Guardian Project-applicaties op https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparant proxyen</string>
+  <string name="wizard_transproxy_msg">Dit maakt het mogelijk voor jouw applicaties om automatisch via het Tor-netwerk te draaien zonder enige configuratie.</string>
+  <string name="wizard_transproxy_hint">(Vink dit aan als je geen idee hebt waarover we het hebben)</string>
+  <string name="wizard_transproxy_none">Geen</string>
+  <string name="pref_transparent_tethering_title">Tor tetheren</string>
+  <string name="pref_transparent_tethering_summary">Schakel Tor transparante proxy voor WiFi en USB-getheterde toestellen in (vereist herstart)</string>
+  <string name="button_grant_superuser">Vraag Superuser-toegang aan</string>
+  <string name="pref_select_apps">Kies applicaties</string>
+  <string name="pref_select_apps_summary">Kies applicaties om via Tor te draaien</string>
+  <string name="pref_node_configuration">Node-configuratie</string>
+  <string name="pref_node_configuration_summary">Dit zijn geavanceerde instellingen die je anonimiteit kunnen verminderen</string>
+  <string name="pref_entrance_node">Toegangsnodes</string>
+  <string name="pref_entrance_node_summary">Vingerafdrukken, nicks, landen en adressen voor de eerste hop</string>
+  <string name="pref_entrance_node_dialog">Voer toegangsnodes in</string>
+  <string name="pref_allow_background_starts_title">Sta starten op de achtergrond toe</string>
+  <string name="pref_allow_background_starts_summary">Sta elke app toe om Orbot de Tor verbinding en diensten te laten starten </string>
+  <string name="button_proxy_all">Proxy alles</string>
+  <string name="button_proxy_none">Proxy niets</string>
+  <string name="button_invert_selection">Selectie omkeren</string>
+  <string name="pref_proxy_title">Uitgaande netwerk-proxy (facultatief)</string>
+  <string name="pref_proxy_type_title">Proxy-type</string>
+  <string name="pref_proxy_type_summary">Protocol om te gebruiken voor proxyserver: HTTP, HTTPS, SOCKS4, SOCKS5</string>
+  <string name="pref_proxy_type_dialog">Voer proxy-type in</string>
+  <string name="pref_proxy_host_title">Proxyhost</string>
+  <string name="pref_proxy_host_summary">Proxyserverhostnaam</string>
+  <string name="pref_proxy_host_dialog">Voer proxyhost in</string>
+  <string name="pref_proxy_port_title">Proxypoort</string>
+  <string name="pref_proxy_port_summary">Proxyserverpoort</string>
+  <string name="pref_proxy_port_dialog">Voer proxy poort in</string>
+  <string name="pref_proxy_username_title">Uitgaande proxygebruikersnaam</string>
+  <string name="pref_proxy_username_summary">Proxygebruikersnaam (facultatief)</string>
+  <string name="pref_proxy_username_dialog">Voer proxygebruikersnaam in</string>
+  <string name="pref_proxy_password_title">Uitgaande proxywachtwoord</string>
+  <string name="pref_proxy_password_summary">Proxywachtwoord (facultatief)</string>
+  <string name="pref_proxy_password_dialog">Voer proxywachtwoord in</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Bezig met opzetten van volledig transparante proxy…</string>
+  <string name="setting_up_app_based_transparent_proxying_">Bezig met opzetten van per-app transparante proxy…</string>
+  <string name="transparent_proxying_enabled">Transparante proxy INGESCHAKELD</string>
+  <string name="transproxy_enabled_for_tethering_">Transparante proxy ingeschakeld voor tetheren!</string>
+  <string name="warning_error_starting_transparent_proxying_">WAARSCHUWING: fout tijdens starten van transparante proxy!</string>
+  <string name="transproxy_rules_cleared">TransProxy-regels gewist</string>
+  <string name="couldn_t_start_tor_process_">Kon Tor-proces niet starten: </string>
+  <string name="privoxy_is_running_on_port_">Polipo wordt uitgevoerd op poort:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Bezig met opzetten van per-poort transparante proxy…</string>
+  <string name="bridge_error">Bridge-fout</string>
+  <string name="bridge_requires_ip">Om de bridge-functie te gebruiken moet je minstens één bridge IP-adres invoeren.</string>
+  <string name="send_email_for_bridges">Stuur een e-mail met een GMail-account naar bridges at torproject.org met enkel de regel \"get bridges\" in de body van de e-mail.</string>
+  <string name="error">Fout</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Je ReachableAddresses-instellingen veroorzaakten een fout!</string>
+  <string name="your_relay_settings_caused_an_exception_">Je relay-instellingen veroorzaakten een fout!</string>
+  <string name="exit_nodes">Exitnodes</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Vingerafdrukken, nicks, landen en adressen voor de laatste hop</string>
+  <string name="enter_exit_nodes">Voer exitnode in</string>
+  <string name="exclude_nodes">Uitgesloten nodes</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Vingerafdrukken, nicks, landen en adressen om uit te sluiten</string>
+  <string name="enter_exclude_nodes">Voer uitgesloten nodes in</string>
+  <string name="strict_nodes">Strikte nodes</string>
+  <string name="use_only_these_specified_nodes">Gebruik *enkel* deze opgegeven nodes</string>
+  <string name="bridges">Bridges</string>
+  <string name="use_bridges">Gebruik bridges</string>
+  <string name="bridges_obfuscated">Versluierde bridges</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Gebruik alternatieve toegangsnodes naar het Tor-etwerk</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Schakel in als de geconfigureerde bridges versluierde bridges zijn</string>
+  <string name="ip_address_and_port_of_bridges">IP-adres en poort van bridges</string>
+  <string name="enter_bridge_addresses">Voer bridge-adres in</string>
+  <string name="relays">Relays</string>
+  <string name="relaying">Relayen</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Stel je toestel in staat om een non-exit relay te zijn</string>
+  <string name="relay_port">Relay-poort</string>
+  <string name="listening_port_for_your_tor_relay">Luisterpoort van jouw Tor-relay</string>
+  <string name="enter_or_port">Voer OR-poort in</string>
+  <string name="relay_nickname">Relay-bijnaam</string>
+  <string name="the_nickname_for_your_tor_relay">De bijnaam voor jouw Tor-relay</string>
+  <string name="enter_a_custom_relay_nickname">Voer een eigen relay-bijnaam in</string>
+  <string name="reachable_addresses">Bereikbare adressen</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Draai als een cliënt achter een firewall met beperkend beleid</string>
+  <string name="reachable_ports">Bereikbare poorten</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Poorten bereikbaar achter een beperkende firewall</string>
+  <string name="enter_ports">Voer poorten in</string>
+  <string name="enable_hidden_services">Verborgen diensten hosten</string>
+  <string name="run_servers_accessible_via_the_tor_network">maak server-op-toestel toegankelijk via het Tor-netwerk</string>
+  <string name="enter_localhost_ports_for_hidden_services">voer localhost-poorten in voor verborgen diensten</string>
+  <string name="hidden_service_ports">Verborgen dienst-poort</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">de adresseerbare naam voor je verborgen dienst (automatisch gegenereerd)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">schakel debug log naar uitvoer in (adb of aLogCat is nodig om dit te bekijken)</string>
+  <string name="project_home">Project homepagina(\'s): </string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">De Tor-licentie</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Software van 3e partijen: </string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Een applicatie wil verborgen dienst-poort %S openen naar het Tor-netwerk. Dit is veilig als je de applicatie vertrouwt.</string>
+  <string name="found_existing_tor_process">bestaand Tor-proces gevonden…</string>
+  <string name="something_bad_happened">Er is een fout opgetreden. Controleer de log</string>
+  <string name="hidden_service_on">verborgen dienst op:</string>
+  <string name="unable_to_read_hidden_service_name">Kan verborgen dienst-naam niet lezen</string>
+  <string name="unable_to_start_tor">Kan Tor niet starten:</string>
+  <string name="unable_to_reset_tor">Herstart je toestel, kan Tor niet opnieuw instellen!</string>
+  <string name="pref_use_sys_iptables_title">Gebruik standaard iptables</string>
+  <string name="pref_use_sys_iptables_summary">gebruik de ingebouwde iptables-binary in plaats van de in Orbot geïntegreerde</string>
+  <string name="error_installing_binares">De Tor-binaries konden niet worden geïnstalleerd of bijgewerkt.</string>
+  <string name="pref_use_persistent_notifications">Houd icoon in taakbalk zolang Orbot verbonden is</string>
+  <string name="pref_use_persistent_notifications_title">Meldingen altijd aan</string>
+  <string name="pref_use_expanded_notifications">Toon uitgebreide melding met Tor-exitland en IP</string>
+  <string name="pref_use_expanded_notifications_title">Uitgebreide meldingen</string>
+  <string name="notification_using_bridges">Bridges ingeschakeld!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Taal</string>
+  <string name="set_locale_summary">Kies de landsinstellingen en taal voor Orbot</string>
+  <string name="wizard_locale_title">Kies taal</string>
+  <string name="wizard_locale_msg">Laat standaard of schakel over naar huidige taal</string>
+  <string name="powered_by">aangedreven door Tor</string>
+  <string name="btn_save_settings">Sla instellingen op</string>
+  <string name="no_internet_connection_tor">Geen internetverbinding; Tor is op stand-by…</string>
+  <string name="bandwidth_">Bandbreedte:</string>
+  <string name="down">omlaag</string>
+  <string name="up">omhoog</string>
+  <string name="pref_disable_network_title">Geen netwerk automatisch slapen</string>
+  <string name="pref_disable_network_summary">Laat Tor slapen als er geen internetverbinding beschikbaar is</string>
+  <string name="newnym">Je bent naar een nieuwe Tor identiteit gewisseld!</string>
+  <string name="menu_verify_browser">Browser</string>
+  <string name="menu_use_chatsecure">Gebruik ChatSecure</string>
+  <string name="permission_manage_tor_label">Tor beheren</string>
+  <string name="permission_manage_tor_description">Deze applicatie toestaan om de Tor-dienst te bedienen</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orfox lijkt niet geïnstalleerd te zijn, Wil je daar hulp bij, of wil je gewoon de browser openen?</string>
+  <string name="install_apps_">Applicaties installeren?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Geen internetverbinding. Tor wordt te slapen gelegd…</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Netwerkverbinding is in orde. Tor wordt wakker gemaakt…</string>
+  <string name="updating_settings_in_tor_service">instellingen in Tor-dienst worden bijgewerkt</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Poort waarop Tor de SOCKS-proxy aanbiedt (standaard: 9050 of 0 om uit te schakelen)</string>
+  <string name="pref_socks_dialog">SOCKS-poortconfiguratie</string>
+  <string name="pref_transport_title">Tor TransProxy-poort</string>
+  <string name="pref_transport_summary">Poort waarop Tor de transparante proxy aanbiedt (standaard: 9040 of 0 om uit te schakelen)</string>
+  <string name="pref_transport_dialog">TransProxy-poortconfiguratie</string>
+  <string name="pref_dnsport_title">Tor DNS-poort</string>
+  <string name="pref_dnsport_summary">Poort waarop Tor de DNS aanbiedt (standaard: 5400 of 0 om uit te schakelen)</string>
+  <string name="pref_dnsport_dialog">DNS-poortconfiguratie</string>
+  <string name="pref_torrc_title">Torrc aangepaste configuratie</string>
+  <string name="pref_torrc_summary">ENKEL VOOR GEVORDERDEN: voer rechtstreeks torrc-configuratieregels in</string>
+  <string name="pref_torrc_dialog">Aangepaste Torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string>
+  <string name="your_tor_public_ips_">Je Tor publieke IP\'s:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Schakel deze applicatie uit in Android->Instellingen->Applicaties als je problemen ondervindt met Orbot:</string>
+  <string name="app_conflict">App-conflict</string>
+  <string name="pref_transproxy_refresh_title">Transproxy automatisch verversen</string>
+  <string name="pref_transproxy_refresh_summary">Transproxy-regels opnieuw toepassen wanneer de status van het netwerk verandert</string>
+  <string name="pref_transproxy_flush_title">Transproxy VERWIJDEREN DWINGEN</string>
+  <string name="pref_transproxy_flush_summary">Tik hier om alle transproxy-netwerkregels NU te spoelen</string>
+  <string name="transparent_proxy_rules_flushed_">Transparante proxy-regels gespoeld!</string>
+  <string name="you_do_not_have_root_access_enabled">Je hebt ROOT-toegang niet ingeschakeld</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Het kan nodig zijn Orbot te stoppen en opnieuw te starten opdat wijzigingen in de instellingen worden ingeschakeld.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Bridges bijgewerkt</string>
+  <string name="restart_orbot_to_use_this_bridge_">Herstart Orbot om de wijzigingen in te schakelen</string>
+  <string name="menu_qr">QR-codes</string>
+  <string name="bridge_mode">Bridge-modus</string>
+  <string name="get_bridges_email">E-mail</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Activeren</string>
+  <string name="apps_mode">Apps VPN Modus</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Je kan instellen dat alle applicaties op je toestel gebruik maken van het Tor-netwerk met de VPN-functie van Android.\n\n*WAARSCHUWING* Dit is een nieuwe, experimentele functie die in sommige gevallen niet automatisch kan starten, of zou kunnen stoppen. Het moet NIET worden gebruikt voor anonimiteit en ENKEL om firewalls en filters te omzeilen.</string>
+  <string name="send_email">E-mail versturen</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Je kan een bridge-adres verkrijgen door e-mail, het web of door een bridge-QR-code te scannen. Kies \'E-mail\' of \'Web\' hieronder om een bridge-adres aan te vragen.\n\nEenmaal je een adres hebt kopieer en plak je het in de \"Bridges\"-optie in de Orbot-instellingen, waarna je Orbot herstart.</string>
+  <string name="install_orweb">Orfox installeren</string>
+  <string name="standard_browser">Standaardbrowser</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">LET OP: enkel standaard Tor-bridges werken op Intel x86/Atom-toestellen</string>
+  <string name="vpn_default_world">Wereld</string>
+</resources>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
new file mode 100644
index 0000000..2756370
--- /dev/null
+++ b/app/src/main/res/values-pa/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_browse">ਚਰਨਾ</string>
+  <string name="menu_settings">ਪਰਿਸਥਿਤੀ</string>
+  <string name="menu_info">ਸਹਾਇਤਾ</string>
+  <string name="button_help">ਸਹਾਇਤਾ</string>
+  <string name="btn_cancel">ਰੱਦ ਕਰੋ</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">ਪਰਾਕਸੀ ਸੈਟਿੰਗ</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">ਖਾਲੀ</string>
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
new file mode 100644
index 0000000..e550da5
--- /dev/null
+++ b/app/src/main/res/values-pl/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot jest darmową aplikacją proxy która wspomaga inne aplikacje do używania internetu bezpiecznie. Orbot używa Tora do szyfrowania Twojego ruchu internetowego i następnie przepuszczania go przez wiele innych komputereów pororzucanych na całym świecie. Tor jest darmowym oprogramowaniem i otwartą siecią która pomaga Tobie w obronie przed monitoringiem sieci która zagrarza osobistej wolności i prywatności, poufnym biznesowym aktywnościom.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">włącz i wyłącz Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot startuje...</string>
+  <string name="status_activated">Podłączony do sieci Tor</string>
+  <string name="status_disabled">Orbot wyłączony</string>
+  <string name="status_shutting_down">TorService wyłącza się</string>
+  <string name="tor_process_starting">Uruchamianie klienta sieci Tor...</string>
+  <string name="tor_process_complete">gotowe.</string>
+  <string name="tor_process_waiting">czekaj.</string>
+  <string name="not_anonymous_yet">UWAGA: Twoja komunikacja nie jest jeszcze anonimowa! Proszę skonfiguruj aplikacje aby używały serwera proxy HTTP 127.0.0.1:8118 lub SOCKS4A lub SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Start</string>
+  <string name="menu_browse">Przeglądaj</string>
+  <string name="menu_settings">Ustawienia</string>
+  <string name="menu_log">Logi</string>
+  <string name="menu_info">Pomoc</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Start</string>
+  <string name="menu_stop">Stop</string>
+  <string name="menu_about">O programie</string>
+  <string name="menu_promo_apps">Zdobądź aplikacje</string>
+  <string name="main_layout_download">Pobieranie (prędkość/suma)</string>
+  <string name="main_layout_upload">Wysyłanie (prędkość/suma)</string>
+  <string name="button_help">Pomoc</string>
+  <string name="button_close">Zamknij</string>
+  <string name="button_about">O programie</string>
+  <string name="button_clear_log">Czyść dziennik</string>
+  <string name="menu_verify">Sprawdź</string>
+  <string name="menu_exit">Wyjście</string>
+  <string name="menu_scan">Skanuj BridgeQR</string>
+  <string name="menu_share_bridge">Podziel się BridgeQR</string>
+  <string name="press_to_start">- wciśnij na dłużej, by uruchomić -</string>
+  <string name="pref_trans_proxy_group">Przekierowanie przezroczyste (Wymaga uprawnień administratora)</string>
+  <string name="pref_trans_proxy_title">Przekierowanie przezroczyste</string>
+  <string name="pref_trans_proxy_summary">Automatyczne toryfikowanie aplikacji</string>
+  <string name="pref_transparent_all_title">Przepuść wszystko przez Tora</string>
+  <string name="pref_transparent_all_summary">Przekierowanie ruchu wszystkich aplikacji przez Tora</string>
+  <string name="pref_transparent_port_fallback_title">Zapasowy Port Proxy</string>
+  <string name="pref_transparent_port_fallback_summary">UWAGA: Unika powszechnych portów (80, 443, etc). *UŻYWAĆ TYLKO* gdy \'All\' lub tryb \'App\' nie działa.</string>
+  <string name="pref_transparent_port_title">Lista Portów</string>
+  <string name="pref_transparent_port_summary">Lista portów, które przechwytywać. *UŻYWAĆ TYLKO* gdy \'All\' lub tryb \'App\' nie działa.</string>
+  <string name="pref_transparent_port_dialog">Wpisz porty do przechwytywania</string>
+  <string name="pref_has_root">Żądaj dostępu administratora</string>
+  <string name="pref_has_root_summary">Żądaj dostępu administratora dla przezroczystego przekierowania</string>
+  <string name="status_install_success">Binarki Tora pomyślnie zainstalowane!</string>
+  <string name="status_install_fail">Nie można zainstalować plików binarnych Tora. Zajrzyj do dziennika i powiadom tor-assistants at torproject.org</string>
+  <string name="title_error">Błąd Aplikacji</string>
+  <string name="wizard_title">Witamy w Orbocie</string>
+  <string name="wizard_btn_tell_me_more">O Orbocie</string>
+  <string name="btn_next">Dalej</string>
+  <string name="btn_back">wstecz</string>
+  <string name="btn_finish">Koniec</string>
+  <string name="btn_okay">OK</string>
+  <string name="btn_cancel">Anuluj</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Niektóre szczegóły o Orbocie</string>
+  <string name="wizard_details_msg">Orbot jest otwartą aplikacją zawierającą Tor, LibEvent i Polipo. Dostarcza lokalnego proxy HTTP (8118) i SOCKS proxy (9050) do sieci Tora. Orbot ma możliwość, na urządzeniu uruchomionym z prawami administratora, wysyłać cały ruch internetowy przez Tora.</string>
+  <string name="wizard_permissions_root">Dostęp zezwolony</string>
+  <string name="wizard_permissions_stock">Prawa dostepu Orbota</string>
+  <string name="wizard_premissions_msg_root">Doskonale! Odkryliśmy, że masz uprawnienia administratora włączone dla Orbota. Będziemy mądrze korzystać z tej władzy.</string>
+  <string name="wizard_permissions_msg_stock">Podczas gdy nie jest to wymagane, Orbot może stać się znacznie potężniejszym narzędziem, gdy masz prawa administratora na swoim urządzeniu. Użyj przycisku poniżej, by dać Orbotowi duży uprawnienia.</string>
+  <string name="wizard_permissions_no_root">Jeśli nie masz uprawnień administratora lub nie masz pojęcia, o czym mówimy, używaj aplikacji skonfigurowanych do pracy z Orbotem.</string>
+  <string name="wizard_permissions_consent">Rozumiem i chcę kontynuować bez uprawnień administratora</string>
+  <string name="wizard_permission_enable_root">Nadaj uprawnienia administratora Orbotowi</string>
+  <string name="wizard_configure">Skonfiguruj Toryfikację</string>
+  <string name="wizard_configure_msg">Orbot daje Ci możliwość przekierowania całego ruchu aplikacji przez Tora albo wybrania aplikacji pojedynczo.</string>
+  <string name="wizard_configure_all">Przekierowuj wszystkie aplikacje przez Tora</string>
+  <string name="wizard_configure_select_apps">Wybierz poszczególne aplikacje dla Tora</string>
+  <string name="wizard_tips_tricks">Aplikacje skonfigurowane dla Orbota</string>
+  <string name="wizard_tips_msg">Zachęcamy do pobierania i używania aplikacji, które wiedzą, jak łączyć się bezpośrednio z Orbotem. Kliknij na poniższe przyciski, by zainstalować.</string>
+  <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="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="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>
+  <string name="wizard_final">Orbot jest gotowy!</string>
+  <string name="wizard_final_msg">Miliony ludzi na całym świecie używają Tora z różnych powodów.\n\nDziennikarze i blogerzy, działacze na rzecz praw człowieka, stróże prawa, żołnierze, korporacje, obywatele represyjnych reżimów i zwykli obywatele... teraz Ty też możesz!</string>
+  <string name="wizard_exit_at_first_screen_toast">Proszę skonfiguruj Orbot zanim zaczniesz go uzywać!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Pomyślnie połączyłeś się do sieci Tor - ale to nie oznacza, że Twoje urządzenie jest bezpieczne. Możesz użyć przycisku \'Przeglądarka\' aby sprawdzić swoje połączenie. \n\nOdwiedź nas na https://guardianproject.info/apps/orbot lub wyślij nam maila na help at guardianproject.info aby dowiedzieć się więcej.</string>
+  <string name="tor_check">To otworzy Twoją domyślną przeglądarkę na adresie https://check.torproject.org w celu sprawdzenia, czy Orbot jest skonfigurowany i jest połączenie z Torem.</string>
+  <string name="pref_hs_group">Usługi ukryte</string>
+  <string name="pref_general_group">Ogólne</string>
+  <string name="pref_start_boot_title">Uruchamiaj Orbota przy starcie</string>
+  <string name="pref_start_boot_summary">Automatycznie uruchamiaj Orbota i łącz się z Torem, gdy Twoje urządzenie z Androidem się uruchomi</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot daje Tora Androidowi! Tor pomaga bronić się przed podsłuchem sieci znanym jako analiza ruchu, który zagraża wolności osobistej i prywatności, poufnym działaniom biznesowym i relacjami.\n\nTen kreator pomoże Ci skonfigurować Orbota i Tora na Twoim urządzeniu.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Ostrzeżenie</string>
+  <string name="wizard_warning_msg">Sama instalacja Orbota nie sprawi, że Twój mobilny ruch będzie całkiem anonimowy.\n\nMusisz wykonać poprawną konfigurację Orbota, Twojego urządzenia i innych aplikacji, aby skutecznie używać Tora.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Uprawnienia</string>
+  <string name="wizard_permissions_root_msg1">Możesz opcjonalnie przekazać darowiznę Orbotowi i otrzymać dostęp \'Superużytkownika\' aby włączyć zaawansowane funkcje, jak np. Transparentne Proxy.</string>
+  <string name="wizard_permissions_root_msg2">Jeśli nie chcesz tego robić, upewnij się by używać aplikacji stworzonych do pracy z Orbotem</string>
+  <string name="wizard_permissions_no_root_msg">Wygląda na to, że Twoje urządzenie nie ma praw administratora, lub nie posiada opcji \'Super użytkownika\'.\n\nZamiast tego prosimy o spróbowanie opcji \'Aplikacje\' na głównym ekranie.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox: Przeglądarka, która działa przez Tora</string>
+  <string name="wizard_tips_play">Znajdź wszystkie aplikacje Guardian Project na Google Play</string>
+  <string name="wizard_tips_fdroid">Zobacz wszystkie aplikacje Guardian Project na F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Zobacz wszystkie aplikacje Guardian Project na https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparentne Proxy</string>
+  <string name="wizard_transproxy_msg">To pozwala Twojej aplikacji na automatyczne połączenie przez Sieć Tor bez żadnej konfiguracji.</string>
+  <string name="wizard_transproxy_hint">(Sprawdź tutaj, jeśli nie masz pojęcia o czym mówimy)</string>
+  <string name="wizard_transproxy_none">Brak</string>
+  <string name="pref_transparent_tethering_title">Przywiązywanie Tora</string>
+  <string name="pref_transparent_tethering_summary">Włącz Transparentne Proxy Tora dla Wifi i USB (wymaga restartu)</string>
+  <string name="button_grant_superuser">Żądanie dostępu Superużytkownika</string>
+  <string name="pref_select_apps">Wybierz aplikacje</string>
+  <string name="pref_select_apps_summary">Wybierz aplikacje do przejścia przez Tor</string>
+  <string name="pref_node_configuration">Konfiguracja węzła</string>
+  <string name="pref_node_configuration_summary">Są to zaawansowane ustawienia, które mogą zmniejszyć Twoją anonimowość</string>
+  <string name="pref_entrance_node">Węzły wejściowe</string>
+  <string name="pref_entrance_node_summary">Odciski palców, nicki, państwa i adresy na pierwszy raz</string>
+  <string name="pref_entrance_node_dialog">Wpisz Węzły Wejściowe</string>
+  <string name="pref_allow_background_starts_title">Pozwól na start z tle</string>
+  <string name="pref_allow_background_starts_summary">Pozwól każdej aplikacji powiedzieć, aby Orbot uruchomił Tor i inne związane z nim usługi</string>
+  <string name="button_proxy_all">Przepuszczaj wszystko przez proxy</string>
+  <string name="button_proxy_none">Nie przepuszczaj niczego przez proxy</string>
+  <string name="button_invert_selection">Odwróć zaznaczone</string>
+  <string name="pref_proxy_title">Wychodzący serwer sieciowy proxy</string>
+  <string name="pref_proxy_type_title">Wychodzące Typy Proxy</string>
+  <string name="pref_proxy_type_summary">Protokół używany dla serwera proxy: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Wpis Typ Proxy</string>
+  <string name="pref_proxy_host_title">Wychodzący Proxy Host</string>
+  <string name="pref_proxy_host_summary">Nazwa hosta serwera proxy</string>
+  <string name="pref_proxy_host_dialog">Wpisz Hosta Proxy</string>
+  <string name="pref_proxy_port_title">Wychodzące Porty Proxy</string>
+  <string name="pref_proxy_port_summary">Port serwera Proxy</string>
+  <string name="pref_proxy_port_dialog">Wpisz port Proxy</string>
+  <string name="pref_proxy_username_title">Nazwa użytkownika Wychodzącego Proxy</string>
+  <string name="pref_proxy_username_summary">Nazwa użytkownika proxy (opcjonalna)</string>
+  <string name="pref_proxy_username_dialog">Wpisz nazwę użytkownika Proxy</string>
+  <string name="pref_proxy_password_title">Hasło Wychodzącego Proxy</string>
+  <string name="pref_proxy_password_summary">Hasło Proxy (opcjonalne)</string>
+  <string name="pref_proxy_password_dialog">Wpisz hasło Proxy</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Ustawianie w pełni transparentnego proxy...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Ustawianie bazującego na aplikacji transparentnego proxy</string>
+  <string name="transparent_proxying_enabled">Transparentne proxy WŁĄCZONE</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy podłączone do modemu!</string>
+  <string name="warning_error_starting_transparent_proxying_">OSTRZEŻENIE: błąd w uruchamianiu transparentnego proxy!</string>
+  <string name="transproxy_rules_cleared">TransProxy działa czysto</string>
+  <string name="couldn_t_start_tor_process_">Nie można było zainicjować procesu Tora:</string>
+  <string name="privoxy_is_running_on_port_">Polipo działa na porcie:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Ustawianie bazującego na porcie transparentnego proxy</string>
+  <string name="bridge_error">Błąd mostka</string>
+  <string name="bridge_requires_ip">Aby użyć funkcji mostka, musisz wpisać przynajmniej jeden adres IP mostka.</string>
+  <string name="send_email_for_bridges">Wyślij e-mail do bridges at torproject.org pisząc w treści \"get bridges\" z konta gmail.</string>
+  <string name="error">Błąd</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Twoje ustawienia dostępnych adresów spowodowały wyjątek!</string>
+  <string name="your_relay_settings_caused_an_exception_">Ustawienia Twojego przekaźnika spowodowały wyjątek!</string>
+  <string name="exit_nodes">Węzły Wyjściowe</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Odciski palców, nicki, państwa i adresy na ostatni skok</string>
+  <string name="enter_exit_nodes">Wpisz węzły wyjściowe.</string>
+  <string name="exclude_nodes">Wyklucz węzły</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Odciski palców, nicki, państwa i adresy do wykluczenia.</string>
+  <string name="enter_exclude_nodes">Wpisz wykluczone węzły.</string>
+  <string name="strict_nodes">Ścisłe węzły</string>
+  <string name="use_only_these_specified_nodes">Użyj *tylko* tych określonych węzłów</string>
+  <string name="bridges">Mostki</string>
+  <string name="use_bridges">Użyj mostków</string>
+  <string name="bridges_obfuscated">UUtajnione Mostki</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Umożliw alternatywne wejściowe węzły do Sieci Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Włącz, jeśli skonfigurowane mostki są ukrytymi mostkami</string>
+  <string name="ip_address_and_port_of_bridges">Adres IP i port mostków</string>
+  <string name="enter_bridge_addresses">Wpisz adresy mostków</string>
+  <string name="relays">Przekaźniki</string>
+  <string name="relaying">Przekazywanie</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Pozwól swojemu urządzeniu zostać bezwyjściowym przekaźnikiem</string>
+  <string name="relay_port">Port Przekaźników</string>
+  <string name="listening_port_for_your_tor_relay">Nasłuchiwanie portu Twojego przekaźnika</string>
+  <string name="enter_or_port">Wpisz port OR</string>
+  <string name="relay_nickname">Nick przekaźnika</string>
+  <string name="the_nickname_for_your_tor_relay">Nick Twojego przekaźnika Tora</string>
+  <string name="enter_a_custom_relay_nickname">Wpisz standardową nazwę przekaźnika</string>
+  <string name="reachable_addresses">Osiągalne adresy:</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Włącz jako klienta za firewallem z restrykcyjną polityką</string>
+  <string name="reachable_ports">Osiągalne porty</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Porty dostępne za ograniczającym firewallem</string>
+  <string name="enter_ports">Wpisz porty</string>
+  <string name="enable_hidden_services">Włącz Ukryte Serwisy</string>
+  <string name="run_servers_accessible_via_the_tor_network">włącz serwisy dostępne przez Sieć Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">wpisz porty localhosta dla ukrytych serwisów</string>
+  <string name="hidden_service_ports">Porty Ukrytych Serwisów</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">adresowana nazwa dla Twojego ukrytego serwisu (generowana automatycznie)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">włącz zdebugowany log do wydajności (musisz używać adb lub aLogCat, by go zobaczyć)</string>
+  <string name="project_home">Strony domowe projektu:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Licencja Tora</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Oprogramowanie 3rd-Party</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Aplikacja chce otworzyć port ukrytego serwera %S do Sieci Tor. Jest to bezpieczne, jeśli ufasz aplikacji.</string>
+  <string name="found_existing_tor_process">znaleziono istniejący proces Tora...</string>
+  <string name="something_bad_happened">Coś nie poszło nie tak. Sprawdź logi</string>
+  <string name="hidden_service_on">ukryty serwis:</string>
+  <string name="unable_to_read_hidden_service_name">uniemożliw czytanie nazw ukrytych serwisów</string>
+  <string name="unable_to_start_tor">Nie można wystartować aplikacji Tor:</string>
+  <string name="unable_to_reset_tor">Zrestartuj swoje urządzenie, nie można zrestartować Tora!</string>
+  <string name="pref_use_sys_iptables_title">Użyj domyślnie Iptables</string>
+  <string name="pref_use_sys_iptables_summary">użyj wbudowanych plików binarnych iptables zamiast tych w pakiecie z Orbotem</string>
+  <string name="error_installing_binares">Pliki binarne Tora nie zostały zainstalowane lub uaktualnione.</string>
+  <string name="pref_use_persistent_notifications">Zawsze trzymaj ikonę w pasku powiadomień gdy Orbot jest połączony</string>
+  <string name="pref_use_persistent_notifications_title">Powiadomienia zawsze aktywne</string>
+  <string name="pref_use_expanded_notifications">Pokaż rozszerzone powiadomienie z krajem Tor exit node oraz jego IP</string>
+  <string name="pref_use_expanded_notifications_title">Rozszerzone Powiadomienia</string>
+  <string name="notification_using_bridges">Mostki włączone!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Język</string>
+  <string name="set_locale_summary">Wybierz ustawienia regionalne i język dla Orbota</string>
+  <string name="wizard_locale_title">Wybierz język</string>
+  <string name="wizard_locale_msg">Zostaw domyślny albo zmień język</string>
+  <string name="powered_by">napędzane oprogramowaniem Projektu Tor</string>
+  <string name="btn_save_settings">Zapisz ustawienia</string>
+  <string name="no_internet_connection_tor">Brak połączenia internetowego; Tor jest w trybie oczekiwania...</string>
+  <string name="bandwidth_">Przepustowość:</string>
+  <string name="down">pobieranie</string>
+  <string name="up">wysyłanie</string>
+  <string name="pref_disable_network_title">Brak Auto-Uśpienia Sieci</string>
+  <string name="pref_disable_network_summary">Ustaw Tor\'a w tryb uśpienia kiedy połączenie internetowe będzie niedostępne</string>
+  <string name="newnym">Nowa tożsamość Tor\'a została zmieniona!</string>
+  <string name="menu_verify_browser">Przeglądarka</string>
+  <string name="menu_use_chatsecure">Użyj ChatSecure</string>
+  <string name="permission_manage_tor_label">Administruj Tor\'em</string>
+  <string name="permission_manage_tor_description">Pozwól tej aplikacji kontrolować serwis Tor</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Wygląda na to, że nie masz zainstalowanej Orfoxa. Chcesz abyśmy Ci pomogli, czy chcesz abyśmy otworzyli to w przeglądarce?</string>
+  <string name="install_apps_">Zainstalować aplikacje?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Brak połączenia internetowego. Tor będzie w trybie snu...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Połączenie internetowe jest dobre. Trwa budzenie Tora...</string>
+  <string name="updating_settings_in_tor_service">aktualizowanie ustawień w serwisie Tor</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Port który oferuje SOCKS proxy (domyślnie: 9050 lub 0, aby wyłączyć)</string>
+  <string name="pref_socks_dialog">Konfiguracja portu SOCKS</string>
+  <string name="pref_transport_title">Tor TransProxy Port</string>
+  <string name="pref_transport_summary">Port który oferuje Transparent Proxy (domyślnie: 9040 lub 0, aby wyłączyć)</string>
+  <string name="pref_transport_dialog">Konfiguracja portu TransProxy</string>
+  <string name="pref_dnsport_title">Tor DNS Port</string>
+  <string name="pref_dnsport_summary">Port na którym Tor oferuje swój DNS (domyślnie: 5400 lub 0, aby wyłączyć)</string>
+  <string name="pref_dnsport_dialog">Konfiguracja portu DNS</string>
+  <string name="pref_torrc_title">Konfiguracja Torrc klienta</string>
+  <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="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>
+  <string name="pref_transproxy_refresh_title">Transproxy Auto-Odśwież</string>
+  <string name="pref_transproxy_refresh_summary">Zaztosuj ustawienia Transproxy kiedy stan sieci zmieni się</string>
+  <string name="pref_transproxy_flush_title">Transproxy WYMUŚ USUNIĘCIE</string>
+  <string name="pref_transproxy_flush_summary">Dotknij tutaj, aby wyczyścić wszystkie zasady sieciowe transproxy TERAZ</string>
+  <string name="transparent_proxy_rules_flushed_">Ustawienia Transproxy zostały wyczyszczone!</string>
+  <string name="you_do_not_have_root_access_enabled">Nie masz praw użytkownika root.</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Możesz zatrzymać i uruchomić ponownie Orbota, aby zmiany ustawień weszły w życie.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Zaktualizowane Bridges</string>
+  <string name="restart_orbot_to_use_this_bridge_">Proszę zrestartować Orbot, aby zmiany mogły wejść w życie</string>
+  <string name="menu_qr">Kody QR</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Jeśli Twoja sieć telefoniczna aktywnie blokuje Tora, to możesz używać Bridge., aby połączyć się z siecią. WYBIERZ jeden typ bridge powyżej, aby włączyć bridges.</string>
+  <string name="bridge_mode">Tryb Bridge</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Aktywuj</string>
+  <string name="apps_mode">Tryb VPN Aplikacji</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Możesz włączyć opcję dla wszystkich aplikacji, tak, aby ich ruch internetowy był przepuszczany przez sieć Tor używając do tego opcji VPN w Androidzie.\n\n*UWAGA* Jest to nowa, eksperymentalana opcja i w niektórych przypadkach może ona nie uruchomić się automatycznie, lub może się zatrzymać. Opcja ta NIE POWINNA być używana w celach uzyskania anonimowości, a TYLKO wyłącznie w celu ominięcia firewalli i filtrów.</string>
+  <string name="send_email">Wyślij Email</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Możesz uzyskać adres Bridge poprzez email, internet, lub poprzez zeskanowanie kodu QR. Wybierz \'Email\' lub \'Internet\' poniżej, aby poprosić o adres bridge\'a.\n\nJak już będziesz mieć ten adres to skopiuj i wklej go do \"Bridges\" we właściwościach Orbota a następnie go zrestartuj.</string>
+  <string name="install_orweb">Zainstaluj Orfox</string>
+  <string name="standard_browser">Standardowa przeglądarka</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">UWAGA: Tylko standardowe bridges działają na urządzeniach z Intel X86/ATOM.</string>
+  <string name="vpn_default_world">Świat</string>
+</resources>
diff --git a/app/src/main/res/values-ps/strings.xml b/app/src/main/res/values-ps/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/app/src/main/res/values-ps/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..b23e304
--- /dev/null
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot é um aplicativo de proxy livre que capacita outros aplicativos a usar a internet com mais segurança. Orbot usa o Tor para criptografar seu tráfego na internet e então o esconde \"saltando\" entre uma série de computadores ao redor do mundo. Tor é um software livre e de rede aberta que ajuda você a se defender de certas formas de vigilância que ameaçam privacidade e liberdade pessoais, atividades e relações comerciais confidenciais e segurança estatal conhecida como análise de tráfego.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">iniciar e parar o Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot está iniciando...</string>
+  <string name="status_activated">Conectado à rede Tor</string>
+  <string name="status_disabled">Orbot está desativado</string>
+  <string name="status_shutting_down">TorService está desligando</string>
+  <string name="tor_process_starting">Iniciando cliente Tor...</string>
+  <string name="tor_process_complete">completo.</string>
+  <string name="tor_process_waiting">esperando.</string>
+  <string name="not_anonymous_yet">AVISO: Seu tráfego não é anônimo ainda! Por favor, configure suas aplicações para usar proxy HTTP 127.0.0.1:8118 ou proxy SOCKS4A ou SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Início</string>
+  <string name="menu_browse">Procurar</string>
+  <string name="menu_settings">Configurações</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Ajuda</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Iniciar</string>
+  <string name="menu_stop">Parar</string>
+  <string name="menu_about">Sobre</string>
+  <string name="menu_promo_apps">Obter aplicativos...</string>
+  <string name="main_layout_download">Download</string>
+  <string name="main_layout_upload">Upload</string>
+  <string name="button_help">Ajuda</string>
+  <string name="button_close">Fechar</string>
+  <string name="button_about">Sobre</string>
+  <string name="button_clear_log">Limpar Log</string>
+  <string name="menu_verify">Checar</string>
+  <string name="menu_exit">Sair</string>
+  <string name="menu_scan">Escanear BridgeQR</string>
+  <string name="menu_share_bridge">Compartilhar BridgeQR</string>
+  <string name="press_to_start">- clique longo para iniciar -</string>
+  <string name="pref_trans_proxy_group">Proxying Transparente (Requer Root)</string>
+  <string name="pref_trans_proxy_title">Proxying Transparente</string>
+  <string name="pref_trans_proxy_summary">Automaticamente Torificar Apps</string>
+  <string name="pref_transparent_all_title">Tor Tudo</string>
+  <string name="pref_transparent_all_summary">Tráfego proxy para todos apps através do Tor</string>
+  <string name="pref_transparent_port_fallback_title">Porta do Proxy Reserva</string>
+  <string name="pref_transparent_port_fallback_summary">AVISO: Evite as portas comuns (80,443, etc). *USE SOMENTE* se o modo \'Todos\' ou \'App\' não funcionou.</string>
+  <string name="pref_transparent_port_title">Lista de Portas</string>
+  <string name="pref_transparent_port_summary">Lista de portas para proxy. *USE SOMENTE* se o modo \'Todos\' ou \'App\' não funcionou</string>
+  <string name="pref_transparent_port_dialog">Insira as portas para proxy</string>
+  <string name="pref_has_root">Requer Acesso Root</string>
+  <string name="pref_has_root_summary">Requer acesso root para proxy transparente</string>
+  <string name="status_install_success">Binário do Tor instalados com sucesso!</string>
+  <string name="status_install_fail">Os arquivos binários do Tor estão inaptos à serem instalados. Por favor, cheque o log e notifique tor-assistants at torproject.org</string>
+  <string name="title_error">Erro de Aplicação</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Sobre Orbot</string>
+  <string name="btn_next">Próximo</string>
+  <string name="btn_back">Voltar</string>
+  <string name="btn_finish">Terminar</string>
+  <string name="btn_okay">Okay</string>
+  <string name="btn_cancel">Cancelar</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Alguns detalhes do Orbot</string>
+  <string name="wizard_details_msg">Orbot é uma aplicação de código aberto que contém Tor, libEvent e Polipo. Ela provê um proxy HTTP local (8118) e um proxy SOCKS (9050) dentro da rede Tor. Orbot também tem a a habilidade, num dispositivo de com acesso root, de enviar todo o tráfego de internet através do Tor.</string>
+  <string name="wizard_permissions_root">Permissão Concedida</string>
+  <string name="wizard_permissions_stock">Permissões do Orbot</string>
+  <string name="wizard_premissions_msg_root">Excelente! Detectamos que você habilitou permissões de root para Orbot. Nós usaremos este poder com sabedoria.</string>
+  <string name="wizard_permissions_msg_stock"> Enquanto não é requerido, o Orbot pode se tornar uma ferramenta mais poderosa se seu dispositivo tivesse acesso root. Use o botão abaixo para conceder superpoderes ao Orbot! </string>
+  <string name="wizard_permissions_no_root">Se você não tem acesso root ou não tem idéia sobre o que estamos falando, só tenha a certeza de usar apps feitas para trabalhar com o Orbot.</string>
+  <string name="wizard_permissions_consent">Eu entendo e gostaria de continuar sem o Superusuário</string>
+  <string name="wizard_permission_enable_root">Conceder acesso Root ao Orbot</string>
+  <string name="wizard_configure">Configurar Torificação</string>
+  <string name="wizard_configure_msg">Orbot dá a você a opção de rotear todo o tráfego de aplicação através do Tor OU para escolher suas aplicações individualmente.</string>
+  <string name="wizard_configure_all">Usar Proxy para Todas Apps Através do Tor</string>
+  <string name="wizard_configure_select_apps">Selecionar Apps Individuais para o Tor</string>
+  <string name="wizard_tips_tricks">Apps habilitadas para Orbot</string>
+  <string name="wizard_tips_msg">As apps abaixo foram desenvolvidas para trabalhar com Orbot. Clique em cada botão para instalar agora, ou você pode encontrá-las posteriormente no Android Market.</string>
+  <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="wizard_tips_twitter">Define o proxy do Twitter para \"localhost\" e a porta 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Faça uma história e deixe-a para o tor por segurança!</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>
+  <string name="wizard_proxy_help_msg">Se a app Android que você está usando puder suportar o uso de proxy HTTP ou SOCKS, então você pode configurar para conectar ao Orbot e usar o Tor. As configurações de host são 127.0.0.1 ou \"localhost\". Para HTTP, a porta configurada é 8118. Para SOCKS, o proxy é 9050. Você deve usar SOCKS4A ou SOCKS5 se possível. Você pode aprender mais sobre proxy no Android através do FAQ em: http://tinyurl.com/proxyandroid</string>
+  <string name="wizard_final">Orbot está pronto!</string>
+  <string name="wizard_final_msg">Centenas de milhares de pessoas ao redor do mundo usam o Tor por uma enorme variedade de razões. Jornalistas e bloggers, defensores dos direitos humanos, oficiais da lei, soldados, corporações, cidadãos em regimes repressivos, e somente cidadãos comuns... e agora você está pronto para usar, também! </string>
+  <string name="wizard_exit_at_first_screen_toast">Por favor, configure o Orbot antes de começar a usá-lo!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Você se conectou à rede Tor com sucesso - mas isto NÃO significa que seu dispositivo é seguro. Você pode usar a opção \'Checar\' no menu para testar seu navegador. Visite-nos em https://guardianproject.info/apps/orbot ou envie um e-mail para help at guardianproject.info para saber mais.</string>
+  <string name="tor_check">Isto irá abrir seu navegador web em https://check.torproject.org com o intuito de ver se o Orbot está provavelmente configurado e você está conectado ao Tor.</string>
+  <string name="pref_hs_group">Serviços Ocultos</string>
+  <string name="pref_general_group">Geral</string>
+  <string name="pref_start_boot_title">Iniciar Orbot no Boot</string>
+  <string name="pref_start_boot_summary">Automaticamente iniciar o Orbot e conectar o Tor quando seu Android bootar.</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot trouxe Tor para Android!! Tor ajuda você a se defender contra filtro de conteúdo, análises de tráfego e vigilância de rede que ameaçam sua privacidade, informação confidencial e relacionamentos pessoais. Este assistente irá ajudá-lo a configurar o Orbot e Tor no seu dispositivo.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Aviso</string>
+  <string name="wizard_warning_msg">Simplesmente instalando o Orbot não irá automaticamente anonimizar seu tráfego móvel. Você deve configurar apropriadamente o Orbot, seu dispositivo e outras apps para usar o Tor com sucesso.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permissões</string>
+  <string name="wizard_permissions_root_msg1">Você pode opcionalmente garantir ao Orbot acesso de \'Superusuário\' para habilitar recursos avançados, como um proxy transparente.</string>
+  <string name="wizard_permissions_root_msg2">Se você não quiser fazer isto, tenha certeza de usar apps feitas para trabalhar com o Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Seu dispositivo não parece ser roteado ou prover um acesso \'Superusuário\'. De maneira a você se beneficiar do Tor, você precisará usar apps criadas para trabalhar com o Orbot, ou que suportem configurações de proxy HTTP ou SOCKS. </string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox: navegador de privacidade aprimorada que funciona através do Tor</string>
+  <string name="wizard_tips_play">Encontre todos os aplicativos da Guardian Project no Google Play</string>
+  <string name="wizard_tips_fdroid">Encontre todos os aplicativos da Guardian Project no F-Droid </string>
+  <string name="wizard_tips_fdroid_org">Encontre todos os aplicativos da Guardian Project no https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxy Transparente</string>
+  <string name="wizard_transproxy_msg">Isto permite à suas apps automaticamente rodarem através da rede Tor sem nenhuma configuração.</string>
+  <string name="wizard_transproxy_hint">(Selecione esta caixa se você não souber do que estamos falando)</string>
+  <string name="wizard_transproxy_none">Nenhum</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Habilitar Proxy Transparente para Tor Dispositivos de Toque Wifi e Usb (requer reinicialização)</string>
+  <string name="button_grant_superuser">Acesso Superusuário Requerido</string>
+  <string name="pref_select_apps">Selecionar Apps</string>
+  <string name="pref_select_apps_summary">Escolha as Apps para Rotearem Através do Tor</string>
+  <string name="pref_node_configuration">Configuração de Nó</string>
+  <string name="pref_node_configuration_summary">Aqui estão as configurações avançadas que podem reduzir seu anonimato.</string>
+  <string name="pref_entrance_node">Nós de Entrada</string>
+  <string name="pref_entrance_node_summary">Impressões digitais, apelidos, países e endereços para a primeira etapa</string>
+  <string name="pref_entrance_node_dialog">Insira os Nós de Entrada</string>
+  <string name="pref_allow_background_starts_title">Permitir estrelas em segundo plano</string>
+  <string name="button_proxy_all">Todo o Proxy</string>
+  <string name="button_proxy_none">Nenhum Proxy</string>
+  <string name="button_invert_selection">Inverter Sele</string>
+  <string name="pref_proxy_title">Proxy de saída da rede (Opcional)</string>
+  <string name="pref_proxy_type_title">Tipo de Proxy</string>
+  <string name="pref_proxy_type_summary">Protocolo para usar no servidor proxy: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Insira o Tipo de Proxy</string>
+  <string name="pref_proxy_host_title">Proxy Host</string>
+  <string name="pref_proxy_host_summary">Endereço do servidor Proxy</string>
+  <string name="pref_proxy_host_dialog">Insira o Host do Proxy</string>
+  <string name="pref_proxy_port_title">Porta do Proxy</string>
+  <string name="pref_proxy_port_summary">Porta do servidor Proxy</string>
+  <string name="pref_proxy_port_dialog">Insira a porta do Proxy</string>
+  <string name="pref_proxy_username_title">Nome de usuário do Proxy de saída</string>
+  <string name="pref_proxy_username_summary">Nome de usuário do Proxy (Opcional)</string>
+  <string name="pref_proxy_username_dialog">Digite o nome de usuário do Proxy</string>
+  <string name="pref_proxy_password_title">Senha do Proxy de saída</string>
+  <string name="pref_proxy_password_summary">Senha do Proxy (Opcional)</string>
+  <string name="pref_proxy_password_dialog">Digite a senha do Proxy</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Configurando proxy com total transparência...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Configurando apps baseadas em transparência de proxy...</string>
+  <string name="transparent_proxying_enabled">Proxy Transparente HABILITADO</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy habilitado para Toque!</string>
+  <string name="warning_error_starting_transparent_proxying_">AVISO: erro ao iniciar o proxy transparente!</string>
+  <string name="transproxy_rules_cleared">Regras TransProxy limpas</string>
+  <string name="couldn_t_start_tor_process_">Não foi possível iniciar o processo Tor: </string>
+  <string name="privoxy_is_running_on_port_">Polipo está rodando na porta:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Configurando proxy transparente baseado em porta...</string>
+  <string name="bridge_error">Erro na Ponte</string>
+  <string name="bridge_requires_ip">Como condição para usar o recurso de ponte, você deve inserir pelo menos um endereço IP de ponte.</string>
+  <string name="send_email_for_bridges">Envie um email para bridges at torproject.org com a linha \"get bridges\" sozinha no corpo do e-mail, a partir de uma conta do gmail</string>
+  <string name="error">Erro</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Suas configurações de Endereços Acessíveis causou uma exceção!</string>
+  <string name="your_relay_settings_caused_an_exception_">Suas configurações de retransmissão causaram uma exceção!</string>
+  <string name="exit_nodes">Nós de Saída</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Impressões digitais, apelidos, países e endereços para a última etapa.</string>
+  <string name="enter_exit_nodes">Insira os Nós de Saída</string>
+  <string name="exclude_nodes">Nós Excluídos</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Impressões digitais, apelidos, países e endereços para excluir</string>
+  <string name="enter_exclude_nodes">Insira Nós Excluídos</string>
+  <string name="strict_nodes">Nós Estritos</string>
+  <string name="use_only_these_specified_nodes">Use *somente* estes nós específicos</string>
+  <string name="bridges">Pontes</string>
+  <string name="use_bridges">Usar pontes</string>
+  <string name="bridges_obfuscated">Pontes Ofuscadas</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilitar nós de entrada alternativos dentro da rede Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilitar se pontes configuradas forem pontes ofuscadas</string>
+  <string name="ip_address_and_port_of_bridges">Endereço IP e porta das pontes</string>
+  <string name="enter_bridge_addresses">Insira os Endereços das Pontes</string>
+  <string name="relays">Retransmissores</string>
+  <string name="relaying">Retransmitindo</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Habilitar seu dispositivo para não ser um retransmissor de saída</string>
+  <string name="relay_port">Porta Retransmissora</string>
+  <string name="listening_port_for_your_tor_relay">Ouvindo porta do seu retransmissor Tor</string>
+  <string name="enter_or_port">Insira porta OR</string>
+  <string name="relay_nickname">Apelido do Retransmissor</string>
+  <string name="the_nickname_for_your_tor_relay">O apelido para seu retransmissor Tor</string>
+  <string name="enter_a_custom_relay_nickname">Insira um apelido de retransmissor customizado</string>
+  <string name="reachable_addresses">Endereços Atingíveis</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Rodar como um cliente atrás de um firewall com políticas restritivas.</string>
+  <string name="reachable_ports">Portas Atingíveis</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Portas atingíveis atrás de um firewall restritivo</string>
+  <string name="enter_ports">Insira as portas</string>
+  <string name="enable_hidden_services">Habilitar Serviços Ocultos</string>
+  <string name="run_servers_accessible_via_the_tor_network">rodar servidores acessíveis via rede Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">insira as portas local para serviços ocultos</string>
+  <string name="hidden_service_ports">Portas de Serviço Oculto</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">o nome enderessável para seu serviço oculto (gerado automaticamente)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">habilitar debug log para saída (deve usar adb ou aLogCat para ver)</string>
+  <string name="project_home">Home(s) do Projeto: </string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">A Licença Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Software de Terceiros</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Uma app quer abrir a porta %S oculta do servidor para a rede Tor. Isto é seguro se você confia na app.</string>
+  <string name="found_existing_tor_process">procurando processos Tor existentes...</string>
+  <string name="something_bad_happened">Algo ruim aconteceu. Cheque o lo</string>
+  <string name="hidden_service_on">serviço oculto em:</string>
+  <string name="unable_to_read_hidden_service_name">habilitar ler o nome do serviço oculto</string>
+  <string name="unable_to_start_tor">Habilitar iniciar o Tor:</string>
+  <string name="unable_to_reset_tor">Reinicie seu dispositivo, incapaz de resetar Tor!</string>
+  <string name="pref_use_sys_iptables_title">Usar tabelas de IP padrão:</string>
+  <string name="pref_use_sys_iptables_summary">usar as tabelas ip binárias embutidas ao invés das tabelas do pacote Orbot</string>
+  <string name="error_installing_binares">Os binários Tor não estão disponíveis para serem instalados ou atualizados.</string>
+  <string name="pref_use_persistent_notifications">Sempre manter o ícone na barra de tarefas quando o Orbot está conectado</string>
+  <string name="pref_use_persistent_notifications_title">Notificações Sempre Ligadas</string>
+  <string name="pref_use_expanded_notifications">Mostrar notificação expandida com Tor país de saída e IP</string>
+  <string name="pref_use_expanded_notifications_title">Notificações Expandidas</string>
+  <string name="notification_using_bridges">Pontes habilitadas!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Idioma</string>
+  <string name="set_locale_summary">Escolha o local e idioma para o Orbot</string>
+  <string name="wizard_locale_title">Escolha o Idioma</string>
+  <string name="wizard_locale_msg">Deixe o padrão ou troque o idioma atual</string>
+  <string name="powered_by">distribuído por Tor</string>
+  <string name="btn_save_settings">Salvar Configurações</string>
+  <string name="no_internet_connection_tor">Sem conexão na internet; Tor está na espera...</string>
+  <string name="bandwidth_">Largura de banda:</string>
+  <string name="down">down</string>
+  <string name="up">up</string>
+  <string name="pref_disable_network_title">Modo de espera automático</string>
+  <string name="pref_disable_network_summary">Colocar o Tor em modo de espera quando não houver acesso Internet disponível</string>
+  <string name="newnym">Você trocou para uma nova identidade Tor!</string>
+  <string name="menu_verify_browser">Navegador</string>
+  <string name="menu_use_chatsecure">Usar ChatSecure</string>
+  <string name="permission_manage_tor_label">Gerenciar Tor</string>
+  <string name="permission_manage_tor_description">Habilitar este app a controlar o serviço Tor</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Parece que você não tem o Orweb instalado. Quer ajuda com isso ou devemos apenas abrir o navegador?</string>
+  <string name="install_apps_">Instalar apps?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Sem conectividade na rede. Colocando o Tor para dormir...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Conectividade da rede está boa. Acordando Tor</string>
+  <string name="updating_settings_in_tor_service">atualizando configurações no serviço Tor</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Porta que Tor oferece seu proxy SOCKS (padrão: 9050 ou 0 para desativar)</string>
+  <string name="pref_socks_dialog">Config da Porta SOCKS</string>
+  <string name="pref_transport_title">Porta TransProxy Tor</string>
+  <string name="pref_transport_summary">Porta que Tor oferece seu Proxy Transparente no (padrão: 9040 ou 0 para desativar)</string>
+  <string name="pref_transport_dialog">Config da Porta TransProxy</string>
+  <string name="pref_dnsport_title">Porta DNS Tor</string>
+  <string name="pref_dnsport_summary">Porta que Tor oferece seu DNS no (padrão: 5400 ou 0 para desativar)</string>
+  <string name="pref_dnsport_dialog">Config da Porta DNS</string>
+  <string name="pref_torrc_title">Config Personalizada do Torrc</string>
+  <string name="pref_torrc_dialog">Torrc Personalizado</string>
+  <string name="your_tor_public_ips_">Seus IPs Públicos do Tor:</string>
+  <string name="app_conflict">Conflito de aplicattivo</string>
+  <string name="pref_transproxy_flush_title">Transproxy FORÇAR REMOÇÃO</string>
+  <string name="you_do_not_have_root_access_enabled">Você não tem acesso root ativado</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Você pode precisar parar e iniciar Orbot para as configurações de mudar para ser ativado.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Pontes Atualizadas</string>
+  <string name="restart_orbot_to_use_this_bridge_">Por favor reinicie Orbot para habilitar as mundanças</string>
+  <string name="menu_qr">QR Codes</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Se a sua rede móvel ativamente blocos Tor, você pode usar uma ponte para acessar a rede. Selecione um dos tipos de pontes acima, para permitir pontes.</string>
+  <string name="bridge_mode">Modo Ponte</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Atvar</string>
+  <string name="apps_mode">Modo Apps VPN</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Você pode permitir que todos os aplicativos em seu dispositivo para executar através da rede Tor usando o recurso VPN do Android.\n\n*AVISO* Esta é uma característica nova, experimental e em alguns casos pode não começar automaticamente, ou pode parar.   Não deve ser usado para manter o anonimato, e serão utilizadas apenas para obter através de firewalls e filtros.</string>
+  <string name="send_email">Enviar Email</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Você pode obter um endereço de ponte através de e-mail, web ou lendo um código QR ponte. Selecione \'E-mail\' ou \'Web\' abaixo para solicitar uma ponte endereço. \n\nUma vez que você tem um endereço, copie & colá-lo na "Bridges" preferência na configuração e reiniciar do Orbot.</string>
+  <string name="install_orweb">Instalar Orfox</string>
+  <string name="standard_browser">Navegador Padrão</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTA: Apenas pontes Tor padrão funcionam em dispositivos Atom/Intel X86</string>
+  <string name="vpn_default_world">Mundo</string>
+</resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..20ba24b
--- /dev/null
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="wizard_title">Orbot</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
new file mode 100644
index 0000000..69f7a77
--- /dev/null
+++ b/app/src/main/res/values-pt/strings.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">iniciar e parar Tor</string>
+  <string name="tor_proxy_service_process">serviço proxy Tor</string>
+  <string name="status_starting_up">O Orbot está a iniciar...</string>
+  <string name="status_activated">Conetado à rede Tor</string>
+  <string name="status_disabled">O Orbot está desativado</string>
+  <string name="tor_process_starting">A iniciar o cliente Tor...</string>
+  <string name="tor_process_complete">completo.</string>
+  <string name="tor_process_waiting">a aguardar.</string>
+  <string name="not_anonymous_yet">AVISO: O seu tráfego não está anónimo! Por favor, configure as suas aplicações para utilizarem o proxy HTTP 127.0.0.1:8118 ou o proxy SOCKS4A ou SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Início</string>
+  <string name="menu_browse">Explorar</string>
+  <string name="menu_settings">Configurações</string>
+  <string name="menu_log">Registo</string>
+  <string name="menu_info">Ajuda</string>
+  <string name="menu_start">Iniciar</string>
+  <string name="menu_stop">Parar</string>
+  <string name="menu_about">Sobre</string>
+  <string name="main_layout_download">Transferir</string>
+  <string name="main_layout_upload">Enviar</string>
+  <string name="button_help">Ajuda</string>
+  <string name="button_close">Fechar</string>
+  <string name="button_about">Sobre</string>
+  <string name="button_clear_log">Limpar Registo</string>
+  <string name="menu_verify">Verificar</string>
+  <string name="menu_exit">Sair</string>
+  <string name="menu_scan">Digitalizar BridgeQR</string>
+  <string name="menu_share_bridge">Compartilhar BridgeQR</string>
+  <string name="press_to_start">- pressionar longo para iniciar - </string>
+  <string name="pref_trans_proxy_group">Proxy Transparente (requer \'Root\')</string>
+  <string name="pref_trans_proxy_title">Proxy Transparente</string>
+  <string name="pref_transparent_all_title">Tor em Tudo</string>
+  <string name="pref_transparent_all_summary">Passar todo o tráfego das apps via Tor</string>
+  <string name="pref_transparent_port_fallback_summary">AVISO: Rodear as portas comuns (80, 443, etc...). *USAR APENAS* se o modo  \'Todas\' ou \'App\' não funcionar.</string>
+  <string name="pref_transparent_port_title">Lista de Portas</string>
+  <string name="pref_transparent_port_summary">Lista de portas para o proxy. *USAR APENAS* se o modo \'Todas\' ou \'App\' não funcionar.</string>
+  <string name="pref_transparent_port_dialog">Insira as portas para o proxy</string>
+  <string name="pref_has_root">Solicitar Acesso \'Root\'</string>
+  <string name="pref_has_root_summary">Solicitar acesso \'root\' para o proxy transparente</string>
+  <string name="status_install_success">Binários do Tor instalados com sucesso!</string>
+  <string name="status_install_fail">Não foi possível instalar os ficheiros binário do Tor. Por favor, verifique o registo de eventos e notifique tor-assistants at torproject.org</string>
+  <string name="title_error">Erro de Aplicação</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Sobre o Orbot</string>
+  <string name="btn_next">Seguinte</string>
+  <string name="btn_back">Voltar</string>
+  <string name="btn_finish">Terminar</string>
+  <string name="btn_okay">OK</string>
+  <string name="btn_cancel">Cancelar</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Alguns Detalhes do Orbot</string>
+  <string name="wizard_permissions_root">Autorização Concedida</string>
+  <string name="wizard_permissions_stock">Autorizações do Orbot</string>
+  <string name="wizard_permissions_consent">Eu compreendo e gostaria de continuar sem a Superuser</string>
+  <string name="wizard_permission_enable_root">Conceder \'Root\' para o Orbot</string>
+  <string name="wizard_configure">Configurar Acesso do Tor</string>
+  <string name="wizard_configure_all">Passar Todas as Aplicações Via Tor</string>
+  <string name="wizard_configure_select_apps">Selecione Individualmente as Apps para o Tor</string>
+  <string name="wizard_tips_tricks">Orbot - Apps ativadas</string>
+  <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="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>
+  <string name="wizard_final">O Orbot está pronto!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_hs_group">Serviço de Hospedagem Ocultado</string>
+  <string name="pref_general_group">Geral</string>
+  <string name="pref_start_boot_title">Iniciar o Orbot no Arranque</string>
+  <string name="pref_start_boot_summary">Iniciar automaticamente o Orbot e conetar o Tor quando o seu dispositivo Android inicia</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Aviso</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Autorizações</string>
+  <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_permissions_root_msg2">Se não quer isto, por favor, certifique-se que usa as apps criadas para funcionarem com a Orbot</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot - Apps Ativadas</string>
+  <string name="wizard_tips_play">Encontre todas as apps do Projeto Guardian na Play Store da Google</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxy Transparente</string>
+  <string name="wizard_transproxy_hint">(Selecione esta caixa se não souber do que estamos a falar)</string>
+  <string name="wizard_transproxy_none">Nenhum</string>
+  <string name="pref_transparent_tethering_title">\"Tethering\" Tor</string>
+  <string name="pref_transparent_tethering_summary">Ativar o Proxy Transparente Tor para a rede Sem Fios e Dispositivos USB \"Tethered\" (necessário reiniciar)</string>
+  <string name="button_grant_superuser">Solicitar Acesso de Administrador</string>
+  <string name="pref_select_apps">Selecionar Apps</string>
+  <string name="pref_select_apps_summary">Escolher Apps para Encaminhar Via Tor</string>
+  <string name="button_proxy_all">Tudo com o Proxy</string>
+  <string name="button_proxy_none">Nenhum Proxy</string>
+  <string name="button_invert_selection">Inverter Seleção</string>
+  <string name="pref_proxy_title">Proxy de Rede de Saída (Opcional)</string>
+  <string name="pref_proxy_type_title">Tipo de Proxy de Saída</string>
+  <string name="pref_proxy_type_summary">Protocolo para usar para o servidor proxy: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Inserir Tipo de Proxy</string>
+  <string name="pref_proxy_host_title">Anfitrião Proxy de Saída</string>
+  <string name="pref_proxy_host_summary">Nome do Hospedeiro do Servidor Proxy</string>
+  <string name="pref_proxy_host_dialog">Inserir Hospedeiro Proxy</string>
+  <string name="pref_proxy_port_title">Porta Proxy de Saída</string>
+  <string name="pref_proxy_port_summary">Porta do Servidor Proxy</string>
+  <string name="pref_proxy_port_dialog">Inserir Porta do Proxy</string>
+  <string name="pref_proxy_username_title">Nome do Utilizador do Proxy de Saída</string>
+  <string name="pref_proxy_username_summary">Nome do Utilizador do Proxy (Opcional)</string>
+  <string name="pref_proxy_username_dialog">Inserir Nome de Utilizador do Proxy</string>
+  <string name="pref_proxy_password_title">Senha do Proxy de Saída</string>
+  <string name="pref_proxy_password_summary">Senha do Proxy (Opcional)</string>
+  <string name="pref_proxy_password_dialog">Inserir Senha do Proxy</string>
+  <string name="status">Estado</string>
+  <string name="couldn_t_start_tor_process_">Não foi possível iniciar o processo Tor: </string>
+  <string name="error">Erro</string>
+  <string name="bridges">Pontes</string>
+  <string name="use_bridges">Usar Pontes</string>
+  <string name="ip_address_and_port_of_bridges">Endereço de IP e porta das pontes</string>
+  <string name="enter_or_port">Inserir OU porta</string>
+  <string name="reachable_ports">Portas alcançáveis</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Portas alcançáveis por detrás de uma Firewal restritiva</string>
+  <string name="enter_ports">Insira as portas</string>
+  <string name="enable_hidden_services">Hospedeiro de Serviço Ocultado</string>
+  <string name="hidden_service_ports">Portas de Serviço Ocultadas</string>
+  <string name="project_home">Projeto Home(s): </string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">A Licença do Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Programas de Terceiros: </string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Uma app pretende abrir a porta %S do servidor ocultado para a rede Tor. Isto é seguro, se confiar na app.</string>
+  <string name="found_existing_tor_process">encontrado o processo Tor existente...</string>
+  <string name="something_bad_happened">Aconteceu algo de mau. Verifique o registo de eventos.</string>
+  <string name="hidden_service_on">serviço ocultado em:</string>
+  <string name="unable_to_read_hidden_service_name">não é possível ler o nome do serviço ocultado</string>
+  <string name="unable_to_start_tor">Não é possível iniciar o Tor:</string>
+  <string name="unable_to_reset_tor">Reinicie o seu dispositivo, não é possível reiniciar Tor!</string>
+  <string name="pref_use_sys_iptables_title">Usar Tabelas de IP Predefinidas</string>
+  <string name="pref_use_persistent_notifications_title">Notificações Sempre Ativadas</string>
+  <string name="pref_use_expanded_notifications_title">Notificações Estendidas</string>
+  <string name="notification_using_bridges">Pontes ativadas!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Idioma</string>
+  <string name="set_locale_summary">Escolha o local e o idioma para o Orbot</string>
+  <string name="wizard_locale_title">Escolher Idioma</string>
+  <string name="wizard_locale_msg">Deixe a predefinição ou mude o idioma atual</string>
+  <string name="btn_save_settings">Guardar Definições</string>
+  <string name="bandwidth_">Largura de banda:</string>
+  <string name="down">para baixo</string>
+  <string name="up">para cima</string>
+  <string name="newnym">Mudou para uma nova identidade do Tor!</string>
+  <string name="menu_use_chatsecure">Usar ChatSecure</string>
+  <string name="permission_manage_tor_label">Gerir Tor</string>
+  <string name="permission_manage_tor_description">Ative esta app para controlar o serviço Tor</string>
+  <string name="install_apps_">Instalar apps?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Nenhuma conetividade de rede. A hibernar Tor…</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">A conetividade de rede é boa. A iniciar Tor…</string>
+  <string name="updating_settings_in_tor_service">a atualizar as definições no serviço Tor</string>
+  <string name="pref_socks_title">SOCKS Tor</string>
+  <string name="pref_dnsport_title">Porta DNS Tor</string>
+  <string name="your_tor_public_ips_">Os seus IPs Públicos Tor:</string>
+  <string name="app_conflict">Conflito de App</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Pontes Atualizadas</string>
+  <string name="menu_qr">Códigos QR</string>
+  <string name="get_bridges_email">Correio Eletrónico</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Ativar</string>
+  <string name="send_email">Enviar Mensagem</string>
+  <string name="standard_browser">Navegador Padrão</string>
+</resources>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
new file mode 100644
index 0000000..f0ae485
--- /dev/null
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_home">Pagina de start</string>
+  <string name="menu_browse">Răsfoieşte</string>
+  <string name="menu_settings">Setări</string>
+  <string name="menu_info">Asistenţă</string>
+  <string name="menu_about">Despre</string>
+  <string name="button_help">Asistenţă</string>
+  <string name="button_close">Închide</string>
+  <string name="button_about">Despre</string>
+  <string name="menu_exit">Ieşire</string>
+  <string name="btn_back">Înapoi</string>
+  <string name="btn_cancel">Revocare</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Setări proxy</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">General</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Avertizare</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">Nimic</string>
+  <string name="status">Stare</string>
+  <string name="error">Eroare</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Salvează setările</string>
+</resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
new file mode 100644
index 0000000..01166b4
--- /dev/null
+++ b/app/src/main/res/values-ro/strings.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">pornește și oprește Tor</string>
+  <string name="tor_proxy_service_process">serviciu proxy tor</string>
+  <string name="status_starting_up">Orbot porneste...</string>
+  <string name="status_activated">Conectat la reteaua Tor</string>
+  <string name="status_disabled">Orbot este dezactivat</string>
+  <string name="tor_process_starting">Porneste clientul Tor...</string>
+  <string name="tor_process_complete">terminat.</string>
+  <string name="tor_process_waiting">asteptare.</string>
+  <string name="not_anonymous_yet">ATENTIE: Traficul inca nu este anonim! Configureaza aplicatile sa foloseasca proxy-ul HTTP 127.0.0.1:8118 sau SOCKS4A sau proxy-ul SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Pagina de start</string>
+  <string name="menu_browse">Răsfoieşte</string>
+  <string name="menu_settings">Setări</string>
+  <string name="menu_log">log</string>
+  <string name="menu_info">Asistenţă</string>
+  <string name="menu_start">Start</string>
+  <string name="menu_stop">Stop</string>
+  <string name="menu_about">Despre</string>
+  <string name="main_layout_download">Descarca</string>
+  <string name="main_layout_upload">Incarca</string>
+  <string name="button_help">Asistenţă</string>
+  <string name="button_close">Închide</string>
+  <string name="button_about">Despre</string>
+  <string name="button_clear_log">Goleste log-ul</string>
+  <string name="menu_verify">Verifica</string>
+  <string name="menu_exit">Ieşire</string>
+  <string name="press_to_start">- apasa lung pentru pornire -</string>
+  <string name="pref_trans_proxy_group">Proxy transparent (necesita root)</string>
+  <string name="pref_trans_proxy_title">Proxy transparent</string>
+  <string name="pref_trans_proxy_summary">Aplicare automata a Tor la aplicatii</string>
+  <string name="pref_transparent_all_title">Tor tot</string>
+  <string name="pref_transparent_all_summary">Toate aplicatile folosesc Tor pentru trafic</string>
+  <string name="pref_transparent_port_fallback_title">Port proxy de rezerva</string>
+  <string name="pref_transparent_port_fallback_summary">ATENTIE: Ocoleste porturile comune (80, 443, etc.). *FOLOSESTE DOAR* daca modurile \"Toate\" sau \"Aplicatii\" nu functioneaza</string>
+  <string name="pref_transparent_port_title">Lista porturi</string>
+  <string name="pref_transparent_port_summary">Lista porturi pentru proxy. *FOLOSESTE DOAR* daca modurile \"Toate\" sau \"Aplicatii\" nu functioneaza</string>
+  <string name="pref_transparent_port_dialog">Introdu porturile pentru proxy</string>
+  <string name="pref_has_root">Necesita acces root</string>
+  <string name="pref_has_root_summary">Necesita acces root pentru proxy transparent</string>
+  <string name="status_install_success">Fisierele binare Tor instalate cu succes!</string>
+  <string name="status_install_fail">Fisierele binare Tor nu au putut fi instalate. Verificati log-ul si raportati bug-ul la tor-assistants at torproject.org</string>
+  <string name="title_error">Eroare de aplicatie</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Despre Orbot</string>
+  <string name="btn_next">Urmatorul</string>
+  <string name="btn_back">Înapoi</string>
+  <string name="btn_finish">Termina</string>
+  <string name="btn_okay">Ok</string>
+  <string name="btn_cancel">Revocare</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Detalii Orbot</string>
+  <string name="wizard_permissions_root">Permisiune acordata</string>
+  <string name="wizard_permissions_stock">Permisiuni Orbot</string>
+  <string name="wizard_premissions_msg_root">Excelent! Am detectat ca ai permis acces root pentru Orbot. Vom folosi aceasta putere cu raspundere.</string>
+  <string name="wizard_permissions_msg_stock">Desi nu este necesar, Orbot poate fi mai puternic daca dispozitivul dumneavoastra are acces root. Foloseste butonul de mai jos pentru ai oferi superputeri lui Orbot!</string>
+  <string name="wizard_permissions_no_root">Daca nu ai acces root, sau nu ai habar despre ce vorbim, asigura-te ca folosesti aplicatii facute sa functioneze cu Orbot.</string>
+  <string name="wizard_permissions_consent">Inteleg si as vrea sa continui fara Superuser</string>
+  <string name="wizard_permission_enable_root">Aproba root pentru Orbot</string>
+  <string name="wizard_configure">Configureaza Tor</string>
+  <string name="wizard_configure_msg">Orbot ofera posibilitatea sa trimita tot traficul prin Tor SAU sa alegi aplicatii individuale.</string>
+  <string name="wizard_configure_all">Toate aplicatiile folosesc Tor</string>
+  <string name="wizard_configure_select_apps">Alege aplicatii individuale pentru Tor</string>
+  <string name="wizard_tips_tricks">Aplicatii compatibile Orbot</string>
+  <string name="wizard_tips_msg">Aplicatiile de mai jos au fost create sa fie compatibile cu Orbot. Apasa pe fiecare buton pentru a instala acum, sau le poti gasi mai tarziu pe Google Play, pe site-ul GuardianProject.info sau pe F-Droid.org.</string>
+  <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="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>
+  <string name="wizard_final">Orbot este pregatit!</string>
+  <string name="wizard_exit_at_first_screen_toast">Configurați Orbot înainte de a începe să-l utilizați!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Vom deschide pagina https://check.torproject.org pentru a verifica daca Orbot este configurat corespunzator si daca este conectat la Tor.</string>
+  <string name="pref_hs_group">Serviciu de gazduire ascuns</string>
+  <string name="pref_general_group">General</string>
+  <string name="pref_start_boot_title">Porneste Orbot la boot-are</string>
+  <string name="pref_start_boot_summary">Porneste Orbot automat si conecteaza-te la Tor cand porneste dispozitivul</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Atentie</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permisiuni</string>
+  <string name="wizard_permissions_root_msg1">Optional, ii poti oferi lui Orbot acces \"Superuser\" pentru a activa optiuni avansate, cum ar fi proxy transparent.</string>
+  <string name="wizard_permissions_root_msg2">Daca nu vrei sa faci asta, asigura-te ca folosesti aplicatii compatibile cu Orbot.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Gaseste toate aplicatile Guardian Project pe Google Play</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxy transparent</string>
+  <string name="wizard_transproxy_msg">Asta va permite aplicatilor tale sa foloseasca Tor automat fara nici o configurare.</string>
+  <string name="wizard_transproxy_hint">(Bifeaza asta daca nu ai idee despre ce vorbim)</string>
+  <string name="wizard_transproxy_none">Nimic</string>
+  <string name="pref_transparent_tethering_title">Partajarea conexiunii Tor</string>
+  <string name="pref_transparent_tethering_summary">Activeaza proxy transparent pentru conexiuni partajate prin WiFi si USB (necesita restart)</string>
+  <string name="button_grant_superuser">Cere acces Superuser</string>
+  <string name="pref_select_apps">Selecteaza aplicatii</string>
+  <string name="pref_select_apps_summary">Alege aplicatii care sa foloseasca Tor</string>
+  <string name="pref_node_configuration">Configurare nod</string>
+  <string name="pref_node_configuration_summary">Setari avansate care ar putea sa iti reduca anonimitatea</string>
+  <string name="pref_entrance_node">Noduri de intrare</string>
+  <string name="pref_entrance_node_summary">Amprente, nick name-uri si adrese pentru primul hop</string>
+  <string name="pref_entrance_node_dialog">Introdu noduri de intrare</string>
+  <string name="pref_proxy_title">Proxy de retea pentru iesire (optional)</string>
+  <string name="pref_proxy_type_title">Tipul proxy-ului de iesire</string>
+  <string name="pref_proxy_type_summary">Tipul protocolului pentru proxy: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Introdu tipul proxy-ului</string>
+  <string name="pref_proxy_host_title">Host-ul proxy-ului de iesire</string>
+  <string name="pref_proxy_host_summary">Hostname-ul server-ului proxy</string>
+  <string name="pref_proxy_host_dialog">Introdu host-ul proxy-ului</string>
+  <string name="pref_proxy_port_title">Port-ul proxy-ului de iesire</string>
+  <string name="pref_proxy_port_summary">Port-ul serverului proxy</string>
+  <string name="pref_proxy_port_dialog">Introdu port-ul proxy</string>
+  <string name="pref_proxy_username_title">Username-ul proxy-ului de iesire</string>
+  <string name="pref_proxy_username_summary">Username-ul proxy-ului (optional)</string>
+  <string name="pref_proxy_username_dialog">Introdu username-ul proxy-ului</string>
+  <string name="pref_proxy_password_title">Parola pentru proxy-ul de iesire</string>
+  <string name="pref_proxy_password_summary">Parola pentru proxy (optional)</string>
+  <string name="pref_proxy_password_dialog">Introdu parola pentru proxy</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Configurez proxy transparent complet...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Configurez un proxy transparent bazat pe aplicatie...</string>
+  <string name="transparent_proxying_enabled">Proxy transparent ACTIVAT</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy activat pentru partajare!</string>
+  <string name="warning_error_starting_transparent_proxying_">ATENTIE: eroare la pornirea proxy-ului transparent!</string>
+  <string name="transproxy_rules_cleared">Reguli TransProxy golite</string>
+  <string name="couldn_t_start_tor_process_">Nu am putut porni procesul Tor:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Configurez proxy transparent bazat pe port...</string>
+  <string name="bridge_error">Eroare de punte</string>
+  <string name="bridge_requires_ip">Pentru a putea folosi optiunea de punte, trebuie introdusa cel putin o adresa IP pentru punte.</string>
+  <string name="send_email_for_bridges">Trimite un e-mail la bridges at torproject.org cu linia \"get bridges\" in continutul mail-ului de pe un cont de GMail.</string>
+  <string name="error">Eroare</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Setarile tale pentru adrese accesibile au cauzat o exceptie!</string>
+  <string name="your_relay_settings_caused_an_exception_">Setarile tale de relay au cauzat o exceptie!</string>
+  <string name="exit_nodes">Noduri de iesire</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Amprente, nick name-uri, tari si adrese pentru ultimul hop</string>
+  <string name="enter_exit_nodes">Introdu noduri de iesire</string>
+  <string name="exclude_nodes">Noduri de exclus</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Amprente, nick name-uri, tari si adrese de exclus</string>
+  <string name="enter_exclude_nodes">Introdu noduri de exclus</string>
+  <string name="strict_nodes">Noduri stricte</string>
+  <string name="use_only_these_specified_nodes">Foloseste *doar* nodurile specificate</string>
+  <string name="bridges">Punti</string>
+  <string name="use_bridges">Foloseste punti</string>
+  <string name="bridges_obfuscated">Punti mascate</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Activeaza noduri de intrare alternative in reteaua Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Activeaza daca puntile configurate sunt punti mascate</string>
+  <string name="ip_address_and_port_of_bridges">Adresa IP si port pentru punti</string>
+  <string name="enter_bridge_addresses">Introdu adresa pentru punte</string>
+  <string name="relays">Comutatoare</string>
+  <string name="relaying">Comutare</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Activeaza dispozitivul sa fie un comutator fara iesire</string>
+  <string name="relay_port">Port de retransmitere</string>
+  <string name="listening_port_for_your_tor_relay">Port pentru comutatorul tau Tor</string>
+  <string name="enter_or_port">Introdu portul OR</string>
+  <string name="relay_nickname">Nick name-ul comutatorului</string>
+  <string name="the_nickname_for_your_tor_relay">Nick name-ul pentru comutatorul tau Tor</string>
+  <string name="enter_a_custom_relay_nickname">Introdu un nick name pentru comutator</string>
+  <string name="reachable_addresses">Adresa accesibila</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Ruleaza ca si client in spatele firewall-ului cu politici restrictive</string>
+  <string name="reachable_ports">Porturi accesibile</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Porturi accesibile in spatele unui firewall restrictiv</string>
+  <string name="enter_ports">Introdu porturi</string>
+  <string name="enable_hidden_services">Serviciu de gazduire ascuns</string>
+  <string name="run_servers_accessible_via_the_tor_network">permite serverului de pe dispozitiv sa fie accesibil in reteaua Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">introdu porturile localhost-ului pentru servicile ascunse</string>
+  <string name="hidden_service_ports">Porturi de serviciu ascunse</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">numele serviciului tau ascuns (generat automat)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">activeaza exportul log-ului (trebuie folosit adb sau LogCat pentru vizualizare)</string>
+  <string name="project_home">Casa(le) proiectului:</string>
+  <string name="the_tor_license">Licenta Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Aplicatii tertiare:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">O aplicatie vrea sa deschida portul ascuns %S spre reteaua Tor. Este sigur daca ai incredere in aplicatie.</string>
+  <string name="found_existing_tor_process">gasit proces Tor existent...</string>
+  <string name="something_bad_happened">Ceva rau s-a intamplat. Verifica log-ul</string>
+  <string name="hidden_service_on">serviciu ascuns pe:</string>
+  <string name="unable_to_read_hidden_service_name">nu am putut citi numele serviciului ascuns</string>
+  <string name="unable_to_start_tor">Nu am reusit sa pornesc Tor:</string>
+  <string name="pref_use_sys_iptables_title">Foloseste Iptables implicite</string>
+  <string name="pref_use_sys_iptables_summary">foloseste fisierele binare iptables incorporate in locul celor din Orbot</string>
+  <string name="error_installing_binares">Fisierele binare Tor nu au putut fi instalate sau actualizate.</string>
+  <string name="pref_use_persistent_notifications">Arata tot timpul icoana in bara cand Orbot este conectat</string>
+  <string name="pref_use_persistent_notifications_title">Notificari active tot timpul</string>
+  <string name="notification_using_bridges">Punti activate!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Limbă</string>
+  <string name="set_locale_summary">Alege localele si limba pentru Orbot</string>
+  <string name="wizard_locale_title">Alege limba</string>
+  <string name="wizard_locale_msg">Lasa implicit sau schimba limba curenta</string>
+  <string name="btn_save_settings">Salvează setarile</string>
+  <string name="no_internet_connection_tor">Nu este conexiune la internet; Tor este în așteptare...</string>
+  <string name="bandwidth_">Lățime de bandă:</string>
+  <string name="down">jos</string>
+  <string name="up">sus</string>
+  <string name="pref_disable_network_title">Fără adormirea automată a rețelei</string>
+  <string name="pref_disable_network_summary">Pune Tor să doarmă dacă nu este internet disponibil</string>
+  <string name="newnym">Ați comutat la o nouă identitate Tor!</string>
+  <string name="menu_use_chatsecure">Utilizați ChatSecure</string>
+  <string name="permission_manage_tor_label">Administrare Tor</string>
+  <string name="permission_manage_tor_description">Activați această aplicație pentru a controla serviciile Tor</string>
+  <string name="install_apps_">Se instalează aplicația?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Nu este conexiune la rețea. Se pune Tor în adormire...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Conexiunea la rețea este bună. Se trezește Tor...</string>
+  <string name="updating_settings_in_tor_service">se actualizează configurările în serviciul Tor</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="you_do_not_have_root_access_enabled">Nu aveți activat accesul ca ROOT</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KiO</string>
+  <string name="mb">MiO</string>
+  <string name="menu_qr">Coduri QR</string>
+  <string name="bridge_mode">Mod punte</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Activează</string>
+  <string name="send_email">Trimite email</string>
+  <string name="standard_browser">Navigator standard</string>
+</resources>
diff --git a/app/src/main/res/values-rs-rAR/strings.xml b/app/src/main/res/values-rs-rAR/strings.xml
new file mode 100644
index 0000000..132b67e
--- /dev/null
+++ b/app/src/main/res/values-rs-rAR/strings.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">reiniciar Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot está iniciándose…</string>
+  <string name="status_activated">Conectado a la red Tor</string>
+  <string name="status_disabled">\"Orbot está Desactivado</string>
+  <string name="status_shutting_down">Orbot se está apagando</string>
+  <string name="tor_process_complete">Completar</string>
+  <string name="not_anonymous_yet">CIUDADO: Tu tráfico no es anónimo aún! Por favor configura tus aplicaciones para que usen el HTTP proxy 127.0.0.1:8118 o SOCKS4A o el proxy SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Inicio</string>
+  <string name="menu_browse">Navegar</string>
+  <string name="menu_settings">Configuración</string>
+  <string name="menu_log">Registro</string>
+  <string name="menu_info">Ayuda</string>
+  <string name="menu_apps">Apps</string>
+  <string name="menu_start">Iniciar</string>
+  <string name="menu_stop">Detener</string>
+  <string name="menu_about">Acerca de</string>
+  <string name="menu_wizard">Asistente</string>
+  <string name="button_help">Ayuda</string>
+  <string name="button_close">Cerrar</string>
+  <string name="button_about">Acerca de</string>
+  <string name="button_clear_log">Borrar Registros</string>
+  <string name="menu_verify">Chequear</string>
+  <string name="menu_exit">Salir</string>
+  <string name="pref_trans_proxy_group">Proxying Transparente (Requiere Root)</string>
+  <string name="pref_trans_proxy_title">Proxying Transparente</string>
+  <string name="pref_trans_proxy_summary">Torificación Automática de Aplicaciones</string>
+  <string name="pref_transparent_all_title">Torear Todo</string>
+  <string name="btn_next">Siguiente</string>
+  <string name="btn_back">Atrás</string>
+  <string name="btn_finish">Finalizar</string>
+  <string name="btn_cancel">Cancelar</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_final">Orbot está listo!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">General</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+
+
+
+
+  <!--Transparent Proxy screen-->
+  <!--<string name="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="default_bridges"/>
+  <string name="powered_by">potenciado por The Tor Project</string>
+</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
new file mode 100644
index 0000000..94029fb
--- /dev/null
+++ b/app/src/main/res/values-ru/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot - это свободная программа для прокси-соединений, она позволяет другим приложениям более безопасно использовать интернет-соединение. Orbot использует Tor для шифрования интернет-трафика, который затем скрывается в ходе пересылки через несколько компьютеров в разных частях планеты. Tor является свободным программным приложением, а также открытой сетью, помогающей защититься от слежки в сетях, угрожающей личной свободе и частной жизни, конфиденциальным бизнес-деятельности и контактам, а также государственной программе бÐ
 µÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚и, известной как анализ трафика.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">Запуск и остановка Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Запуск Orbot...</string>
+  <string name="status_activated">Подключён к сети Tor</string>
+  <string name="status_disabled">Orbot отключён</string>
+  <string name="status_shutting_down">Служба Tor выключается</string>
+  <string name="tor_process_starting">Запускается клиент Tor...</string>
+  <string name="tor_process_complete">завершено.</string>
+  <string name="tor_process_waiting">ожидание.</string>
+  <string name="not_anonymous_yet">ПРЕДУПРЕЖДЕНИЕ: ваш трафик ещё не анонимен! Пожалуйста, настройте свои приложения на использование HTTP-прокси 127.0.0.1:8118 или же SOCKS4A или SOCKS5-прокси 127.0.0.1:9050</string>
+  <string name="menu_home">Домашняя страница</string>
+  <string name="menu_browse">Просмотр</string>
+  <string name="menu_settings">Настройки</string>
+  <string name="menu_log">Журнал</string>
+  <string name="menu_info">Справка</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Запустить</string>
+  <string name="menu_stop">Остановить</string>
+  <string name="menu_about">О программе</string>
+  <string name="menu_promo_apps">Получить приложения...</string>
+  <string name="main_layout_download">Загрузка</string>
+  <string name="main_layout_upload">Отправка</string>
+  <string name="button_help">Справка</string>
+  <string name="button_close">Закрыть</string>
+  <string name="button_about">О программе</string>
+  <string name="button_clear_log">Очистить журнал</string>
+  <string name="menu_verify">Проверка</string>
+  <string name="menu_exit">Выход</string>
+  <string name="menu_scan">Сканировать QR-код моста</string>
+  <string name="menu_share_bridge">Опубликовать QR-код моста</string>
+  <string name="press_to_start">- долгое нажатие для запуска -</string>
+  <string name="pref_trans_proxy_group">Прозрачный прокси (требуется root-доступ)</string>
+  <string name="pref_trans_proxy_title">Прозрачный прокси</string>
+  <string name="pref_trans_proxy_summary">Автоматическая Tor-ификация приложений</string>
+  <string name="pref_transparent_all_title">Направлять всё через Tor</string>
+  <string name="pref_transparent_all_summary">Направлять трафик всех приложений через Tor</string>
+  <string name="pref_transparent_port_fallback_title">Резервный порт прокси</string>
+  <string name="pref_transparent_port_fallback_summary">ПРЕДУПРЕЖДЕНИЕ: обходит общие порты (80, 443, и т.д.). *ИСПОЛЬЗОВАТЬ ТОЛЬКО* если режимы \'Всё\' или \'Приложение\' не работают.</string>
+  <string name="pref_transparent_port_title">Список портов</string>
+  <string name="pref_transparent_port_summary">Список портов для проксификации. *ИСПОЛЬЗОВАТЬ ТОЛЬКО* если режимы \'Всё\' или \'Приложение\' не работают.</string>
+  <string name="pref_transparent_port_dialog">Введите порты для проксификации</string>
+  <string name="pref_has_root">Запросить root-доступ</string>
+  <string name="pref_has_root_summary">Запросить root-доступ для прозрачной проксификации</string>
+  <string name="status_install_success">Программа Tor успешно установлена!</string>
+  <string name="status_install_fail">Не удалось установить программу Tor. Пожалуйста, проверьте системный журнал и сообщите нам: tor-assistants at torproject.org</string>
+  <string name="title_error">Ошибка приложения</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Об Orbot</string>
+  <string name="btn_next">Вперёд</string>
+  <string name="btn_back">Назад</string>
+  <string name="btn_finish">Завершить</string>
+  <string name="btn_okay">OK</string>
+  <string name="btn_cancel">Отмена</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Некоторые сведения о программе Orbot</string>
+  <string name="wizard_details_msg">Orbot — это приложение с открытым исходным кодом, которое содержит Tor, LibEvent и Privoxy. Оно предоставляет локальный HTTP-прокси (8118) и SOCKS-прокси (9050) в сеть Tor. Orbot также позволяет на устройствах с правами root пересылать весь интернет-трафик через Tor.</string>
+  <string name="wizard_permissions_root">Разрешение получено</string>
+  <string name="wizard_permissions_stock">Разрешения Orbot</string>
+  <string name="wizard_premissions_msg_root">Отлично! Мы определили, что вы предоставили root-права для Orbot. Мы будем использовать эту возможность с умом.</string>
+  <string name="wizard_permissions_msg_stock">Хотя это и не требуется, Orbot может быть более мощным инструментом, если ваше устройство имеет права root. Нажмите на кнопку ниже и предоставьте Orbot супервозможности!</string>
+  <string name="wizard_permissions_no_root">Если у вас нет root-прав или вы не имеете представления о чём мы говорим, просто убедитесь, что используете приложения, разработанные для Orbot.</string>
+  <string name="wizard_permissions_consent">Я понимаю и хочу продолжить без прав суперпользователя</string>
+  <string name="wizard_permission_enable_root">Дать root-права Orbot</string>
+  <string name="wizard_configure">Настроить Tor-ификацию</string>
+  <string name="wizard_configure_msg">Программа Orbot даёт вам возможность направлять трафик всех приложений через Tor ИЛИ выбрать приложения для перенаправления самостоятельно.</string>
+  <string name="wizard_configure_all">Направлять все приложения через Tor</string>
+  <string name="wizard_configure_select_apps">Направлять выбранные приложения через Tor</string>
+  <string name="wizard_tips_tricks">Orbot-задействованные приложения</string>
+  <string name="wizard_tips_msg">Мы советуем вам скачать и использовать приложения, которые умеют работать напрямую через Orbot. Нажмите на кнопки ниже, чтобы запустить процесс установки.</string>
+  <string name="wizard_tips_otrchat">ChatSecure - защищённый обмен сообщениями в Android</string>
+  <string name="wizard_tips_proxy">Настройки прокси: узнайте, как настроить приложения для работы с Orbot</string>
+  <string name="wizard_tips_duckgo">Приложение поисковой системы DuckDuckGo</string>
+  <string name="wizard_tips_twitter">Twitter поддерживает http-прокси \"localhost:8118\"</string>
+  <string name="wizard_tips_story_maker">StoryMaker - напишите рассказ и оставьте его Tor для обеспечения безопасности!</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_proxy_help_msg">Если используемое вами приложение для Android поддерживает HTTP или SOCKS-прокси, то вы можете настроить его на подключение к Orbot и использование Tor.\n\n\nЗначение хоста - 127.0.0.1 или \"localhost\". Для HTTP номер порта - 8118. Для SOCKS-прокси - 9050. По возможности используйте SOCKS4A или SOCKS5.\n \n\n\nВы можете узнать больше о работе через прокси на Android, прочитав этот FAQ: http://tinyurl.com/proxyandroid\n </string>
+  <string name="wizard_final">Orbot готов к использованию!</string>
+  <string name="wizard_final_msg">Миллионы людей во всём мире используют Tor по различным причинам. Журналисты и блоггеры, правозащитники, сотрудники правоохранительных органов, солдаты, корпорации, граждане стран с репрессивным режимом и просто обычные граждане..., а теперь готовы и вы!</string>
+  <string name="wizard_exit_at_first_screen_toast">Пожалуйста, настройте Orbot прежде чем приступить к использованию!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Вы успешно подключились к сети Tor, но это НЕ значит, что ваше устройство безопасно. Вы можете воспользоваться функцией \'Проверка\' из меню, чтобы протестировать ваш браузер.\n\nПосетите наш сайт https://guardianproject.info/apps/orbot или отправьте письмо на адрес help at guardianproject.info, чтобы узнать больше.</string>
+  <string name="tor_check">Это приведёт к запуску браузера, выбранного на вашем устройстве по умолчанию, и подключению к сайту https://check.torproject.org с целью проверки правильности работы Orbot и определения, подключены ли вы к сети Tor.</string>
+  <string name="pref_hs_group">Скрытые службы</string>
+  <string name="pref_general_group">Общие</string>
+  <string name="pref_start_boot_title">Запускать Orbot при загрузке</string>
+  <string name="pref_start_boot_summary">Автоматически запускать Orbot и подключаться к сети Tor при загрузке вашего Android-устройства</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot позволяет использовать Tor на Android!\n\nTor позволяет вам защититься от фильтрации содержимого, анализа трафика и наблюдения за сетью, которые ставят под угрозу приватность, конфиденциальную информацию и личные отношения.\n\nЭтот мастер поможет вам настроить Orbot и Tor на вашем устройстве.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Предупреждение</string>
+  <string name="wizard_warning_msg">Сама по себе установка Orbot не сделает автоматически ваш мобильный трафик анонимным.\n\nВы должны правильно настроить Orbot, ваше устройство и другие приложения, что бы успешно использовать Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Разрешения</string>
+  <string name="wizard_permissions_root_msg1">Вы так же можете по желанию дать Orbot права \'Суперпользователя\' для доступа к дополнительным возможностям типа прозрачной проксификации.</string>
+  <string name="wizard_permissions_root_msg2">Если вы не хотите делать это, пожалуйста, удостоверьтесь, что используете приложения, созданные для работы с Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Похоже, ваше устройство не имеет root-прав и не предоставляет доступ \'Суперпользователя\'.\n\nЧтобы использовать Tor, вам надо использовать приложения, построенные для работы с Orbot или те, которые поддерживают использование HTTP или SOCKS-прокси.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Приложения, работающие с Orbot:</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: приложение для безопасной переписки с конфиденциальным шифрованием</string>
+  <string name="wizard_tips_orweb">Orfox: конфиденциальный браузер, работающий через Tor</string>
+  <string name="wizard_tips_play">Найти все приложения Guardian Project на Google Play</string>
+  <string name="wizard_tips_fdroid">Найти все приложения Guardian Project на F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Найти все приложения Guardian Project на сайте https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Прозрачное проксирование</string>
+  <string name="wizard_transproxy_msg">Это позволяет вашим приложениям автоматически работать по сети Tor без какого-либо конфигурирования.</string>
+  <string name="wizard_transproxy_hint">(Отметьте данный пункт, если вы не знаете о чём идёт речь)</string>
+  <string name="wizard_transproxy_none">Нет</string>
+  <string name="pref_transparent_tethering_title">Тетеринг Tor</string>
+  <string name="pref_transparent_tethering_summary">Включить прозрачную проксификацию Tor для устройств с тетерингом по Wi-Fi и USB (требуется перезапуск)</string>
+  <string name="button_grant_superuser">Запросить доступ Суперпользователя</string>
+  <string name="pref_select_apps">Выбранные приложения</string>
+  <string name="pref_select_apps_summary">Выбрать приложения для направления через Tor</string>
+  <string name="pref_node_configuration">Конфигурация узла</string>
+  <string name="pref_node_configuration_summary">Это дополнительные настройки, которые могут снизить вашу анонимность</string>
+  <string name="pref_entrance_node">Входные узлы</string>
+  <string name="pref_entrance_node_summary">Отпечатки, псевдонимы, страны и адреса для первого прыжка</string>
+  <string name="pref_entrance_node_dialog">Введите входные узлы</string>
+  <string name="pref_allow_background_starts_title">Разрешить фоновую загрузку</string>
+  <string name="pref_allow_background_starts_summary">Позволить любому приложению требовать от Orbot запускать Tor и относящиеся к нему сервисы</string>
+  <string name="button_proxy_all">Проксировать всё</string>
+  <string name="button_proxy_none">Не проксировать </string>
+  <string name="button_invert_selection">Инвертировать выделенное</string>
+  <string name="pref_proxy_title">Исходящий сетевой прокси (необязательно)</string>
+  <string name="pref_proxy_type_title">Тип прокси</string>
+  <string name="pref_proxy_type_summary">Протокол для использования прокси-сервером: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Введите тип прокси</string>
+  <string name="pref_proxy_host_title">Хост прокси</string>
+  <string name="pref_proxy_host_summary">Имя хоста прокси-сервера</string>
+  <string name="pref_proxy_host_dialog">Введите хост прокси</string>
+  <string name="pref_proxy_port_title">Порт прокси</string>
+  <string name="pref_proxy_port_summary">Порт прокси-сервера</string>
+  <string name="pref_proxy_port_dialog">Введите порт прокси</string>
+  <string name="pref_proxy_username_title">Имя пользователя прокси</string>
+  <string name="pref_proxy_username_summary">Имя пользователя прокси-сервера (необязательно)</string>
+  <string name="pref_proxy_username_dialog">Введите имя пользователя прокси</string>
+  <string name="pref_proxy_password_title">Пароль пользователя прокси</string>
+  <string name="pref_proxy_password_summary">Пароль пользователя прокси-сервера (необязательно)</string>
+  <string name="pref_proxy_password_dialog">Введите пароль пользователя прокси</string>
+  <string name="status">Статус</string>
+  <string name="setting_up_full_transparent_proxying_">Установка общей прозрачной проксификации...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Установка основанной на приложениях прозрачной проксификации...</string>
+  <string name="transparent_proxying_enabled">Прозрачная проксификация ВКЛЮЧЕНА</string>
+  <string name="transproxy_enabled_for_tethering_">Прозрачный прокси поддерживает тетеринг!</string>
+  <string name="warning_error_starting_transparent_proxying_">ВНИМАНИЕ: ошибка запуска прозрачной проксификации!</string>
+  <string name="transproxy_rules_cleared">Правила прозрачного прокси удалены</string>
+  <string name="couldn_t_start_tor_process_">Невозможно запустить Tor: </string>
+  <string name="privoxy_is_running_on_port_">Polipo работает на порту:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Установка основанной на портах прозрачной проксификации...</string>
+  <string name="bridge_error">Ошибка моста</string>
+  <string name="bridge_requires_ip">Для использования необходимо задать IP-адрес как минимум одного моста.</string>
+  <string name="send_email_for_bridges">Отправьте письмо на адрес bridges at torproject.org со строкой \"get bridges\" в теле сообщения из учётной записи GMail.</string>
+  <string name="error">Ошибка</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Ваши настройки доступных адресов вызвали исключение!</string>
+  <string name="your_relay_settings_caused_an_exception_">Настройки вашего ретранслятора вызвали исключение!</string>
+  <string name="exit_nodes">Выходные узлы</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Отпечатки, псевдонимы, страны и адреса для последнего прыжка</string>
+  <string name="enter_exit_nodes">Введите выходные узлы</string>
+  <string name="exclude_nodes">Исключённые узлы</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Отпечатки, псевдонимы, страны и адреса на исключение</string>
+  <string name="enter_exclude_nodes">Введите исключённые узлы</string>
+  <string name="strict_nodes">Точные узлы</string>
+  <string name="use_only_these_specified_nodes">Использовать *только* эти заданные узлы</string>
+  <string name="bridges">Мосты</string>
+  <string name="use_bridges">Использовать мосты</string>
+  <string name="bridges_obfuscated">Обфусцированные мосты</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Включить альтернативные входные узлы в сеть Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Заданные мосты обфусцированы</string>
+  <string name="ip_address_and_port_of_bridges">IP-адреса и порты мостов</string>
+  <string name="enter_bridge_addresses">Введите адреса мостов</string>
+  <string name="relays">Ретрансляторы</string>
+  <string name="relaying">Ретрансляция</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Разрешить вашему устройству быть невыходным ретранслятором</string>
+  <string name="relay_port">Порт ретранслятора</string>
+  <string name="listening_port_for_your_tor_relay">Слушающий порт для вашего ретранслятора Tor</string>
+  <string name="enter_or_port">Введите порт OR</string>
+  <string name="relay_nickname">Имя ретранслятора</string>
+  <string name="the_nickname_for_your_tor_relay">Имя для вашего ретранслятора Tor</string>
+  <string name="enter_a_custom_relay_nickname">Введите пользовательское имя ретранслятора</string>
+  <string name="reachable_addresses">Доступные адреса</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Запускать как клиент за межсетевым экраном с ограничивающими политиками</string>
+  <string name="reachable_ports">Доступные порты</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Порты, доступные из-за ограничительного сетевого экрана</string>
+  <string name="enter_ports">Введите порты</string>
+  <string name="enable_hidden_services">Включить скрытые службы</string>
+  <string name="run_servers_accessible_via_the_tor_network">Запустить сервера, доступные через сеть Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">Введите локальные порты для скрытых служб</string>
+  <string name="hidden_service_ports">Порты скрытой службы</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Адресуемое имя для вашей скрытой службы (создаётся автоматически)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Включить вывод журнала отладки (требует использовать adb или aLogCat для просмотра)</string>
+  <string name="project_home">Домашняя страница проекта: </string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Лицензия Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Программы сторонних разработчиков: </string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Приложение хочет открыть скрытый порт сервера %S сети Tor. Это безопасно, если вы доверяете данному приложению.</string>
+  <string name="found_existing_tor_process">найден существующий процесс Tor...</string>
+  <string name="something_bad_happened">Произошла какая-то ошибка. Проверьте журнал.</string>
+  <string name="hidden_service_on">скрытая служба на:</string>
+  <string name="unable_to_read_hidden_service_name">невозможно прочитать имя скрытой службы</string>
+  <string name="unable_to_start_tor">Невозможно запустить Tor:</string>
+  <string name="unable_to_reset_tor">Перезагрузите устройство, невозможно переустановить Tor!</string>
+  <string name="pref_use_sys_iptables_title">Использовать Iptables по умолчанию</string>
+  <string name="pref_use_sys_iptables_summary">Использовать встроенный файл iptables вместо поставляемого с Orbot</string>
+  <string name="error_installing_binares">Исполняемые файлы Tor не смогли установиться или обновится.</string>
+  <string name="pref_use_persistent_notifications">Всегда отображать иконку в панели задач когда Orbot подключен</string>
+  <string name="pref_use_persistent_notifications_title">Постоянное уведомление о работе</string>
+  <string name="pref_use_expanded_notifications">Показать расширенное уведомление Tor со страной выхода и IP</string>
+  <string name="pref_use_expanded_notifications_title">Расширенные уведомления</string>
+  <string name="notification_using_bridges">Мосты включены!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Язык</string>
+  <string name="set_locale_summary">Выбрать язык интерфейса для Orbot</string>
+  <string name="wizard_locale_title">Выбрать язык</string>
+  <string name="wizard_locale_msg">Оставить по умолчанию или переключить текущий язык</string>
+  <string name="powered_by">основано на Tor</string>
+  <string name="btn_save_settings">Сохранить настройки</string>
+  <string name="no_internet_connection_tor">Отсутствует подключение к интернету, Tor находится в режиме ожидания…</string>
+  <string name="bandwidth_">Канал:</string>
+  <string name="down">к нам</string>
+  <string name="up">от нас</string>
+  <string name="pref_disable_network_title">Автозасыпание без сети</string>
+  <string name="pref_disable_network_summary">Переводить Tor в спящий режим при отсутствии интернета</string>
+  <string name="newnym">Вы переключились на новый идентификатор Tor!</string>
+  <string name="menu_verify_browser">Проверить браузер</string>
+  <string name="menu_use_chatsecure">Использовать ChatSecure</string>
+  <string name="permission_manage_tor_label">Управление Tor</string>
+  <string name="permission_manage_tor_description">Разрешить приложению управлять сервисом Tor</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Не похоже, что у вас установлен Orfox. Хотите справку на эту тему или просто открыть браузер?</string>
+  <string name="install_apps_">Установить приложения?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Нет подключения к сети. Tor входит в режим сна...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Подключение к сети установлено. Tor просыпается...</string>
+  <string name="updating_settings_in_tor_service">обновление настроек в сервисе Tor</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Порт, на котором Tor предоставляет свой SOCKS-прокси (по умолчанию: 9050, 0 - для отключения)</string>
+  <string name="pref_socks_dialog">Настройка порта SOCKS</string>
+  <string name="pref_transport_title">Порт прозрачного прокси Tor</string>
+  <string name="pref_transport_summary">Порт, на котором Tor предоставляет свой прозрачный прокси (по умолчанию: 9040, 0 - для отключения)</string>
+  <string name="pref_transport_dialog">Настройка порта прозрачного прокси</string>
+  <string name="pref_dnsport_title">Порт DNS Tor</string>
+  <string name="pref_dnsport_summary">Порт, на котором Tor предоставляет свой DNS (по умолчанию: 5400, 0 - для отключения)</string>
+  <string name="pref_dnsport_dialog">Настройка порта DNS</string>
+  <string name="pref_torrc_title">Пользовательские настройки Torrc</string>
+  <string name="pref_torrc_summary">ТОЛЬКО ДЛЯ ЭКСПЕРТОВ: внесите настройки напрямую в строки файла конфигурации torrc</string>
+  <string name="pref_torrc_dialog">Пользовательские Torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus -  приложение Benetech документация по правам человека </string>
+  <string name="your_tor_public_ips_">Ваши публичные IP-адреса Tor:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Пожалуйста, отключите эту программу в Android->Настройки->Приложения, если у вас возникли проблемы с Orbot:</string>
+  <string name="app_conflict"> Конфликт приложений</string>
+  <string name="pref_transproxy_refresh_title">Автообновление прозрачного прокси</string>
+  <string name="pref_transproxy_refresh_summary">Повторно применить правила прозрачного прокси при изменении состояния сети</string>
+  <string name="pref_transproxy_flush_title">ПРИНУДИТЕЛЬНОЕ УДАЛЕНИЕ прозрачного прокси</string>
+  <string name="pref_transproxy_flush_summary">Нажмите здесь, чтобы НЕМЕДЛЕННО очистить все сетевые правила прозрачного прокси</string>
+  <string name="transparent_proxy_rules_flushed_">Правила прозрачного прокси удалены!</string>
+  <string name="you_do_not_have_root_access_enabled">У вас не включён root-доступ</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Возможно, потребуется остановить и запустить Orbot заново для подключения изменений настроек.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">кбит/с</string>
+  <string name="mbps">мбит/с</string>
+  <string name="kb">КБ</string>
+  <string name="mb">МБ</string>
+  <string name="bridges_updated">Мосты обновлены</string>
+  <string name="restart_orbot_to_use_this_bridge_">Пожалуйста, перезапустите Orbot для вступления изменения в силу</string>
+  <string name="menu_qr">QR-коды</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Если ваша сеть мобильной связи активно блокирует Tor, вы можете использовать мосты Tor для доступа к сети. Выберите один из типов мостов выше, чтобы включить эту функцию.</string>
+  <string name="bridge_mode">Режим моста</string>
+  <string name="get_bridges_email">Эл. почта</string>
+  <string name="get_bridges_web">Сайт</string>
+  <string name="activate">Активация</string>
+  <string name="apps_mode">VPN-режим приложений</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Вы можете включить функцию перенаправления всех приложений на вашем устройстве через сеть Tor, используя функцию VPN в Android.\n\n* ПРЕДУПРЕЖДЕНИЕ * Это новая экспериментальная функция и в некоторых случаях может остановиться или не запуститься автоматически. Она не должна быть использована для анонимности, а ТОЛЬКО для прохождения фильтров и межсетевых экранов.</string>
+  <string name="send_email">Отправить письмо</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Вы можете получить адрес моста по электронной почте, с сайта или путём сканирования QR-кода. Выберите \"Эл. почта\" или \"Сайт\" ниже, чтобы запросить адрес моста.\n\nПолученный адрес скопируйте и вставьте его в разделе настроек Orbot \"Мосты\", после чего перезапустите приложение.</string>
+  <string name="install_orweb">Установить Orfox</string>
+  <string name="standard_browser">Стандартный браузер</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">ПРИМЕЧАНИЕ: только стандартные мосты Tor работают на устройствах Intel X86/Atom</string>
+  <string name="vpn_default_world">Мир</string>
+</resources>
diff --git a/app/src/main/res/values-si-rLK/strings.xml b/app/src/main/res/values-si-rLK/strings.xml
new file mode 100644
index 0000000..e4dc474
--- /dev/null
+++ b/app/src/main/res/values-si-rLK/strings.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">Tor ආරම්භ කිරීම හා නැවතීම</string>
+  <string name="tor_proxy_service_process">Tor නියුතු සේවා </string>
+  <string name="status_starting_up">Orbot ආරම්භ කරමින්…</string>
+  <string name="status_activated">Tor ජාලයට සබැදියි</string>
+  <string name="status_disabled">Orbot ක්‍රියාවිරහිත කර ඇත </string>
+  <string name="tor_process_starting">Tor දායකයා ආරම්භ කරමින්...</string>
+  <string name="tor_process_complete">සම්පුර්ණයි.</string>
+  <string name="tor_process_waiting">රැදී සිටියි.</string>
+  <string name="not_anonymous_yet">අවවාදයයි: ඔබේ ගනුදෙනු තවම නිර්නාමික නොමැත. කරුණාකර ඔබේ යෙදුම් සදහා HTTP proxy 127.0.0.1:8118 හෝ SOCKS4A හෝ SOCKS5 proxy 127.0.0.1:9050 භාවිතා වන පරිදි වින්‍යාස කරගන්න.</string>
+  <string name="menu_home">මුල්පිටුව</string>
+  <string name="menu_browse">පිරික්සන්න</string>
+  <string name="menu_settings">සිටවුම්</string>
+  <string name="menu_log">ලොගය </string>
+  <string name="menu_info">උදව්</string>
+  <string name="menu_start">අරඹන්න</string>
+  <string name="menu_stop">නවත්වන්න</string>
+  <string name="menu_about">පිළිබද</string>
+  <string name="main_layout_download">භාගත කරන්න </string>
+  <string name="main_layout_upload">උඩුගත කරන්න </string>
+  <string name="button_help">උදව්</string>
+  <string name="button_close">වසන්න</string>
+  <string name="button_about">පිළිබද</string>
+  <string name="button_clear_log">ලොගය හිස් කරන්න </string>
+  <string name="menu_verify">පරීක්ෂා කරන්න</string>
+  <string name="menu_exit">ඉවත් වන්න</string>
+  <string name="press_to_start">- ආරම්භ කිරීමට ටික වෙලාවක් තදකරන්න -</string>
+  <string name="pref_trans_proxy_group">පාරදෘශ්‍ය නියුතුසේවා (මුලය අවශ්‍ය වේ)</string>
+  <string name="pref_trans_proxy_title">පාරදෘශ්‍ය නියුතුසේවා</string>
+  <string name="pref_trans_proxy_summary">යොමුන් ස්වයංක්‍රීයව ටොර්කරණය </string>
+  <string name="pref_transparent_all_title">Tor සියල්ල</string>
+  <string name="pref_transparent_all_summary">Tor තුල සියළු යොමුවලට පවතින නියුතුසේවා තදබදය</string>
+  <string name="pref_transparent_port_fallback_title">පෝට නියුතුසේවා පසුබැසීම </string>
+  <string name="pref_transparent_port_fallback_summary">අවවාදයයි: මගහැරිය යුතු පොදු පෝට (80, 443, යනාදිය). *භාවිතාව හුදෙක්* \'සියළු\' සෝ \'යොමු\' ප්‍රකාර වැඩ නොකරන්නේ නම් පමණි.</string>
+  <string name="pref_transparent_port_title">පෝට ලැයිස්තුව </string>
+  <string name="pref_transparent_port_summary">නියුතුසේවා සදහා පෝට ලැයිස්තුව. *භාවිතාව හුදෙක්* \'සියළු\' සෝ \'යොමු\' ප්‍රකාර වැඩ නොකරන්නේ නම් පමණි.</string>
+  <string name="pref_transparent_port_dialog">පෝට නියුතුසේවාවට එක් කරන්න</string>
+  <string name="pref_has_root">මුල ප්‍රවේශය ඉල්ලන්න </string>
+  <string name="pref_has_root_summary">පාරදෘශ්‍ය නියුතුසේවා සදහා මුල ප්‍රවේශය ඉල්ලන්න </string>
+  <string name="status_install_success">Tor ද්විමයන් සාර්ථකව ස්ථාපනය කරන ලදී!</string>
+  <string name="status_install_fail">Tor ද්විමය ගොනුවන් ස්ථාපනය කිරීමට නොහැකි විය. කරුණාකර ලොගය පරික්ෂාකර tor-assistants at torproject.org ට දැනුම් දෙන්න</string>
+  <string name="title_error">යෙදුම් දෝෂ </string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Orbot පිලිබදව </string>
+  <string name="btn_next">ඊලග </string>
+  <string name="btn_back">පසුපසට</string>
+  <string name="btn_finish">අවසානයි </string>
+  <string name="btn_okay">එකගයි</string>
+  <string name="btn_cancel">අවලංගු කරන්න</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Orbot පිළිබද ඇතැම් විස්තර </string>
+  <string name="wizard_permissions_root">අනුමැතිය ලැබී ඇත.</string>
+  <string name="wizard_permissions_stock">Orbot අනුමැතියන් </string>
+  <string name="wizard_premissions_msg_root">අනර්ඝයි! ඔබ මුල Orbot සදහා මුල අනුමැතියන් සබල කර ඇති බව අපට අනාවරණය විය. අප මෙම බලය නැණවත් ලෙස භාවිතා කිරීමට පොරොන්දු වෙමු.</string>
+  <string name="wizard_permissions_msg_stock">අත්‍යවශ්‍ය නොවුවත් Orbot හට මුල ප්‍රවේශය ලබාදීමෙන් එය බලගතු මෙවලමක් බවට පත්වේ. පහල බොත්තම භාවිතයෙන් Orbot හට සුපිරිබලය ලබාදෙන්න!</string>
+  <string name="wizard_permissions_no_root">ඔබට මුල ප්‍රවේශය සම්බන්ධව කිසිදු අවබෝධයක් නොමැති නම්, Orbot වල වඩා කරන යොමුන් පමණක් භාවිතා කරන්න.</string>
+  <string name="wizard_permissions_consent">මා හට වැටහෙයි. සුපිරි පරිශිලකයා නොමැතිව දිගටම කරගෙන යාමට කැමැත්තෙමි.</string>
+  <string name="wizard_permission_enable_root">Orbot හට මුලය ප්‍රදානය කරන්න </string>
+  <string name="wizard_configure">ටොර්කරණය වින්‍යාස කරන්න </string>
+  <string name="wizard_configure_msg">Orbot ඔබට සියළු යොමුවල ගනුදෙනු Tor තුලින් යැවීමට හෝ ඔබේ යොමු තනි තනිව තෝරාගැනීමට අවකාශ ලබාදේ.</string>
+  <string name="wizard_configure_all">සියළු යොමුවලට පවතින නියුතුසේවා Tor තුලින් යවන්න </string>
+  <string name="wizard_configure_select_apps">තනි යොමුන් Tor සදහා තෝරාගන්න </string>
+  <string name="wizard_tips_tricks">Orbot සබල කල යොමු </string>
+  <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="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>
+  <string name="wizard_final">Orbot සුදානම්!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">මෙමගින් ඔබේ වෙබ් බ්‍රව්සරය https://check.torproject.org ට විවෘත වේ. එවිට ඔබට Orbot නිසි ලෙස වින්‍යාස වී ඇතිදැයි හා ඔබ Tor ජාලයට සම්බන්ධ වී ඇතිදැයි දැකගත හැක.</string>
+  <string name="pref_hs_group">සැගවුණු සේවා සත්කාර කරමින් </string>
+  <string name="pref_general_group">පොදු</string>
+  <string name="pref_start_boot_title">Orbot ඇරඹුම් ධාවකයේ අරඹන්න </string>
+  <string name="pref_start_boot_summary">Orbot ස්වයංක්‍රියව ආරම්භ කර, ඔබේ Android උපකරණය පටන්ගත් විට Tor වලට සම්බන්ධ කරගන්න.</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">අවවාදයයි</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">අනුමැතිය</string>
+  <string name="wizard_permissions_root_msg1">ඔබට අවශ්‍ය නම් Orbot සුපිරි පරිශීලකයාට පාරදෘශ්‍ය නියුතු සේවා වැනි ප්‍රගමන විශේෂාංග සබල කිරීමට අවසර ලබාදිය හැක. </string>
+  <string name="wizard_permissions_root_msg2">ඔබට මෙය සිදු කිරීමට අවශ්‍යතාවක් නොමැති නම්, Orbot වල වැඩා කරන යොමුන් පමණක් භාවිතා කරන්න.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot සබල කල යොමු</string>
+  <string name="wizard_tips_play">Google Play තුලින් Guardian Project apps තෝරාගන්න </string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">පාරදෘශ්‍ය නියුතුසේවා</string>
+  <string name="wizard_transproxy_msg">මෙමගින් ඔබේ යොමුන්ට කිසිදු වින්‍යසකරණයක් නොමැතිව Tor ජාලය හරහා ස්වයංක්‍රියව ක්‍රියාත්මක විය හැක.</string>
+  <string name="wizard_transproxy_hint">(ඔබට අප සදහන් කල කරුණු පිළිබද අවබෝධයක් නොමැති නම් මෙම කොටුව සලකුණු කරන්න)</string>
+  <string name="wizard_transproxy_none">කිසිවක් නොමැත</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Wifi හා USB Tethered උපාංග සදහා Tor පාරදෘශ්‍ය නියුතු සේවාව සබල කරන්න (නැවත ආරම්භ කිරීමක් අවශ්‍යවේ)</string>
+  <string name="button_grant_superuser">සුපිරි පරිශීලකයාගේ ප්‍රවේශය ඉල්ලන්න </string>
+  <string name="pref_select_apps">යොමුන් තෝරාගන්න </string>
+  <string name="pref_select_apps_summary">Tor හරහා යැවීමට යොමුන් තෝරාගන්න </string>
+  <string name="pref_node_configuration">නොඩු වින්‍යාසකරණය </string>
+  <string name="pref_node_configuration_summary">මේවා ඔබේ නිර්නාමිකතාව අඩු කරන ප්‍රගමන සිටුවම් ය.</string>
+  <string name="pref_entrance_node">ඇතුළු විමේ නොඩු </string>
+  <string name="pref_entrance_node_summary">පළමු hop සදහා අගිලිසලකුණු, nicks, රටවල් හා ලිපිනයන් </string>
+  <string name="pref_entrance_node_dialog">ඇතුළු විමේ නොඩුවලට පිවිසෙන්න </string>
+  <string name="pref_proxy_title">Outbound ජාල නියුතු </string>
+  <string name="pref_proxy_type_title">Outbound නියුතු වර්ගයකි </string>
+  <string name="pref_proxy_type_summary">නියුතු සේවාදායකයන් සදහා ප්‍රොටෝකෝල: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">නියුතු සේවා වර්ගය ඇතුලත් කරන්න </string>
+  <string name="pref_proxy_host_title">Outbound නියුතු සත්කාරයකි  </string>
+  <string name="pref_proxy_host_summary">නියුතු සේවාදායකගේ සත්කාරක නාමය </string>
+  <string name="pref_proxy_host_dialog">නියුතුසේවා සත්කාරය ඇතුලු කරන්න </string>
+  <string name="pref_proxy_port_title">Outbound නියුතු පොර්ටයකි </string>
+  <string name="pref_proxy_port_summary">නියුතු සේවාදායක පෝටය</string>
+  <string name="pref_proxy_port_dialog">නියුතු සේවා පෝටය ඇතුළු කරන්න </string>
+  <string name="status">තත්වය</string>
+  <string name="setting_up_full_transparent_proxying_">සම්පුර්ණ පාරදෘශ්‍ය නියුතුසේවා පිහිටුවීම...</string>
+  <string name="setting_up_app_based_transparent_proxying_">යොමු පදනම් කරගෙන ක්‍රියාත්මක වන පාරදෘශ්‍ය නියුතුසේවා පිහිටුවීම...</string>
+  <string name="transparent_proxying_enabled">පාරදෘශ්‍ය නියුතුසේවා සබල කර ඇත </string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy Tethering සදහා සබල කර ඇත!</string>
+  <string name="warning_error_starting_transparent_proxying_">අවවාදයයි: පාරදෘශ්‍ය නියුතුසේවාවෙන් දෝෂයක් හටගෙන ඇත!</string>
+  <string name="transproxy_rules_cleared">TransProxy කොන්දේසි ඉවත් කර ඇත </string>
+  <string name="couldn_t_start_tor_process_">Tor ක්‍රියාවලින් ආරම්භ කිරීමට නොහැකි විය:</string>
+  <string name="setting_up_port_based_transparent_proxying_">පෝට පදනම් කරගෙන ක්‍රියාත්මක වන පාරදෘශ්‍ය නියුතුසේවා පිහිටුවීම...</string>
+  <string name="bridge_error">සේතු දෝෂයකි</string>
+  <string name="bridge_requires_ip">සේතු විශේෂාංග භාවිතාය සදහා ඔබ අඩු තරමින් එක් සේතු IP ලිපිනයක් හෝ ඇතුලත් කල යුතුය.</string>
+  <string name="send_email_for_bridges">\"get bridges\" නම් පේලිය විද්‍යුත් ලිපියේ දේහයේ ඇතුලත් කර gmail ගිණුමකින් bridges at torproject.org ලිපිනයට යවන්න.</string>
+  <string name="error">දෝෂයකි</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">ඔබේ සේන්දුවන ලිපිනයෙහි සිටුවම්වල ව්‍යතිරේකයක් හටගෙන ඇත!</string>
+  <string name="your_relay_settings_caused_an_exception_">ඔබේ ප්‍රතියෝජක සිටුවම්වල ව්‍යතිරේකයක් හටගෙන ඇත!</string>
+  <string name="exit_nodes">පිටවුම් නෝඩු</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">පළමු hop සදහා අගිලිසලකුණු, nicks, රටවල් හා ලිපිනයන්</string>
+  <string name="enter_exit_nodes">පිටවුම් නොඩුවලට පිවිසෙන්න</string>
+  <string name="exclude_nodes">අත්හරින නොඩු</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">අත්හරින අගිලිසලකුණු, nicks, රටවල් හා ලිපිනයන්</string>
+  <string name="enter_exclude_nodes">අත්හරින නොඩුඩුවලට පිවිසෙන්න</string>
+  <string name="strict_nodes">දැඩි නොඩු </string>
+  <string name="use_only_these_specified_nodes">ඉහත සදහන් නොඩු *පමණක්* භාවිතා කරන්න </string>
+  <string name="bridges">සේතු</string>
+  <string name="use_bridges">සේතු භාවිතා කරන්න </string>
+  <string name="bridges_obfuscated">සේතු අදුරු කරන්න </string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Tor ජාලයට විකල්ප ඇතුළු විමේ නොඩු සබල කරන්න </string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">වින්‍යාස කර ඇති සේතු අදුරු කල සේතු නම් ඒවා සබල කරන්න </string>
+  <string name="ip_address_and_port_of_bridges">IP ලිපිනය හා සේතුවල පෝට</string>
+  <string name="enter_bridge_addresses">සේතු ලිපිනයන් ඇතුළු කරන්න </string>
+  <string name="relays">ප්‍රතියෝජකය</string>
+  <string name="relaying">ප්‍රතියෝජනය </string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">ඔබේ උපාංගය නික්ම-නොයන ප්‍රතියෝජකයක් බවට සබල කරන්න </string>
+  <string name="relay_port">ප්‍රතියෝජක පෝටය</string>
+  <string name="listening_port_for_your_tor_relay">Tor ප්‍රතියෝජකයට සවන්දෙන පෝටය </string>
+  <string name="enter_or_port">OR පෝටය ඇතුළු කරන්න </string>
+  <string name="relay_nickname">ප්‍රතියෝජක අපනාමය</string>
+  <string name="the_nickname_for_your_tor_relay">ඔබේ Tor ප්‍රතියෝජකයේ අපනාමය</string>
+  <string name="enter_a_custom_relay_nickname">ව්‍යාවහාරික ප්‍රතියෝජක අපනාමය ඇතුළු කරන්න </string>
+  <string name="reachable_addresses">සේන්දු වියහැකි ලිපිනය </string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">සේවාදායකයෙකු ලෙස firewall පිටුපස සිට සිමාකාරී පිළිවෙත් සමග ක්‍රියාකරන්න</string>
+  <string name="reachable_ports">සේන්දු වියහැකි පෝටයන්</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">සිමාකාරී firewall පිටුපස සේන්දුවිය හැකි පෝටයන්</string>
+  <string name="enter_ports">පෝටයන් ඇතුළු කරන්න </string>
+  <string name="enable_hidden_services">සැගවුණු සේවා සත්කාර කරමින් </string>
+  <string name="run_servers_accessible_via_the_tor_network">උපාංග මත දිවෙන සේවාදායකයාට Tor ජාලයට ප්‍රවේශවීමට ඉඩදෙන්න</string>
+  <string name="enter_localhost_ports_for_hidden_services">සැගවුණු සේවා සදහා ඇති localhost පෝටයන් ඇතුළු කරන්න </string>
+  <string name="hidden_service_ports">සැගවුණු සේවා පෝටයන්</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">ඔබේ සැගවුණු සේවා සදහා අමතන නාමය (ස්වයංක්‍රියව ජනනය වූ)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">නිදොස් කිරීමේ ලොගය ප්‍රතිදානය සදහා සබල කරන්න (නැරඹීම සදහා adb or aLogCat භාවිතා කරන්න)</string>
+  <string name="project_home">ව්‍යාපෘති නිවහන(න්):</string>
+  <string name="the_tor_license">Tor බලපත්‍රය</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3 වන පාර්ශව මෘදුකාංග</string>
+  <string name="hidden_service_request">යොමුවකට සැගවුණු සේවාදායක %S පෝටය Tor ජාලයට විවෘත කිරීමට උවමනාය. මෙය සුරක්ෂිතවන්නේ ඔබ මෙම යොමුව විශ්වාස කරනවා නම්  පමණි.</string>
+  <string name="found_existing_tor_process">පවතින Tor ක්‍රියාවලි හමුවිය...</string>
+  <string name="something_bad_happened">යම් නොමනා දෙයක් සිදුවිය. ලොගය පරික්ෂා කර බලන්න </string>
+  <string name="hidden_service_on">සැගවුණු සේවා පිහිටන්නේ:</string>
+  <string name="unable_to_read_hidden_service_name">සැගවුණු සේවා නාමය කියවීමට නොහැකිය </string>
+  <string name="unable_to_start_tor">Tor ආරම්භ කිරීමට නොහැකිය:</string>
+  <string name="pref_use_sys_iptables_title">පෙරනිමි IP වගුව භාවිතා කරන්න </string>
+  <string name="pref_use_sys_iptables_summary">Orbot හී ද්විමය ip වගු වෙනුවට උපාංගයේ පිහිටි ද්විමය ip වගු භාවිතා කරන්න </string>
+  <string name="error_installing_binares">Tor දිවිමයන් ස්ථාපනයට හෝ උත්ශ්‍රේණි කිරීමට නොහැකි විය.</string>
+  <string name="pref_use_persistent_notifications">Orbot සම්බන්ධ වී ඇති සැමවිටම විට මෙවලම් තීරුවේ නිරූපකය තබාගන්න</string>
+  <string name="pref_use_persistent_notifications_title">නිවේදන ලැබීමට සලස්වන්න </string>
+  <string name="notification_using_bridges">සේතු සබල කර ඇත!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Orbot සදහා පෙදෙසිය සහ භාෂාව තෝරන්න </string>
+  <string name="wizard_locale_title">භාෂාව තෝරන්න </string>
+  <string name="wizard_locale_msg">සම්මතය අතහැර වර්තමාන භාෂාවට මාරුවෙන්න </string>
+  <string name="btn_save_settings">සිටුවම් සුරැකින්න</string>
+</resources>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
new file mode 100644
index 0000000..b7578c4
--- /dev/null
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_info">Pomocník</string>
+  <string name="button_help">Pomocník</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Nastavenia proxy</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
new file mode 100644
index 0000000..2f648ef
--- /dev/null
+++ b/app/src/main/res/values-sk/strings.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">štart a stop Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot štartuje…</string>
+  <string name="status_activated">Pripojený do Tor siete</string>
+  <string name="status_disabled">Orbot je deaktivovaný</string>
+  <string name="tor_process_starting">Štartujem Tor klienta...</string>
+  <string name="tor_process_complete">hotovo.</string>
+  <string name="tor_process_waiting">čakám.</string>
+  <string name="not_anonymous_yet">VAROVANIE: Váš prenos nie je ešte anonymný! Prosím, nakonfigurujte aplikácie aby používali HTTP proxy 127.0.0.1:8118 alebo SOCKS4A alebo SOCKS5 proxy server 127.0.0.1:9050</string>
+  <string name="menu_home">Domov</string>
+  <string name="menu_browse">Prehliadať</string>
+  <string name="menu_settings">Nastavenia</string>
+  <string name="menu_info">Pomocník</string>
+  <string name="menu_about">O aplikácií</string>
+  <string name="button_help">Pomocník</string>
+  <string name="button_close">Zatvoriť</string>
+  <string name="button_about">O aplikácií</string>
+  <string name="menu_verify">Skontrolovať</string>
+  <string name="menu_exit">Ukončiť</string>
+  <string name="btn_back">Späť</string>
+  <string name="btn_cancel">Zrušiť</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Nastavenie proxy</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Všeobecné</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Varovanie</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">Žiadny</string>
+  <string name="status">Stav</string>
+  <string name="error">Chyba</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Uložiť nastavenie</string>
+</resources>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
new file mode 100644
index 0000000..1b8a4c6
--- /dev/null
+++ b/app/src/main/res/values-sl/strings.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org/?lang=sl</string>
+  <string name="secure_default_web_url">https://check.torproject.org/?lang=sl</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">začni in ustavi Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot se zaganja...</string>
+  <string name="status_activated">Povezan v omrežje Tor</string>
+  <string name="status_disabled">Orbot ni aktiviran</string>
+  <string name="tor_process_starting">Zagon Tor klijenta...</string>
+  <string name="tor_process_complete">končano.</string>
+  <string name="tor_process_waiting">čakam.</string>
+  <string name="not_anonymous_yet">POZOR: Vaš promet še ni anonimen! Prosimo, nastavite vaše aplikacije da uporabijo HTTP posredniški strežnik 127.0.0.1:8118 ali SOCKS4A ali SOCKS5 posredniški strežnik 127.0.0.1:9050</string>
+  <string name="menu_home">Glavni meni</string>
+  <string name="menu_browse">Brskaj</string>
+  <string name="menu_settings">Nastavitve</string>
+  <string name="menu_log">Dnevnik</string>
+  <string name="menu_info">Pomoč</string>
+  <string name="menu_start">Začni</string>
+  <string name="menu_stop">Ustavi</string>
+  <string name="menu_about">O programu</string>
+  <string name="main_layout_download">Prenesi</string>
+  <string name="main_layout_upload">Naloži</string>
+  <string name="button_help">Pomoč</string>
+  <string name="button_close">Zapri</string>
+  <string name="button_about">O programu</string>
+  <string name="button_clear_log">Počisti dnevnik</string>
+  <string name="menu_verify">Preveri</string>
+  <string name="menu_exit">Izhod</string>
+  <string name="press_to_start">- dolg pritisk za začetek -</string>
+  <string name="pref_trans_proxy_group">Transparentno delovanje prek posredniškega strežnika (potrebuje root)</string>
+  <string name="pref_trans_proxy_title">Transparentno delovanje prek posredniškega strežnika</string>
+  <string name="pref_trans_proxy_summary">Samodejno preusmerjanje aplikacij preko Tor</string>
+  <string name="pref_transparent_all_title">Tor karkoli</string>
+  <string name="pref_transparent_all_summary">Posredovanje prometa za vse aplikacije preko Tor</string>
+  <string name="pref_transparent_port_fallback_title">Nadomestna posredniška vrata</string>
+  <string name="pref_transparent_port_fallback_summary">OPOZORILO: Obide skupne porte (80, 443, itd.) * UPORABI LE * v primeru če  \"Vsi\" ali \"App\" način ne deluje.</string>
+  <string name="pref_transparent_port_title">Seznam vrat</string>
+  <string name="pref_transparent_port_summary">Seznam portov za posredniški strežnik. * UPORABI LE * v primeru če \"Vsi\" ali \"App\" način ne deluje</string>
+  <string name="pref_transparent_port_dialog">Vnesi vrata za posredniški strežnik</string>
+  <string name="pref_has_root">Zahtevaj korenski dostop</string>
+  <string name="pref_has_root_summary">Zahtevaj korenski dostop za transparentno posredovanje</string>
+  <string name="status_install_success">Tor binarne datoteke so uspešno nameščene!</string>
+  <string name="status_install_fail">Ni bilo možno namestiti Tor binarnih datotek. Prosimo preverite log in obvestite tor-assistants at torproject.org</string>
+  <string name="title_error">Napaka v programu</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">O programu Orbot</string>
+  <string name="btn_next">Naprej</string>
+  <string name="btn_back">Nazaj</string>
+  <string name="btn_finish">Zaključi</string>
+  <string name="btn_okay">Potrdi</string>
+  <string name="btn_cancel">Prekini</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Nekaj podrobnosti o Orbot-u</string>
+  <string name="wizard_permissions_root">Dovoljenje dodeljeno</string>
+  <string name="wizard_permissions_stock">Orbot dovoljenja</string>
+  <string name="wizard_premissions_msg_root">Odlično! Ugotovili smo, da imate omogočeno root dovoljenje za Orbot. To moč bomo modro uporabili.</string>
+  <string name="wizard_permissions_msg_stock">Čeprav to ni potrebno, lahko Orbot postane bolj zmogljivo orodje, če ima vaša naprava korenski dostop. Uporabite spodnji gumb za odobritev Orbot velesile!</string>
+  <string name="wizard_permissions_no_root">Če nimate korenski dostop ali nimate pojma o čem je beseda, se le prepričajte, da uporabljate aplikacije, narejene za delo z Orbot.</string>
+  <string name="wizard_permissions_consent">Razumem in želim nadaljevati kot Superuporabnik.</string>
+  <string name="wizard_permission_enable_root">Dodeli Root za Orbot</string>
+  <string name="wizard_proxy_help_info">Nastavitve posredniškega (proxy) strežnika</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Splošno</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Opozorilo</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Dovoljenja</string>
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="status">Stanje</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Shrani nastavitve</string>
+</resources>
diff --git a/app/src/main/res/values-sn/strings.xml b/app/src/main/res/values-sn/strings.xml
new file mode 100644
index 0000000..ad1cd1d
--- /dev/null
+++ b/app/src/main/res/values-sn/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="menu_settings">Zvamada</string>
+  <string name="menu_about">Maererano</string>
+  <string name="button_about">Maererano</string>
+  <string name="menu_exit">Buda</string>
+  <string name="wizard_btn_tell_me_more">Maererano Orbot</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Proxy Zvamada</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
new file mode 100644
index 0000000..5a7c989
--- /dev/null
+++ b/app/src/main/res/values-sq/strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_home">Shpi</string>
+  <string name="menu_browse">Lundro</string>
+  <string name="menu_settings">Zgjedhjet</string>
+  <string name="menu_info">Ndihmë</string>
+  <string name="menu_about">Informacione</string>
+  <string name="button_help">Ndihmë</string>
+  <string name="button_close">Mbylle</string>
+  <string name="button_about">Informacione</string>
+  <string name="menu_exit">Dil</string>
+  <string name="btn_back">Mbrapa</string>
+  <string name="btn_cancel">Anullo</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Konfigurimi i Proxy</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Të Përgjithshme</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Warning</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">Asnjë</string>
+  <string name="status">Gjëndja</string>
+  <string name="error">Gabim</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Shpëto Konfigurmin</string>
+</resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
new file mode 100644
index 0000000..b3cc7ed
--- /dev/null
+++ b/app/src/main/res/values-sr/strings.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Орбот</string>
+  <string name="app_description">Орбот је бесплатна прокси апликација која даје моћ другим апликацијама да безбедније користе интернет. Орбот користи Тор за шифровање вашег интернет саобраћаја и онда га скрива слањем кроз низ рачунара широм света. Тор је слободан софтвер и отворена мрежа која помаже да се одбраните од разних облика надзора мрежа који угрожавају личну слободу и приватност, поверљиве пословне активности и личне односе и државне безбедности познате као анализа саобраћаја.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">покрени и заустави Tor</string>
+  <string name="tor_proxy_service_process">Тор прокси услуга</string>
+  <string name="status_starting_up">Орбот се покреће...</string>
+  <string name="status_activated">Повезан са Тор мрежом</string>
+  <string name="status_disabled">Орбот је деактивиран</string>
+  <string name="tor_process_starting">Покреће се Тор клијент...</string>
+  <string name="tor_process_complete">завршено.</string>
+  <string name="tor_process_waiting">чекам.</string>
+  <string name="not_anonymous_yet">УПОЗОРЕЊЕ: Ваш промет још није анониман! Молимо вас да подесите Ваше апликације да користе HTTP прокси 127.0.0.1:8118 или SOCKS4A или SOCKS5 прокси 127.0.0.1:9050</string>
+  <string name="menu_home">Почетна</string>
+  <string name="menu_browse">Разгледање</string>
+  <string name="menu_settings">Подешавања</string>
+  <string name="menu_log">Логови</string>
+  <string name="menu_info">Помоћ</string>
+  <string name="menu_apps">ВПН</string>
+  <string name="menu_start">Крени</string>
+  <string name="menu_stop">Заустави</string>
+  <string name="menu_about">О нама</string>
+  <string name="main_layout_download">Преузимање</string>
+  <string name="main_layout_upload">Отпремање</string>
+  <string name="button_help">Помоћ</string>
+  <string name="button_close">Затвори</string>
+  <string name="button_about">О нама</string>
+  <string name="button_clear_log">Очисти логове</string>
+  <string name="menu_verify">Провери</string>
+  <string name="menu_exit">Излаз</string>
+  <string name="press_to_start">- задржите дужи притисак  за почетак -</string>
+  <string name="pref_trans_proxy_group">Транспарентно проксирање (захтева root приступ)</string>
+  <string name="pref_trans_proxy_title">Транспарентно слање кроз прокси</string>
+  <string name="pref_trans_proxy_summary">Аутоматско торифицирање апликација</string>
+  <string name="pref_transparent_all_title">Торофикуј све</string>
+  <string name="pref_transparent_all_summary">Проследи промет од свих апликација кроз Тор</string>
+  <string name="pref_transparent_port_fallback_title">Резерван порт проксија</string>
+  <string name="pref_transparent_port_fallback_summary">УПОЗОРЕЊЕ: Заобилажење честих портова (80, 443 итд). КОРИСТИТЕ САМО ако подешавања на \"Све\" или \"Апликација\" не раде.</string>
+  <string name="pref_transparent_port_title">Листа портова</string>
+  <string name="pref_transparent_port_summary">Листа портова за прокси. Користити САМО ако опције \"Све\" или \"Апликације\" не раде.</string>
+  <string name="pref_transparent_port_dialog">Упишите портове за прослеђивање на прокси</string>
+  <string name="pref_has_root">Затражи root приступ</string>
+  <string name="pref_has_root_summary">Затражи root приступ за транспарентно проксирање</string>
+  <string name="status_install_success">Тор бинари успешно инсталирани!</string>
+  <string name="status_install_fail">Бинарне Тор датотеке нису успешно инсталиране. Молимо прегледајте логове и обавестите нас на tor-assistants at torproject.org</string>
+  <string name="title_error">Грешка у апликацији</string>
+  <string name="wizard_title">Орбот</string>
+  <string name="wizard_btn_tell_me_more">Информације о Орботу</string>
+  <string name="btn_next">Следеће</string>
+  <string name="btn_back">Назад</string>
+  <string name="btn_finish">Заврши</string>
+  <string name="btn_okay">У реду</string>
+  <string name="btn_cancel">Откажи</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Детаљи о Орботу</string>
+  <string name="wizard_details_msg">Orbot je otvorena aplikacija koja sadrzi Tor, LibEvent i Polipo. Obezbeđuje lokalni HTTP proksi (8118) i SOCKS proksi (9050) u Tor mrežu. Takođe poseduje sposobnost, da kroz Tor, šalje sav internet saobraćaj sa rutovanih uređaja.</string>
+  <string name="wizard_permissions_root">Дозвола одобрена</string>
+  <string name="wizard_permissions_stock">Орбот дозволе</string>
+  <string name="wizard_premissions_msg_root">Одлично! Детектовали смо да имате root дозволе за Орбот. Мудро ћемо искрористити ову моћ.</string>
+  <string name="wizard_permissions_msg_stock">Иако није захтевано, Орбот постаје много јачи алат ако Ваш уређај има root приступ. Користите дугме испод да бисте омогућили Орботу супер моћи.</string>
+  <string name="wizard_permissions_no_root">Ако немате root приступ или немате појма о чему причамо, само се побрините да користите апликације које су направљене да функционишу са Орботом.</string>
+  <string name="wizard_permissions_consent">Разумем и желео бих да наставим без root приступа</string>
+  <string name="wizard_permission_enable_root">Дозволи root за Орбот</string>
+  <string name="wizard_configure">Подеси торификацију</string>
+  <string name="wizard_configure_msg">Орбот Вам даје опцију да проследите сав промет од стране свих апликација или да изаберете посебно апликације које желите да проследите кроз Тор мрежу.</string>
+  <string name="wizard_configure_all">Пошаљи промет од свих апликација кроз Тор</string>
+  <string name="wizard_configure_select_apps">Означи посебно апликације чији ће се промет проследити кроз Тор</string>
+  <string name="wizard_tips_tricks">Орбот-омогућене Апликације</string>
+  <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="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>
+  <string name="wizard_final">Орбот је спреман!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Ово ће отворити Ваш веб претраживач и посетити страницу https://check.torproject.org да би проверили да ли је Орбот правилно подешен и да ли сте спојени са Тор мрежом.</string>
+  <string name="pref_hs_group">Хостинг на скривеном сервису</string>
+  <string name="pref_general_group">Опште</string>
+  <string name="pref_start_boot_title">Покрени Орбот при покретању уређаја</string>
+  <string name="pref_start_boot_summary">Аутоматски покрените Орбот и конектујте се са Тор мрежом када се упали Ваш Андроид уређај.</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Упозорење</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Дозволе</string>
+  <string name="wizard_permissions_root_msg1">Можете опционално дозволити Орботу приступ као \"Супер корисник\" да би омогућили напредне функције као што је транспарентно слање кроз прокси.</string>
+  <string name="wizard_permissions_root_msg2">Ако не желите ово да урадите, молимо Вас да се уверите да користите апликације које су подешене да раде са Орботом.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Апликације са омогућеним Орботом.</string>
+  <string name="wizard_tips_play">Пронађите све Guardian Project апликације на Google Play сервису</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Транспарентно слање кроз прокси</string>
+  <string name="wizard_transproxy_msg">Ово омогућава Вашим апликацијама да аутоматски преусмеравају промет кроз Тор мрежу без икакве конфигурације.</string>
+  <string name="wizard_transproxy_hint">(Означите овај квадратић ако немате појма о чему причамо)</string>
+  <string name="wizard_transproxy_none">Ниједан</string>
+  <string name="pref_transparent_tethering_title">Привезивање тора</string>
+  <string name="pref_transparent_tethering_summary">Омогућава Торово транспарентно слање кроз прокси за бежичне и УСБ повезивајуће уређаје (захтева рестартовање)</string>
+  <string name="button_grant_superuser">Затражи приступ као \'Superuser\'</string>
+  <string name="pref_select_apps">Изаберите апликације</string>
+  <string name="pref_select_apps_summary">Изаберите апликације чији промет ћете проследити кроз Тор</string>
+  <string name="pref_node_configuration">Конфигурација чворова</string>
+  <string name="pref_node_configuration_summary">Ово су напредне поставке које могу да смање Вашу анонимност</string>
+  <string name="pref_entrance_node">Почетни чворови</string>
+  <string name="pref_entrance_node_summary">Отисци прстију, надимци, државе и адресе првог скока</string>
+  <string name="pref_entrance_node_dialog">Унесите почетне чворове</string>
+  <string name="pref_proxy_title">Мрежни прокси за одлазећи промет (Необавезно)</string>
+  <string name="pref_proxy_type_title">Тип проксија за одлазећи промет</string>
+  <string name="pref_proxy_type_summary">Протокол који ће се користити за прокси сервер: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Унесите тип проксија</string>
+  <string name="pref_proxy_host_title">Хост проксија за одлазећи промет</string>
+  <string name="pref_proxy_host_summary">Име хоста за прокси сервер</string>
+  <string name="pref_proxy_host_dialog">Унесите хост од проксија</string>
+  <string name="pref_proxy_port_title">Порт проксија за одлазећи промет</string>
+  <string name="pref_proxy_port_summary">Порт прокси сервера</string>
+  <string name="pref_proxy_port_dialog">Унесите порт проксија</string>
+  <string name="pref_proxy_username_title">Корисничко име на проксију за одлазећи промет</string>
+  <string name="pref_proxy_username_summary">Име проксија (Необавезно)</string>
+  <string name="pref_proxy_username_dialog">Унесите корисничко име Проксија  </string>
+  <string name="pref_proxy_password_title">Шифра на проксију за одлазећи промет</string>
+  <string name="pref_proxy_password_summary">Шифра проксија (необавезно)</string>
+  <string name="pref_proxy_password_dialog">Унесите шифру проксија</string>
+  <string name="status">Статус</string>
+  <string name="setting_up_full_transparent_proxying_">Постављање потпуно трапспарентног слања кроз прокси</string>
+  <string name="setting_up_app_based_transparent_proxying_">Подешавање трапспарентног проксија од стране апликације</string>
+  <string name="transparent_proxying_enabled">Транспарентно слање кроз прокси је ОМОГУЋЕНО</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy је омогућен за привезивање</string>
+  <string name="warning_error_starting_transparent_proxying_">УПОЗОРЕЊЕ: грешка при стартовању транспарентног слања кроз прокси!</string>
+  <string name="transproxy_rules_cleared">TransProxy правила очишћена</string>
+  <string name="couldn_t_start_tor_process_">Није могуће покренути Тор процес:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Подешавање транспарентног проксирања од стране порта...</string>
+  <string name="bridge_error">Грешка у мосту</string>
+  <string name="bridge_requires_ip">Да бисте користили bridge могућност, морате унети бар једну bridge IP адресу.</string>
+  <string name="send_email_for_bridges">Пошаљите мејл на bridges at torproject.org са речима \"get bridges\" у тексту поруке мејла са gmail корисничког рачуна.</string>
+  <string name="error">Грешка</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Ваше ReachableAddresses поставке су изазвале изузетак!</string>
+  <string name="your_relay_settings_caused_an_exception_">Ваше поставке релеја су изазвале изузетак!</string>
+  <string name="exit_nodes">Излазни чворови</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Отисци, надимци, државе и адресе задњег скока</string>
+  <string name="enter_exit_nodes">Унесите излазне чворове</string>
+  <string name="exclude_nodes">Одстраните чворове</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Отисци, надимци, државе и адресе за одстрањење</string>
+  <string name="enter_exclude_nodes">Унесите чворове за одстрањење</string>
+  <string name="strict_nodes">Стриктни чворови</string>
+  <string name="use_only_these_specified_nodes">Користи САМО ове наведене чворове</string>
+  <string name="bridges">Мостови</string>
+  <string name="use_bridges">Користи bridge</string>
+  <string name="bridges_obfuscated">Мостови са bridges</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Омогући алтернативне чворове за улаз у Тор мрежу</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Омогућити ако су конфигурисани мостови мостови са баговима</string>
+  <string name="ip_address_and_port_of_bridges">IP адреса и порт bridge-а</string>
+  <string name="enter_bridge_addresses">Унесите bridge адресу </string>
+  <string name="relays">Релеји</string>
+  <string name="relaying">Релејирање</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Омогућите вашем уређају да буде релеј без излаза</string>
+  <string name="relay_port">Порт за релеј</string>
+  <string name="listening_port_for_your_tor_relay">Порт за слушање за твој Тор релеј</string>
+  <string name="enter_or_port">Укуцајте ИЛИ порт</string>
+  <string name="relay_nickname">Надимак релеја</string>
+  <string name="the_nickname_for_your_tor_relay">Надимак вашег Тор релеја</string>
+  <string name="enter_a_custom_relay_nickname">Унесите по избору надимак за релеј</string>
+  <string name="reachable_addresses">Доступне адресе</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Покрените као клијента иза firewall-а који је рестриктивно подешен</string>
+  <string name="reachable_ports">Доступни портови</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Портови доступни иза рестриктивног firewall-а</string>
+  <string name="enter_ports">Унесите портове</string>
+  <string name="enable_hidden_services">Хостинг на скривеном сервису</string>
+  <string name="run_servers_accessible_via_the_tor_network">дозволите серверу на уређају да буде доступан преко Тор мреже</string>
+  <string name="enter_localhost_ports_for_hidden_services">унесите localhost портове за скривене сервисе</string>
+  <string name="hidden_service_ports">Портови на скривеном сервису</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">адресабилно име за Ваш скривени сервис (генерише се аутоматско)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">омогућите debug логовоање (мора се користити adb или aLogCat да би се прегледали)</string>
+  <string name="project_home">Почетна за пројекте:</string>
+  <string name="the_tor_license">Тор лиценца</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Софтвер од стране неслужбених издавача:</string>
+  <string name="hidden_service_request">Апликација жели да отвори сакривен порт %S на серверу за Тор мрежу. Ово је сигуран потез уколико верујете апликацији.</string>
+  <string name="found_existing_tor_process">нађен покренути Тор процес...</string>
+  <string name="something_bad_happened">Нешто лоше се догодило. Прегледајте логове</string>
+  <string name="hidden_service_on">сакривен сервис на:</string>
+  <string name="unable_to_read_hidden_service_name">нисам у могућности да прочитам име сакривеног сервиса</string>
+  <string name="unable_to_start_tor">Тор није у могућности да се покрене:</string>
+  <string name="pref_use_sys_iptables_title">Користити уобичајене Иптабеле</string>
+  <string name="pref_use_sys_iptables_summary">користи уграђене ИПтабеле уместо оних које долазе са Орботом</string>
+  <string name="error_installing_binares">Тор бинари нису у могућности да се инсталирају или надограде.</string>
+  <string name="pref_use_persistent_notifications">Увек прикажи икону у тулбару када је Орбот конектован</string>
+  <string name="pref_use_persistent_notifications_title">Стално укључене нотификације</string>
+  <string name="notification_using_bridges">Мостови омогућени!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Изаберите локална и језичка подешавања за Орбот</string>
+  <string name="wizard_locale_title">Изаберите језик</string>
+  <string name="wizard_locale_msg">Користи подразумевајући или пребаци на тренутни језик</string>
+  <string name="btn_save_settings">Сачувај подешавања</string>
+  <string name="menu_vpn">ВПН</string>
+</resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
new file mode 100644
index 0000000..5654a28
--- /dev/null
+++ b/app/src/main/res/values-sv/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot är en gratis proxyapp som möjliggör andra appar att använda internet mer säkert. Orbot använder Tor för att kryptera din internettrafik och döljer den genom att den studsar genom ett antal datorer världen över. Tor är fri programvara och ett öppet nätverk som hjälper dig att skydda dig mot en form av nätverksövervakning som hotar personlig integritet och frihet, hemliga affärsaktiviteter och relationer, och skyddar mot statlig övervakning även kallad trafikanalys.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">start and stop Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot startar...</string>
+  <string name="status_activated">Uppkopplad till Tor nätverket</string>
+  <string name="status_disabled">Orbot är inaktiverad</string>
+  <string name="status_shutting_down">TorService avslutas</string>
+  <string name="tor_process_starting">Startar Tor klient...</string>
+  <string name="tor_process_complete">färdig.</string>
+  <string name="tor_process_waiting">väntar.</string>
+  <string name="not_anonymous_yet">VARNING: Din trafik är inte anonym än! Vänligen konfigurera dina appar att använda HTTP proxy 127.0.0.1:8118 eller SOCKS4A/5 proxy 127.0.0.1:9050</string>
+  <string name="menu_home">Hem</string>
+  <string name="menu_browse">Bläddra</string>
+  <string name="menu_settings">Inställningar</string>
+  <string name="menu_log">Logg</string>
+  <string name="menu_info">Hjälp</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Start</string>
+  <string name="menu_stop">Stopp</string>
+  <string name="menu_about">Om</string>
+  <string name="menu_promo_apps">Skaffa appar...</string>
+  <string name="main_layout_download">Ladda Ner</string>
+  <string name="main_layout_upload">Ladda Upp</string>
+  <string name="button_help">Hjälp</string>
+  <string name="button_close">Stäng</string>
+  <string name="button_about">Om</string>
+  <string name="button_clear_log">Rensa logg</string>
+  <string name="menu_verify">Kontrollera</string>
+  <string name="menu_exit">Avsluta</string>
+  <string name="menu_scan">Skanna BridgeQR</string>
+  <string name="menu_share_bridge">Dela BridgeQR</string>
+  <string name="press_to_start">- tryck länge för att starta -</string>
+  <string name="pref_trans_proxy_group">Transparent proxy (kräver root)</string>
+  <string name="pref_trans_proxy_title">Transparent proxy</string>
+  <string name="pref_trans_proxy_summary">Automatisk torifiering av appar</string>
+  <string name="pref_transparent_all_title">Tor:a Allt</string>
+  <string name="pref_transparent_all_summary">Proxy trafik för alla appar genom Tor</string>
+  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
+  <string name="pref_transparent_port_fallback_summary">VARNING: Kringgår vanliga portar (80, 443, etc). *ANVÄND ENDAST* om \'Alla\' eller \'App\'-läge inte fungerar.</string>
+  <string name="pref_transparent_port_title">Port-lista</string>
+  <string name="pref_transparent_port_summary">Lista över portar att köra genom proxy. *ANVÄND ENDAST* om \'Alla\' eller \'App\'-läge inte fungerar</string>
+  <string name="pref_transparent_port_dialog">Skriv in portar till proxy</string>
+  <string name="pref_has_root">Begär root-åtkomst</string>
+  <string name="pref_has_root_summary">Begär root-åtkomst för transparent proxy</string>
+  <string name="status_install_success">Tor-filerna installerades utan problem!</string>
+  <string name="status_install_fail">De körbara Tor-filerna kunde inte installeras. Kontrollera loggen och underrätta tor-assistants at torproject.org</string>
+  <string name="title_error">Applikationsfel</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Om Orbot</string>
+  <string name="btn_next">Nästa</string>
+  <string name="btn_back">Tillbaka</string>
+  <string name="btn_finish">Slutför</string>
+  <string name="btn_okay">Okej</string>
+  <string name="btn_cancel">Avbryt</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Orbot-information</string>
+  <string name="wizard_details_msg">Orbot är en mjukvara med öppen källkod som använder sig av Tor, LibEvent och Polipo. Den tillhandahåller en lokal HTTP-proxy (8118) och en SOCKS-proxy (9050) till Tor-nätverket. Orbot har också möjligheten att, på rootade enheter, skicka all trafik genom Tor.</string>
+  <string name="wizard_permissions_root">Tillstånd givet</string>
+  <string name="wizard_permissions_stock">Orbot rättigheter</string>
+  <string name="wizard_premissions_msg_root">Utmärkt! Vi har upptäckt att du har root tillstånd aktiverat för Orbot. Vi kommer använda denna makt ansvarsfullt.</string>
+  <string name="wizard_permissions_msg_stock">Det är inte nödvändigt, men Orbot kan bli ett kraftfullare verktyg om din enhet har root tillgång. Använd knappen nedan för att ge Orbot superkrafter!</string>
+  <string name="wizard_permissions_no_root">Om du inte har root tillgång eller inte har en aning om vad vi pratar om, använd bara appar som är gjorda att fungera med Orbot.</string>
+  <string name="wizard_permissions_consent">Jag förstår och vill fortsätta utan Superuser.</string>
+  <string name="wizard_permission_enable_root">Ge Orbot root tillgång</string>
+  <string name="wizard_configure">Konfigurera torifikation</string>
+  <string name="wizard_configure_msg">Orbot ger dig möjligheten att skicka all applikationstrafik genom Tor ELLER att själv välja applikationer individuellt.</string>
+  <string name="wizard_configure_all">Proxy alla appar genom Tor</string>
+  <string name="wizard_configure_select_apps">Välj enskilda appar för Tor</string>
+  <string name="wizard_tips_tricks">Orbot-anpassade appar</string>
+  <string name="wizard_tips_msg">Apparna nedanför var utvecklade att fungera med Orbot. Klicka varje knapp för att installera nu, eller hitta dom senare på Google Play, på GuardianProject.info, eller via F-Droid.org.</string>
+  <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="wizard_tips_twitter">Ställ in Twitter proxy till värd \"localhost\" och port 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Skapa en story och ge den till Tor för säkerhet!</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>
+  <string name="wizard_proxy_help_msg">Om Android-appen du använder har stöd för en HTTP- eller SOCKS-proxy, så kan du konfigurera den at ansluta till Orbot och använda Tor.\n\n\nInställningen för värdnamn är 127.0.0.1 eller \"localhost\". För HTTP är portinställningen 8118. För SOCKS är porten 9050. Du bör använda SOCKS4A eller SOCKS5 om möjligt.\n\n\n\nDu kan lära dig mer om proxy på Android via FAQ på: http://tinyurl.com/proxyandroid\n</string>
+  <string name="wizard_final">Orbot är redo!</string>
+  <string name="wizard_final_msg">Miljoner människor världen över använder sig av Tor av flera olika orsaker.\n\nJournalister och bloggare, människorättsförsvarare, brottsbekämpare, soldater, företag, innevånare i repressiva regimer, och bara vanliga innevånare... och nu är du redo också!</string>
+  <string name="wizard_exit_at_first_screen_toast">Vänligen konfigurera Orbot innan du kan använda den!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Du har anslutit till Tor-nätverket - men detta betyder INTE att din enhet är säker. Du kan använda knappen \'Webbläsare\' för att testa din anslutning. \n\nBesök oss på https://guardianproject.info/apps/orbot eller skicka e-post till help at guardianproject.info för mer information.</string>
+  <string name="tor_check">Det här kommer att öppna din webbläsare mot https://check.torproject.org för att se om Orbot är rätt konfigurerad och du är uppkopplad mot Tor.</string>
+  <string name="pref_hs_group">Gömd Service Hosting</string>
+  <string name="pref_general_group">Allmänt</string>
+  <string name="pref_start_boot_title">Starta Orbot vid Uppstart</string>
+  <string name="pref_start_boot_summary">Starta Orbot automatiskt och anslut till Tor när din Android enhet startar upp</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot tar Tor till Android!\n\nTor hjälper dig att skydda dig från innehållsfiltrering, trafikanalys och nätverksövervakning som hotar integritet, hemlig information och personliga relationer.\n\nDen här guiden hjälper dig att konfigurera Orbot och Tor på din enhet.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Varning</string>
+  <string name="wizard_warning_msg">Bara genom att installera Orbot anonymiseras inte din mobiltrafik.\n\nDu måste ställa in Orbot, din enhet och andra appar för att använda Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Rättigheter</string>
+  <string name="wizard_permissions_root_msg1">Du kan alternativt ge Orbot \'Superuser\' tillgång för att aktivera avancerade inställningar, som till exempel Transparent Proxy.</string>
+  <string name="wizard_permissions_root_msg2">Om du inte vill göra detta, se till att bara använda appar som anpassats till Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Din enhet verkar inte vara rootad eller ge root eller \'Superuser\'-åtkomst.\n\nVänligen försök använda \'Appar\'-läget i huvudmenyn istället.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox: Integritetsförbättrad webbläsare som går genom Tor</string>
+  <string name="wizard_tips_play">Hitta alla Guardian Project appar på Google Play</string>
+  <string name="wizard_tips_fdroid">Hitta alla Guardian Project-appar i F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Hitta alla Guardian Project-appar på https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparent Proxy</string>
+  <string name="wizard_transproxy_msg">Detta tillåter dina appar att automatiskt köra genom Tor nätverket utan någon konfiguration.</string>
+  <string name="wizard_transproxy_hint">(Markera denna om du inte har någon aning om vad vi pratar om)</string>
+  <string name="wizard_transproxy_none">Ingen</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Aktivera Tor Transparent Proxy för Wifi och USB Thetered Enheter (omstart krävs)</string>
+  <string name="button_grant_superuser">Begär Superuser Tillgång</string>
+  <string name="pref_select_apps">Välj Appar</string>
+  <string name="pref_select_apps_summary">Välj Appar att Leda Genom Tor</string>
+  <string name="pref_node_configuration">Nod Konfiguration</string>
+  <string name="pref_node_configuration_summary">Det här är avancerade inställningar som kan minska din anonymitet</string>
+  <string name="pref_entrance_node">Ingångsnoder</string>
+  <string name="pref_entrance_node_summary">Fingeravtryck, nicks, länder, och adresser för första hoppet</string>
+  <string name="pref_entrance_node_dialog">Skriv in Ingångs Noder</string>
+  <string name="pref_allow_background_starts_title">Tillåt start i bakgrunden</string>
+  <string name="pref_allow_background_starts_summary">Låt alla appar säga åt Orbot att starta Tor och relaterade tjänster</string>
+  <string name="button_proxy_all">Allt genom proxy</string>
+  <string name="button_proxy_none">Inget genom proxy</string>
+  <string name="button_invert_selection">Invertera val</string>
+  <string name="pref_proxy_title">Utgående nätverksproxy (Valfri)</string>
+  <string name="pref_proxy_type_title">Proxy-typ</string>
+  <string name="pref_proxy_type_summary">Protokoll att använda för proxyserver: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Skriv in Proxy Typ</string>
+  <string name="pref_proxy_host_title">Proxy-värd</string>
+  <string name="pref_proxy_host_summary">Proxyserverns värdnamn</string>
+  <string name="pref_proxy_host_dialog">Skriv in Proxy Värd</string>
+  <string name="pref_proxy_port_title">Utgående Proxy Port</string>
+  <string name="pref_proxy_port_summary">Proxyserverns port</string>
+  <string name="pref_proxy_port_dialog">Skriv in Proxy port</string>
+  <string name="pref_proxy_username_title">Utgående proxy användarnamn</string>
+  <string name="pref_proxy_username_summary">Proxyanvändarnamn (Valfri)</string>
+  <string name="pref_proxy_username_dialog">Ange proxyanvändarnamn</string>
+  <string name="pref_proxy_password_title">Utgående proxy lösenord</string>
+  <string name="pref_proxy_password_summary">Proxylösenord (Valfri)</string>
+  <string name="pref_proxy_password_dialog">Ange proxylösenord</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Ställer in full transparent proxyfiering...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Ställer in app-baserad transparent proxyfiering...</string>
+  <string name="transparent_proxying_enabled">Transparent proxy AKTIVERAD</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy aktiverad för Tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">VARNING: kunde ej starta transparent proxy!</string>
+  <string name="transproxy_rules_cleared">TransProxy regler rensade</string>
+  <string name="couldn_t_start_tor_process_">Kunde inte starta Tor-process:</string>
+  <string name="privoxy_is_running_on_port_">Polipo körs på port:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Ställer in port-baserad transparent proxyfiering...</string>
+  <string name="bridge_error">Bro Error</string>
+  <string name="bridge_requires_ip">För att använda bro funktionen måste du skriva in minst en bro IP adress.</string>
+  <string name="send_email_for_bridges">Skicka ett email till bridges at torproject.org med linjen \"get bridges\" ensamt som meddelande från ett gmail konto.</string>
+  <string name="error">Fel</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Din NåbaraAdresser inställning orsakade ett undantag!</string>
+  <string name="your_relay_settings_caused_an_exception_">Din relä inställning orsakade ett undantag!</string>
+  <string name="exit_nodes">Utgångsnoder</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingeravtryck, nicks, länder, och adresser för sista hoppet</string>
+  <string name="enter_exit_nodes">Skriv in Exit Noder</string>
+  <string name="exclude_nodes">Exkludera Noder</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingeravtryck, nicks, länder och adresser att exkludera</string>
+  <string name="enter_exclude_nodes">Skriv in Exkluderade Noder</string>
+  <string name="strict_nodes">Strikta Noder</string>
+  <string name="use_only_these_specified_nodes">Använd *enbart* dessa specificerade noder</string>
+  <string name="bridges">Broar</string>
+  <string name="use_bridges">Använd Broar</string>
+  <string name="bridges_obfuscated">Förvillande Broar</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Aktivera alternativa ingångsnoder till Tor nätverket</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktivera om konfigurerade broar är förvillande broar</string>
+  <string name="ip_address_and_port_of_bridges">IP adress och port för broar</string>
+  <string name="enter_bridge_addresses">Skriv in Bro Adresser</string>
+  <string name="relays">Reläer</string>
+  <string name="relaying">Överföring</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Aktivera din enhet till att vara ett icke-utgångsrelä</string>
+  <string name="relay_port">Relä Port</string>
+  <string name="listening_port_for_your_tor_relay">Lyssningsport för din Tor relä</string>
+  <string name="enter_or_port">Allmänt</string>
+  <string name="relay_nickname">Relä namn</string>
+  <string name="the_nickname_for_your_tor_relay">Namnet för din Tor relä</string>
+  <string name="enter_a_custom_relay_nickname">Skriv in ett anpassat relä namn</string>
+  <string name="reachable_addresses">Nåbara Adresser</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Kör som klient bakom en brandvägg med restriktiva policys</string>
+  <string name="reachable_ports">Nåbara portar</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Portar nåbara bakom en restriktiv brandvägg</string>
+  <string name="enter_ports">Skriv in portar</string>
+  <string name="enable_hidden_services">Gömd Tjänstehosting</string>
+  <string name="run_servers_accessible_via_the_tor_network">Tillåt server på enheten att vara tillgänglig via Tor nätverket</string>
+  <string name="enter_localhost_ports_for_hidden_services">Skriv in localhost portar för gömda tjänster</string>
+  <string name="hidden_service_ports">Gömda Tjänsteportar</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">det adresserade namnet för din gömda tjänst (genereras automatiskt)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Aktivera debug loggen för output (måste använda adb eller aLogCat för att se)</string>
+  <string name="project_home">Projektets hemsidor:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor-licensen</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Tredjepartsprogramvara:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">En app vill öppna gömd tjänsteport %S till Tor nätverket. Detta är säkert om du litar på appen.</string>
+  <string name="found_existing_tor_process">hittade existerande Tor process...</string>
+  <string name="something_bad_happened">Något dåligt hände. Kolla loggen.</string>
+  <string name="hidden_service_on">gömd tjänst på:</string>
+  <string name="unable_to_read_hidden_service_name">kan inte läsa gömda tjänstens namn</string>
+  <string name="unable_to_start_tor">Kan inte starta Tor:</string>
+  <string name="unable_to_reset_tor">Starta om din enhet, kunde inte återställa Tor!</string>
+  <string name="pref_use_sys_iptables_title">Använd standard Iptables</string>
+  <string name="pref_use_sys_iptables_summary">Använd den inbyggda iptables binären istället för den som kommer med Orbot</string>
+  <string name="error_installing_binares">Tor binärerna kunde inte installeras eller uppgraderas.</string>
+  <string name="pref_use_persistent_notifications">Behåll alltid ikonen i verktygsfältet när Orbot är ansluten</string>
+  <string name="pref_use_persistent_notifications_title">Alltid-På Notifikationer</string>
+  <string name="pref_use_expanded_notifications">Visa utökad notis med Tors utgångsland och IP</string>
+  <string name="pref_use_expanded_notifications_title">Utökade notiser</string>
+  <string name="notification_using_bridges">Broar aktiverade!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Språk</string>
+  <string name="set_locale_summary">Välj plats och språk för Orbot</string>
+  <string name="wizard_locale_title">Välj språk</string>
+  <string name="wizard_locale_msg">Lämna standard eller byt nuvarande språk</string>
+  <string name="powered_by">drivs av Tor</string>
+  <string name="btn_save_settings">Spara Inställningar</string>
+  <string name="no_internet_connection_tor">Ingen internetanslutning; Tor är i standby-läge...</string>
+  <string name="bandwidth_">Bandbredd:</string>
+  <string name="down">nere</string>
+  <string name="up">uppe</string>
+  <string name="pref_disable_network_title">Ingen auto-sömn för nätverket</string>
+  <string name="pref_disable_network_summary">Låt Tor sova när inget internet finns tillgängligt</string>
+  <string name="newnym">Du har bytt till en ny Tor identitet!</string>
+  <string name="menu_verify_browser">Webbläsare</string>
+  <string name="menu_use_chatsecure">Använd ChatSecure</string>
+  <string name="permission_manage_tor_label">Hantera Tor</string>
+  <string name="permission_manage_tor_description">Låt denna app kontrollera Tor-servicen</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Det verkar inte som att du har Orfox installerad. Vill du ha hjälp med det, eller ska vi bara öppna webbläsaren?</string>
+  <string name="install_apps_">Installera appar?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Ingen nätverksanslutning. Försätter Tor i dvala...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Nätverksanslutningen fungerar. Väcker Tor...</string>
+  <string name="updating_settings_in_tor_service">uppdaterar inställningar i Tor-tjänsten</string>
+  <string name="pref_socks_title">Tor-SOCKS</string>
+  <string name="pref_socks_summary">Port som Tor erbjuder sin SOCKS-proxy på (standard: 9050 eller 0 för att inaktivera)</string>
+  <string name="pref_socks_dialog">SOCKS-port-inställningar</string>
+  <string name="pref_transport_title">Tor TransProxy-port</string>
+  <string name="pref_transport_summary">Port som Tor erbjuder sin transparenta proxy på (standard: 9040 eller 0 för att inaktivera)</string>
+  <string name="pref_transport_dialog">TransProxy-port-inställningar</string>
+  <string name="pref_dnsport_title">Tor DNS-port</string>
+  <string name="pref_dnsport_summary">Port som Tor erbjuder sin DNS på (standard: 5400 eller 0 för att inaktivera)</string>
+  <string name="pref_dnsport_dialog">DNS-port-inställningar</string>
+  <string name="pref_torrc_title">Torrc anpassad konfiguration</string>
+  <string name="pref_torrc_summary">ENDAST EXPERTER: ange torrc konfiguration direkt</string>
+  <string name="pref_torrc_dialog">Anpassad Torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string>
+  <string name="your_tor_public_ips_">Ditt publika IP via Tor:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Vänligen inaktivera den här appen i Android->Inställningar->Appar om du har problem med Orbot:</string>
+  <string name="app_conflict">Appkonflikt</string>
+  <string name="pref_transproxy_refresh_title">Transproxy auto-uppdatering</string>
+  <string name="pref_transproxy_refresh_summary">Sätt Transproxy regler igen när nätverksstatus ändras</string>
+  <string name="pref_transproxy_flush_title">Transproxy TVINGA BORTTAGNING</string>
+  <string name="pref_transproxy_flush_summary">Klicka här för att rensa alla transproxy nätverksregler NU</string>
+  <string name="transparent_proxy_rules_flushed_">Regler för transparent proxy rensade!</string>
+  <string name="you_do_not_have_root_access_enabled">Du har inte root-åtkomst aktiverad</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Du kan behöva stänga av och starta Orbot för att ändringar i inställningar ska slå igenom.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kb/s</string>
+  <string name="mbps">mb/s</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Bryggor uppdaterade</string>
+  <string name="restart_orbot_to_use_this_bridge_">Vänligen starta om Orbot för att aktivera ändringarna</string>
+  <string name="menu_qr">QR-koder</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Om ditt mobilnätverk aktivt blockerar Tor så kan du använda en brygga för att komma åt nätverket. VÄLJ en typ av brygga ovan för att aktivera bryggor.</string>
+  <string name="bridge_mode">Bryggläge</string>
+  <string name="get_bridges_email">E-post</string>
+  <string name="get_bridges_web">Webb</string>
+  <string name="activate">Aktivera</string>
+  <string name="apps_mode">Appars VPN-läge</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Du kan få alla appar på din enhet att köra via Tor-nätverket genom att använda VPN-funktionen i Android.\n\n*VARNING* Det här är en ny, experimentell funktion och kanske i vissa fall inte startas automatiskt, eller avslutas. Det bör INTE användas för anonymitet, tan BARA för att ta sig genom brandväggar och filter.</string>
+  <string name="send_email">Skicka e-post</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Du kan få en brygg-adress via e-post, via webben eller genom att skanna en QR-kod för en brygga. Välj \'E-post\' eller \'Webb\' nedan för att begära en brygg-adress.\n\nNär du väl har en adress, kopiera & klistra in den i inställningen för \"Bryggor\" i Orbot och starta om.</string>
+  <string name="install_orweb">Installera Orfox</string>
+  <string name="standard_browser">Standard-webbläsare</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTERA: Endast vanliga Tor-bryggor fungerar på Intel X86/ATOM-enheter</string>
+  <string name="vpn_default_world">Världen</string>
+</resources>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
new file mode 100644
index 0000000..5a24f44
--- /dev/null
+++ b/app/src/main/res/values-ta/strings.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">ஆர்பாட் </string>
+  <string name="app_description">ஆர்பாட், இன்னும பாதுகாப்பான முறையில் இணைய பயன்படுத்த மற்ற பயன்பாடுகள் பலப்படுத்துகிறார் என்று ஒரு இலவச ப்ராக்ஸி பயன்பாடு ஆகும். ஆர்பாட் உங்கள் இணைய போக்குவரத்து குறியாக்க தோர் பயன்படுத்துகிறது மற்றும் அதன் பின்னர் உலகம் முழுவதும் கணினிகள் ஒரு தொடர் மூலம் எதிர்க்கிறது அதை மறுத்தவர். தோர் இலவச மென்பொருள் மற்றும் நீங்கள் போக்குவரத்து பகுப்பாய்வு
  என்ற தனிப்பட்ட சுதந்திரம் மற்றும் தனியுரிமை, ரகசிய வணிக நடவடிக்கைகள் மற்றும் உறவுகள், மற்றும் மாநில பாதுகாப்பை அச்சுறுத்தும் நெட்வொர்க் கண்காணிப்பு வடிவ எதிராக பாதுகாக்க உதவுகிறது என்று ஒரு திறந்த நெட்வொர்க் ஆகும்.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">தோர் துவக்க மற்றும் நிறுத்த</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">ஆர்பாட் துவங்குகிறது...</string>
+  <string name="status_activated">தோர் நெட்வொர்க் இணைக்கப்பட்ட</string>
+  <string name="status_disabled">ஆர்பாட் நிறுத்தப்பட்டது</string>
+  <string name="tor_process_starting">தோர் துவங்கப்படுகிறது...</string>
+  <string name="tor_process_complete">முடிந்தது.</string>
+  <string name="tor_process_waiting">காத்திருக்கிறது</string>
+  <string name="not_anonymous_yet">எச்சரிக்கை: உங்கள் போக்குவரத்து இன்னும் அநாமதேய அல்ல! HTTP பதிலாள் 127.0.0.1:8118 அல்லது SOCKS4A அல்லது SOCKS5 ப்ராக்ஸி 127.0.0.1:9050 பயன்படுத்த உங்கள் பயன்பாடுகள் கட்டமைக்க கொள்ளவும்</string>
+  <string name="menu_home">ஹோம்</string>
+  <string name="menu_browse">உலவிடு</string>
+  <string name="menu_settings">அமைப்புகள்</string>
+  <string name="menu_log">பதிவுகள்</string>
+  <string name="menu_info">உதவி</string>
+  <string name="menu_start">துவங்கு</string>
+  <string name="menu_stop">நிறுத்து</string>
+  <string name="menu_about">ஆர்பாட் பற்றி</string>
+  <string name="main_layout_download">பதிவிறக்கு</string>
+  <string name="main_layout_upload">பதிவேற்று</string>
+  <string name="button_help">உதவி</string>
+  <string name="button_close">மூடு</string>
+  <string name="button_about">ஆர்பாட் பற்றி </string>
+  <string name="button_clear_log">பதிவுகளை நீக்கு</string>
+  <string name="menu_verify">சரி பார்த்தல்</string>
+  <string name="menu_exit">வெளியேறு</string>
+  <string name="menu_scan">ஸ்கேன் BridgeQR</string>
+  <string name="menu_share_bridge">BridgeQR பகிர்ந்திடு</string>
+  <string name="press_to_start">- தொடங்க தொடர்ந்து அழுத்துக -</string>
+  <string name="pref_transparent_port_fallback_summary">எச்சரிக்கை: பொதுவான துறைகளை (80, 443, போன்றவை) circumvents. * பயன்படுத்த மட்டுமே * \'அனைத்து\' அல்லது \'ஆப்\' முறையில் வேலை இல்லை என்றால்.</string>
+  <string name="wizard_title">ஆர்பாட் </string>
+  <string name="wizard_btn_tell_me_more">ஆர்பாட் பற்றி</string>
+  <string name="btn_next">அடுத்து</string>
+  <string name="btn_back">பின் செல்</string>
+  <string name="btn_finish">முடித்திடு</string>
+  <string name="btn_okay">சரி</string>
+  <string name="btn_cancel">ரத்து செய்</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">ஆர்பாட் பற்றிய தகவல்</string>
+  <string name="wizard_details_msg">Orbot தோர், LibEvent மற்றும் Polipo கொண்டுள்ளது என்று ஒரு திறந்த மூல பயன்பாடு ஆகும். இது ஒரு local HTTP பதிலாள் (8118) மற்றும் தோர் நெட்வொர்க் ஒரு SOCKS ப்ராக்ஸி (9050) வழங்குகிறது. Orbot மேலும் தோர் மூலம் அனைத்து இணைய போக்குவரத்து அனுப்பும் திறனை, ROOTED சாதனத்தில் கொண்டிருக்கிறது.</string>
+  <string name="wizard_permissions_root">அனுமதி வழங்கப்பட்டது</string>
+  <string name="wizard_tips_duckgo">டக் டக் கோ தேடுபொறி செயலி</string>
+  <string name="wizard_proxy_help_info">பதிலாள் அமைப்புகள்</string>
+  <string name="wizard_final">ஆர்பாட் தயாராக உள்ளது!</string>
+  <string name="wizard_exit_at_first_screen_toast">தயவு செய்து, ஆர்பாடை கட்மைத்த பின் பயன்படுத்தவும்</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">எச்சரிக்கை</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">அனுமதிகள்</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">ஆர்பாடுடன் செயல்படும் செயலிகள்</string>
+  <!--Transparent Proxy screen-->
+  <string name="pref_select_apps">செயலிகளை தேர்ந்தெடு</string>
+  <string name="pref_proxy_password_summary">பதிலாள் கடவுச்சொல் (கட்டாயமற்ற)</string>
+  <string name="pref_proxy_password_dialog">பதிலாள் கடவுச்சொல்லை உள்ளிடவும்</string>
+  <string name="status">நிலை</string>
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
new file mode 100644
index 0000000..81d5f0f
--- /dev/null
+++ b/app/src/main/res/values-th/strings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">เริ่มและหยุด Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_activated">เชื่อมต่อกับเครือข่าย Tor</string>
+  <string name="tor_process_complete">เสร็จ</string>
+  <string name="tor_process_waiting">กำลังรอ</string>
+  <string name="not_anonymous_yet">คำเตือน: ข้อมูลจราจรของคุณยังไม่เป็นนิรนาม! กรุณาตั้งค่าโปรแกรมของคุณให้ใช้ HTTP พร็อกซีที่ 127.0.0.1:8118 หรือใช้ SOCKS4A หรือ SOCKS5 พร็อกซีที่ 127.0.0.1:9050</string>
+  <string name="menu_home">หน้าหลัก</string>
+  <string name="menu_browse">เลือก</string>
+  <string name="menu_settings">ตั้งค่า</string>
+  <string name="menu_log">ปูม</string>
+  <string name="menu_info">ช่วยเหลือ</string>
+  <string name="menu_start">เริ่ม</string>
+  <string name="menu_stop">หยุด</string>
+  <string name="menu_about">เกี่ยวกับ</string>
+  <string name="button_help">ช่วยเหลือ</string>
+  <string name="button_close">ปิด</string>
+  <string name="button_about">เกี่ยวกับ</string>
+  <string name="button_clear_log">ล้างปูม</string>
+  <string name="menu_verify">ตรวจสอบ</string>
+  <string name="menu_exit">ออก</string>
+  <string name="press_to_start">- แตะค้างเพื่อเริ่ม -</string>
+  <string name="pref_trans_proxy_group">พร็อกซีล่องหน (ต้องการสิทธิ์ Root)</string>
+  <string name="pref_trans_proxy_title">พร็อกซีล่องหน</string>
+  <string name="pref_trans_proxy_summary">ให้โปรแกรมใช้งาน Tor โดยอัตโนมัติ</string>
+  <string name="pref_transparent_all_title">ใช้ Tor กับทุกอย่าง</string>
+  <string name="pref_transparent_all_summary">ให้การจราจรของทุกโปรแกรมผ่านพร็อกซีของ Tor</string>
+  <string name="pref_transparent_port_fallback_summary">คำเตือน: หลีกเลี่ยงพอร์ตทั่วไป (เช่น 80, 443) *ใช้ก็ต่อเมื่อ* โหมด \'ทั้งหมด\' หรือ \'โปรแกรม\' ใช้งานไม่ได้</string>
+  <string name="pref_transparent_port_title">รายการพอร์ต</string>
+  <string name="pref_transparent_port_summary">รายการพอร์ตที่ผ่านพร็อกซี *ใช้ก็ต่อเมื่อ* โหลด \'ทั้งหมด\' หรือ \'โปรแกรม\' ใช้งานไม่ได้</string>
+  <string name="pref_transparent_port_dialog">ระบุพอร์ตที่จะให้ผ่านพร็อกซี</string>
+  <string name="pref_has_root">ต้องการสิทธิ์ root</string>
+  <string name="pref_has_root_summary">ต้องการสิทธิ์ root เพื่อใช้งานพร็อกซีล่องหน</string>
+  <string name="status_install_success">ติดตั้งไบนารีของ Tor สำเร็จแล้ว</string>
+  <string name="status_install_fail">ไม่สามารถติดตั้งไบนารีของ Tor ได้ โปรดตรวจสอบปูมและแจ้งปัญหาที่ tor-assistants at torproject.org</string>
+  <string name="title_error">โปรแกรมทำงานผิดพลาด</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">เกี่ยวกับ Orbot</string>
+  <string name="btn_next">ต่อไป</string>
+  <string name="btn_back">ถอยหลัง</string>
+  <string name="btn_finish">เสร็จ</string>
+  <string name="btn_okay">ตกลง</string>
+  <string name="btn_cancel">ยกเลิก</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">รายละเอียดเกี่ยวกับ Orbot</string>
+  <string name="wizard_permissions_root">ให้สิทธิ์แล้ว</string>
+  <string name="wizard_permissions_stock">สิทธิ์ของ Orbot</string>
+  <string name="wizard_premissions_msg_root">ยอดเยี่ยม! เราพบว่าคุณให้สิทธิ์ root กับ Orbot เราจะใช้สิทธิ์นี้อย่างชาญฉลาด</string>
+  <string name="wizard_permissions_msg_stock">ถึงจะไม่ใช่เรื่องจำเป็น แต่ถ้าหาก Orbot จะทำงานได้อย่างมีประสิทธิภาพมากขึ้นถ้าได้รับสิทธิ์ root ใช้ปุ่มด้านล่างเพื่อมอบพลังนี้ให้ Orbot!</string>
+  <string name="wizard_permissions_no_root">ถ้าคุณไม่มีสิทธิ์ root หรือไม่เข้าใจว่าเรากำลังพูดถึงอะไรอยู่ ให้ใช้เฉพาะโปรแกรมที่สร้างมาเพื่อใช้กับ Orbot เท่านั้น</string>
+  <string name="wizard_permissions_consent">ฉันเข้าใจและต้องการทำต่อโดยไม่ใช้สิทธิ์ Superuser</string>
+  <string name="wizard_permission_enable_root">ให้สิทธิ์ root แก่ Orbot</string>
+  <string name="wizard_configure">ตั้งค่าการใช้งานผ่าน Tor</string>
+  <string name="wizard_configure_msg">Orbot มีตัวเลือกให้คุณส่งข้อมูลการจราจรของทุกโปรแกรมผ่าน Tor หรือเลือกใช้งานเฉพาะโปรแกรมก็ได้</string>
+  <string name="wizard_configure_all">ให้ทุกโปรแกรมผ่านพร็อกซีของ Tor</string>
+  <string name="wizard_configure_select_apps">เลือกโปรแกรมที่จะให้ใช้ Tor</string>
+  <string name="wizard_tips_tricks">โปรแกรมที่ใช้ได้กับ Orbot</string>
+  <string name="wizard_tips_proxy">การตั้งค่าพร็อกซี - เรียนรู้การตั้งค่าโปรแกรมให้ทำงานกับ Orbot ได้</string>
+  <string name="wizard_proxy_help_info">ตั้งค่าพร็อกซี</string>
+  <string name="wizard_final">Orbot พร้อมใช้งานแล้ว!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">จะใช้เว็บเบราว์เซอร์ของคุณเปิดหน้า https://check.torproject.org เพื่อตรวจสอบว่าการตั้งค่าของ Orbot ถูกต้องหรือไม่ และคุณได้เชื่อมต่อกับ Tor หรือไม่</string>
+  <string name="pref_general_group">ทั่วไป</string>
+  <string name="pref_start_boot_title">เริ่ม Orbot เมื่อเปิดระบบ</string>
+  <string name="pref_start_boot_summary">เริ่ม Orbot โดยอัตโนมัติและให้เชื่อมต่อกับ Tor เมื่ออุปกรณ์แอนดรอยด์ของคุณเริ่มทำงาน</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">คำเตือน</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">สิทธิ์</string>
+  <string name="wizard_permissions_root_msg1">คุณสามารถเลือกให้สิทธิ์ Superuser แก่ Orbot เพื่อเปิดใช้งานคุณสมบัติขั้นสูง เช่น พร็อกซีล่องหนได้</string>
+  <string name="wizard_permissions_root_msg2">ถ้าคุณไม่ต้องการ โปรดแน่ใจว่าคุณใช้โปรแกรมที่สร้างมาเพื่อใช้กับ Orbot</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">โปรแกรมที่ใช้ได้กับ Orbot</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">พร็อกซีล่อง</string>
+  <string name="wizard_transproxy_msg">จะอนุญาตให้โปรแกรมของคุณทำงานผ่านเครือข่าย Tor อัตโนมัติโดยไม่ต้องตั้งค่าใดๆ</string>
+  <string name="wizard_transproxy_hint">(ติ๊กตัวเลือกนี้ถ้าคุณไม่เข้าใจเรื่องที่เรากำลังอธิบาย)</string>
+  <string name="wizard_transproxy_none">ไม่มี</string>
+  <string name="pref_transparent_tethering_title">การเชื่อมต่อพ่วงผ่าน Tor</string>
+  <string name="pref_transparent_tethering_summary">เปิดใช้งานพร็อกซีล่องหนของ Tor ให้อุปกรณ์อื่นที่เชื่อมผ่าน Wifi และ USB (ต้องเริ่มใหม่)</string>
+  <string name="button_grant_superuser">ร้องขอการเข้าถึงสิทธิ์ Superuser</string>
+  <string name="pref_select_apps">เลือกโปรแกรม</string>
+  <string name="pref_select_apps_summary">เลือกโปรแกรมที่จะให้เชื่อมต่อผ่าน Tor</string>
+  <string name="pref_node_configuration">การตั้งค่าโหนด</string>
+  <string name="pref_node_configuration_summary">การตั้งค่าขั้นสูงเหล่านี้ทำให้ความเป็นนิรนามของคุณลดลงได้</string>
+  <string name="pref_entrance_node">โหนดทางเข้า</string>
+  <string name="pref_entrance_node_summary">ลายนิ้วมือ, ชื่อเล่น, ประเทศ และที่อยู่ของฮอพแรก</string>
+  <string name="pref_entrance_node_dialog">ระบุโหนดทางเข้า</string>
+  <string name="pref_proxy_type_summary">โพรโทคอลที่ใช้สำหรับเซิร์ฟเวอร์พร็อกซี: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">ระบุชนิดของพร็อกซี</string>
+  <string name="pref_proxy_host_dialog">ระบุเครื่องพร็อกซี</string>
+  <string name="pref_proxy_port_dialog">ระบุพอร์ตของพร็อกซี</string>
+  <string name="status">สถานะ</string>
+  <string name="setting_up_full_transparent_proxying_">กำลังติดตั้งพร็อกซีล่องหนแบบเต็ม…</string>
+  <string name="setting_up_app_based_transparent_proxying_">กำลังติดตั้งพร็อกซีล่องหนแบบระบุโปรแกรม…</string>
+  <string name="transparent_proxying_enabled">พร็อกซีล่องหนถูกเปิดใช้งาน</string>
+  <string name="transproxy_enabled_for_tethering_">พร็อกซีล่องหนถูกเปิดใช้สำหรับการเชื่อมต่อพ่วง!</string>
+  <string name="warning_error_starting_transparent_proxying_">คำเตือน: เกิดข้อผิดพลาดขณะที่พร็อกซีล่องหนเริ่มทำงาน</string>
+  <string name="transproxy_rules_cleared">กฎของพร็อกซีล่องหนถูกล้าง</string>
+  <string name="couldn_t_start_tor_process_">ไม่สามารถเริ่มโพรเซสของ Tor</string>
+  <string name="setting_up_port_based_transparent_proxying_">กำลังติดตั้งพร็อกซีล่องหนแบบระบุพอร์ต…</string>
+  <string name="bridge_error">สะพานขัดข้อง</string>
+  <string name="bridge_requires_ip">ในการใช้งานคุณสมบัติสะพาน คุณต้องระบุที่อยู่ไอพีของสะพานอย่างน้อย 1 ไอพี </string>
+  <string name="send_email_for_bridges">ส่งอีเมลไปที่ bridges at torproject.org โดยระบุแค่ \"get bridges\" ในเนื้อความอีเมล แล้วส่งโดยใช้บัญชีผู้ใช้ gmail</string>
+  <string name="error">ผิดพลาด</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">การตั้งค่า ReachableAddresses ของคุณทำให้เกิดข้อผิดพลาด</string>
+  <string name="your_relay_settings_caused_an_exception_">การตั้งค่ารีเลย์ของคุณทำให้เกิดข้อผิดพลาด</string>
+  <string name="exit_nodes">โหนดทางออก</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">ลายนิ้วมือ, ชื่อเล่น, ประเทศ และที่อยู่ของฮอพสุดท้าย</string>
+  <string name="enter_exit_nodes">ระบุโหนดทางออก</string>
+  <string name="exclude_nodes">โหนดยกเว้น</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">ลายนิ้วมือ, ชื่อเล่น, ประเทศ และที่อยู่ที่ละเว้น</string>
+  <string name="enter_exclude_nodes">ระบุโหนดยกเว้น</string>
+  <string name="strict_nodes">โหนดเข้มงวด</string>
+  <string name="use_only_these_specified_nodes">ใช้ *เฉพาะ* โหนดที่ระบุเหล่านี้เท่านั้น</string>
+  <string name="bridges">สะพาน</string>
+  <string name="use_bridges">ใช้งานสะพาน</string>
+  <string name="bridges_obfuscated">สะพานที่ถูกอำพราง</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">เปิดใช้งานโหนดทางเข้าอื่นเข้าสู่เครือข่าย Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">เปิดใช้งานถ้าสะพานที่ถูกตั้งค่าเป็นสะพานอำพราง</string>
+  <string name="ip_address_and_port_of_bridges">ที่อยู่ไอพีและพอร์ตของสะพาน</string>
+  <string name="enter_bridge_addresses">ระบุที่อยู่ของสะพาน</string>
+  <string name="relays">รีเลย์</string>
+  <string name="relaying">การรีเลย์</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">ทำให้อุปกรณ์ของคุณทำงานเป็นรีเลย์แบบไม่ใช่ทางออก</string>
+  <string name="relay_port">พอร์ตรีเลย์</string>
+  <string name="listening_port_for_your_tor_relay">พอร์ตที่ให้รีเลย์ของ Tor ทำงาน</string>
+  <string name="enter_or_port">ระบุพอร์ตของ OR</string>
+  <string name="relay_nickname">ชื่อเล่นของรีเลย์</string>
+  <string name="the_nickname_for_your_tor_relay">ชื่อเล่นสำหรับรีเลย์ของ Tor ของคุณ</string>
+  <string name="enter_a_custom_relay_nickname">ระบุชื่อเล่นของรีเลย์โดยกำหนดเอง</string>
+  <string name="reachable_addresses">ที่อยู่ซึ่งเข้าถึงได้</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">ทำงานเป็นเครื่องลูกข่ายหลังไฟร์วอลล์ด้วยนโยบายแบบเข้มงวด</string>
+  <string name="reachable_ports">พอร์ตที่เข้าถึงได้</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">พอร์ตที่เข้าถึงได้หลังไฟร์วอลล์แบบเข้มงวด</string>
+  <string name="enter_ports">ระบุพอร์ต</string>
+  <string name="enter_localhost_ports_for_hidden_services">ระบุพอร์ตของ localhost สำหรับให้บริการไม่เปิดเผยทำงาน </string>
+  <string name="hidden_service_ports">พอร์ตของบริการไม่เปิดเผย</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">ชื่อที่ใช้ระบุสำหรับบริการไม่เปิดเผยของคุณ (สร้างโดยอัตโนมัติ)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">เปิดให้ปูมดีบั๊กแสดงผล (ต้องใช้ adb หรือ aLogCat เพื่อดู)</string>
+  <string name="project_home">ที่อยู่โครงการ:</string>
+  <string name="the_tor_license">สัญญาอนุญาตของ Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">ซอฟต์แวร์โดยผู้ผลิตอื่น:</string>
+  <string name="hidden_service_request">โปรแกรมต้องการเปิดพอร์ต %S ที่ซ่อนอยู่ของเซิร์ฟเวอร์ให้เชื่อมกับเครือข่าย Tor การกระทำนี้ปลอดภัยถ้าคุณเชื่อถือโปรแกรมนั้น</string>
+  <string name="something_bad_happened">เกิดอะไรไม่ดีสักอย่าง ให้ตรวจดูจากปูม</string>
+  <string name="hidden_service_on">บริการไม่เปิดเผยอยู่บน:</string>
+  <string name="unable_to_read_hidden_service_name">ไม่สามารถอ่านชื่อของบริการไม่เปิดเผย</string>
+  <string name="unable_to_start_tor">ไม่สามารถเริ่ม Tor</string>
+  <string name="pref_use_sys_iptables_title">ใช้ Iptables ปริยาย</string>
+  <string name="pref_use_sys_iptables_summary">ใช้ไบนารีของ iptables ที่มีอยู่แล้วแทนตัวที่แถมมากับ Orbot</string>
+  <string name="error_installing_binares">ไม่สามารถติดตั้งหรือปรับรุ่นไบนารีของ Tor</string>
+  <string name="pref_use_persistent_notifications">แสดงไอคอนในทูลบาร์เสมอเมื่อ Orbot เชื่อมต่ออยู่</string>
+  <string name="pref_use_persistent_notifications_title">การแจ้งเตือนแบบตลอดเวลา</string>
+  <string name="notification_using_bridges">เปิดใช้งานสะพานแล้ว!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">เลือกโลแคลและภาษาสำหรับ Orbot</string>
+  <string name="wizard_locale_title">เลือกภาษา</string>
+  <string name="wizard_locale_msg">ใช้ค่าปริยายหรือเลือกภาษาปัจจุบัน</string>
+  <string name="btn_save_settings">บันทึกการตั้งค่า</string>
+</resources>
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
new file mode 100644
index 0000000..25b99db
--- /dev/null
+++ b/app/src/main/res/values-tl/strings.xml
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">simulan at ihinto ang Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Nagsisimula na ang Orbot…</string>
+  <string name="status_activated">Konektado sa Tor network</string>
+  <string name="status_disabled">Naka-deactivate ang Orbot</string>
+  <string name="tor_process_starting">Binubuksan ang Tor client…</string>
+  <string name="tor_process_complete">kumpleto na.</string>
+  <string name="tor_process_waiting">nag-hihintay</string>
+  <string name="not_anonymous_yet">BABALA: Ang iyong traffic ay hindi pa anonimo! Kung maaari sana ay ikompigura muna ang iyong applications na gumamit ng HTTP proxy 127.0.0.1:8118 o kaya ay SOCKS4A o kaya ay SOCKS5 proxy 127.0.0.1:9050</string>
+  <string name="menu_home">Tahanan</string>
+  <string name="menu_browse">Mag-browse</string>
+  <string name="menu_settings">Settings</string>
+  <string name="menu_log">Tala</string>
+  <string name="menu_info">Tulong</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Simulan</string>
+  <string name="menu_stop">Ihinto</string>
+  <string name="menu_about">Tungkol</string>
+  <string name="main_layout_download">Download</string>
+  <string name="main_layout_upload">Upload</string>
+  <string name="button_help">Tulong</string>
+  <string name="button_close">Isara</string>
+  <string name="button_about">Tungkol</string>
+  <string name="button_clear_log">Linisin ang tala</string>
+  <string name="menu_verify">Tiyakin</string>
+  <string name="menu_exit">Labasan</string>
+  <string name="menu_share_bridge">Ipamahagi ang BridgeQR</string>
+  <string name="press_to_start">- pindutin ng matagal para mag umpisa -</string>
+  <string name="pref_trans_proxy_group">Nanganganinag na pag Po-proxy (Kailangan ang Root)</string>
+  <string name="pref_trans_proxy_title">Nanganganinag na pag Po-proxy </string>
+  <string name="pref_trans_proxy_summary">Kusang pag Torifying ng mga Apps</string>
+  <string name="pref_transparent_all_title">Tor lahat</string>
+  <string name="pref_transparent_all_summary">I-proxy ang traffic ng lahat ng apps gamit ang Tor</string>
+  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
+  <string name="pref_transparent_port_fallback_summary">BABALA: Dayain ang mga karaniwang ports (80, 443, etc). *GAMITIN LAMANG* kung \'Lahat\' o kaya ang \'App\' na paraan ay hindi gumagana.</string>
+  <string name="pref_transparent_port_title">Lisatahan ng Port</string>
+  <string name="pref_transparent_port_summary">Lisatahan ng mga ports sa proxy. *GAMITIN LAMANG* kung \'Lahat\' o kaya ang \'App\' na paraan ay hindi gumagana.</string>
+  <string name="pref_transparent_port_dialog">Ipasok ang ports sa proxy</string>
+  <string name="pref_has_root">Humiling ng daanan sa Root</string>
+  <string name="pref_has_root_summary">Humiling ng daanan sa Root para sa nanganganinag na pag Po-proxy</string>
+  <string name="status_install_success">Ang Tor binaries ay matagumpay na i-install.</string>
+  <string name="status_install_fail">Ang Tor binary files ay hindi na install. Paki tignan ang tala at magbigay alam sa tor-assistants at torproject.org</string>
+  <string name="title_error">May mali sa Application</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Tungkol sa Orbot</string>
+  <string name="btn_next">Susunod</string>
+  <string name="btn_back">Balik</string>
+  <string name="btn_finish">Wakas</string>
+  <string name="btn_okay">Okay</string>
+  <string name="btn_cancel">Kanselahin</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Ilang detalye sa Orbot</string>
+  <string name="wizard_details_msg">Ang Orbot ay isang open-source application na naglalaman ng Tor, LibEvent at Polipo. Ito ay nagbibigay ng local HTTP proxy (8118) at SOCKS proxy (9050) sa Tor network. Ang Orbot ay nagbibigay din ng kakayahan, sa mga rooted device, na ipadala ang lahat ng trapiko sa internet sa pamamagitan  ng Tor.</string>
+  <string name="wizard_permissions_root">Napahintulotan na</string>
+  <string name="wizard_permissions_stock">Pahintulot ng Orbot</string>
+  <string name="wizard_premissions_msg_root">Mahusay! Natuklasan namin na mayroon pahintulot ang Orbot para sa root. Gagamitin namin ito ng mabuti.</string>
+  <string name="wizard_permissions_msg_stock">Ito ay hindi kinakailangan, ngunit mas mapapalawig ang kakayahan ng Orbot kung ang iyong device ay meron access sa root. Gamitin ang pindutan sa ibaba para bigyan ng superpowers ang Orbot!</string>
+  <string name="wizard_permissions_no_root">Kung wala kang access sa root o wala kang alam sa sinasabi namin, siguraduhin mu nalamang na gagamit ka ng mga apps na ginawa para sa Orbot.</string>
+  <string name="wizard_permissions_consent">Nauunawaan ko at mag-papatuloy ng walang Superuser</string>
+  <string name="wizard_permission_enable_root">Pahintulutan ang Orbot para sa Root</string>
+  <string name="wizard_configure">Kompigurahin ang Torification</string>
+  <string name="wizard_configure_msg">Binibigyan ka ng Orbot ng pagpipilian na i-route lahat ng application traffic gamit ang Tor o piliin ang application isa-isa.</string>
+  <string name="wizard_configure_all">I-proxy lahat ng Apps gamit ang Tor</string>
+  <string name="wizard_configure_select_apps">Pumili ng isa-isang apps para sa Tor</string>
+  <string name="wizard_tips_tricks">Orbot-enabled Apps</string>
+  <string name="wizard_tips_msg">Ang mga apps sa ibaba ay dinevelop upang gumana sa Orbot. I-click ang button para i-install, o sila ay mahahanap sa Google Play, sa GuardianProject.info website o sa F-Droid.org.</string>
+  <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="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>
+  <string name="wizard_proxy_help_msg">Kung ang ginagamit na Android app ay gumagamit ng HTTP o SOCKS proxy, ibig sabihin lang noon ay pwede mong isaayos para kumunekta sa Orbot sa paggamit ng Tor.\n\n\n Ang host settings ay 127.0.0.1 o \"localhost\". Para naan sa HTTP, ang port setting ay 8118. Para naman sa SOCKS, ang proxy ay 9050. Kailangan mong gamitin ang SOCKS4A o SOCKS5 kung posible.\n \n\n\n Mas marami kang matututunan sa proxying sa Android sa pamamagitan ng FAQ sa: http://tinyurl.com/proxyandroid .\n </string>
+  <string name="wizard_final">Handa na ang Orbot!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Bubuksan nito ang iyong browser sa https://check.torproject.org para matignan kung ang Orbot ay na-kompigura at konektado ka sa Tor.</string>
+  <string name="pref_hs_group">Tagong Service Hosting</string>
+  <string name="pref_general_group">Pangkalahatan</string>
+  <string name="pref_start_boot_title">Umpisahan ang Orboot sa Boot</string>
+  <string name="pref_start_boot_summary">Kusang umpisahan ang Orbot at kumonekta sa Tor sa pag bukas ng iyong Android Device</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Ang Orbot ang nagdala ng Tor sa Android!\n\nAng Tor ay tumutulong sa iyo na sanggain ang pagsala ng nilalaman, pag-analisa ng trapiko at pangmamatyag sa network na mapanganib sa iyong privacy, conpidensyal na impormasyon at personal na relasyon.\n\nAng wizard ang makakatulong sa iyo para isaayos ang Orbot at Tor sa iyong device.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Babala</string>
+  <string name="wizard_warning_msg">Sa pag-install nang Orbot, hindi nito awtomatikong ina-anonymize ang iyong trapiko sa iyong mobile.\n\nKailangan mong isaayos ng tama ang Orbot, sa iyong device at sa iba pang apps para matagumpay na magamit ang Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Mga Pahintulot</string>
+  <string name="wizard_permissions_root_msg1">Maari mong piliin bigyan ng pahintulot ang Orbot ng \'Superuser\' access para ma-enable ang mga advanced features tulad ng Transparent Proxying.</string>
+  <string name="wizard_permissions_root_msg2">Kapag ayaw mo itong gawin, siguraduhing gumamit ng apps na ginawa upang gumana kasama ang Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Mukang ang iyong device ay hindi pa rooted o hindi nagbibigay ng daan sa root o \'Superuser\'.\n\nPakiusap, o hindi kaya subukan ang paraan ng \'Apps\' sa pangunahing screen.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox: Privacy-enhanced browser na gumagana sa pamamagitan ng Tor.</string>
+  <string name="wizard_tips_play">Hanapin ang lahat ng Guardian Project apps sa Google Play</string>
+  <string name="wizard_tips_fdroid">Hanapin ang lahat ng Guardian Project apps sa F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Hanapin ang lahat ng Guardian Project apps sa https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparent Proxying</string>
+  <string name="wizard_transproxy_msg">Ito ay bibigyan ng pahintulot ang iyong mga apps na kusang mag-run sa Tor network kahit walang pag-kompigura na ginawa.</string>
+  <string name="wizard_transproxy_hint">(Lagyan ng check ang box na ito kung wala kang alam sa sinasabi namin)</string>
+  <string name="wizard_transproxy_none">Wala</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">I-enable ang Tor Transparent Proxying para sa Wifi at USB Tethered Devices (kailangan mag restart)</string>
+  <string name="button_grant_superuser">Humiling ng Superuser Access</string>
+  <string name="pref_select_apps">Pumili ng Apps</string>
+  <string name="pref_select_apps_summary">Pumili ng Apps para i-route sa Tor</string>
+  <string name="pref_node_configuration">Pagkompigura ng Node</string>
+  <string name="pref_node_configuration_summary">Ang mga ito ay advanced settings na maaring bawasan ang iyong anonymity</string>
+  <string name="pref_entrance_node">Entrance Nodes</string>
+  <string name="pref_entrance_node_summary">Fingerprints, nicks, mga bansa at mga address para sa unang lukso</string>
+  <string name="pref_entrance_node_dialog">Pumasok sa Entrance Nodes</string>
+  <string name="pref_allow_background_starts_title">Pahintulutan na magsimula sa background</string>
+  <string name="pref_allow_background_starts_summary">Hayaan ang kahit anong app na sabihin kay Orbot na magsimula ng Tor at anumang malapit na serbisyo.</string>
+  <string name="button_proxy_all">Proxy All</string>
+  <string name="button_proxy_none">Proxy None</string>
+  <string name="button_invert_selection">Baliktarin ang napili</string>
+  <string name="pref_proxy_title">Outbound Network Proxy (Optional)</string>
+  <string name="pref_proxy_type_title">Outbound Proxy Type</string>
+  <string name="pref_proxy_type_summary">Mga protocol na gagamitin para sa proxy server: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Ilagay ang Proxy Type</string>
+  <string name="pref_proxy_host_title">Outbound Proxy Host</string>
+  <string name="pref_proxy_host_summary">Proxy Server hostname</string>
+  <string name="pref_proxy_host_dialog">Ilagay ang Proxy Host</string>
+  <string name="pref_proxy_port_title">Outbound Proxy</string>
+  <string name="pref_proxy_port_summary">Proxy Server Port</string>
+  <string name="pref_proxy_port_dialog">Ilagay ang Proxy port</string>
+  <string name="pref_proxy_username_title">Outbound Proxy Username</string>
+  <string name="pref_proxy_username_summary">Proxy Username (Optional)</string>
+  <string name="pref_proxy_username_dialog">Ilagay ang Proxy Username</string>
+  <string name="pref_proxy_password_title">Outbound Proxy Password</string>
+  <string name="pref_proxy_password_summary">Proxy Password (Optional)</string>
+  <string name="pref_proxy_password_dialog">Ilagay ang Proxy Password</string>
+  <string name="status">Katayuan</string>
+  <string name="setting_up_full_transparent_proxying_">Isinasaayos ang kabuuang transparent proxying...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Isinasaayos ang app-based transparent proxying...</string>
+  <string name="transparent_proxying_enabled">Na i-enable na ang Transparent proxying</string>
+  <string name="transproxy_enabled_for_tethering_">Na i-enable na ang TransProxy para sa Thethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">BABALA: error sa pag start ng transparent proxying!</string>
+  <string name="transproxy_rules_cleared">Nalinis na ang mga batas ng TransProxy</string>
+  <string name="couldn_t_start_tor_process_">Hindi ma umpisahan ang proseso ng Tor:</string>
+  <string name="privoxy_is_running_on_port_">Ang Polipo ay gumagana ngayon sa port:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Isinasaayos ang port-based transpaprent proxying...</string>
+  <string name="bridge_error">Error sa Bridge</string>
+  <string name="bridge_requires_ip">Para magamit ang feature ng bridge, kailangan mong mag lagay ng kahit isang bridge IP address.</string>
+  <string name="send_email_for_bridges">Magpadala ng email sa bridges at torproject.org na mayroong linyang  \"get bridges\" at wala ng iba pang kasama sa katawa ng email gamit ang isang gmail account.</string>
+  <string name="error">Error</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Ang iyong ReachableAddresses settings ay nag sanhi ng exception!</string>
+  <string name="your_relay_settings_caused_an_exception_">Ang iyong relay settings ay nag sanhi ng exception!</string>
+  <string name="exit_nodes">Exit Nodes</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, mga bansa at address para sa huling talon</string>
+  <string name="enter_exit_nodes">Enter Exit Nodes</string>
+  <string name="exclude_nodes">Hindi kasama ang Nodes</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, mga bansa at mga address na hindi isasama</string>
+  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
+  <string name="strict_nodes">Strict Nodes</string>
+  <string name="use_only_these_specified_nodes">Gumamit ng *only* sa mga ispesipikong nodes </string>
+  <string name="bridges">Bridges</string>
+  <string name="use_bridges">Gumamit ng Bridges</string>
+  <string name="bridges_obfuscated">Obfuscated Bridges</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">I-enable ang kahaliling entrance nodes sa Tor Network</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">I-enable kung ang naisaayos na bridges ay obfuscated bridges</string>
+  <string name="ip_address_and_port_of_bridges">IP address at port ng bridges</string>
+  <string name="enter_bridge_addresses">Ilagay ang Bridge Addresses</string>
+  <string name="relays">Relays</string>
+  <string name="relaying">Relaying</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">I-enable ang iyong device na non-exit relay</string>
+  <string name="relay_port">Relay Port</string>
+  <string name="listening_port_for_your_tor_relay">Pinapakinggan ang port para sa iyong Tor relay</string>
+  <string name="enter_or_port">I-lagay ang OR port</string>
+  <string name="relay_nickname">Relay nickname</string>
+  <string name="the_nickname_for_your_tor_relay">Ang nickname para sa iyong Tor relay</string>
+  <string name="enter_a_custom_relay_nickname">I-lagay ang pasadyang relay nickname</string>
+  <string name="reachable_addresses">Reachable Addresses</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Patakbuhin bilang kliente sa likod ng firewall na may istriktong polisiya</string>
+  <string name="reachable_ports">Reachable Ports</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable sa likod ng istriktong firewall</string>
+  <string name="enter_ports">I-lagay ang ports</string>
+  <string name="enable_hidden_services">Nakatagong Service Hosting</string>
+  <string name="run_servers_accessible_via_the_tor_network">pahintulutan sa on-device server na maging malalapitan sa pamamagitan ng Tor network</string>
+  <string name="enter_localhost_ports_for_hidden_services">I-lagay ang localhost ports para sa nakatagong serbisyo</string>
+  <string name="hidden_service_ports">Tagong Service Ports</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">ang addressable na pangalan sa iyong tagong serbisyo (awtomatikong nabuo)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">paganahiin ang debug log para sa output (kailangang gamitin ang adb o aLogCat para makita)</string>
+  <string name="project_home">Project Home(s):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/
+</string>
+  <string name="the_tor_license">Ang Tor License</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3rd-Party-Software:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">May app na gustong buksan ang nakatagong server port %S sa Tor network. Ito ay ligtas kung pinagkakatiwalaan ang app.</string>
+  <string name="found_existing_tor_process"> nakakita ng umiiral na Tor process...</string>
+  <string name="something_bad_happened">May nangyaring masama. Tingnan ang log</string>
+  <string name="hidden_service_on">nakatagong serbisyo sa:</string>
+  <string name="unable_to_read_hidden_service_name">hindi mabasa ang pangalan ng tagong serbisyo</string>
+  <string name="unable_to_start_tor">Hindi masimulan ang Tor:</string>
+  <string name="unable_to_reset_tor">I-reboot ang iyong device, hindi ma-reset ang Tor!</string>
+  <string name="pref_use_sys_iptables_title">Gumamit ng Default na Iptables</string>
+  <string name="pref_use_sys_iptables_summary">gamitin ang built-in iptables binary kaysa sa isang nabigkis kasama ng Orbot</string>
+  <string name="error_installing_binares">Ang Tor binaries ay hindi ma-install o ma-upgrade.</string>
+  <string name="pref_use_persistent_notifications">Palaging panatilihin ang icon sa toolbar kapag ang Orbot ay naka-connect</string>
+  <string name="pref_use_persistent_notifications_title">Palaging i-On ang Notifications</string>
+  <string name="pref_use_expanded_notifications">Ipakita ang pinalaking notification kasama ng Tor exit country at IP</string>
+  <string name="pref_use_expanded_notifications_title">Pinalawak na Notifications</string>
+  <string name="notification_using_bridges">Bridges enabled!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Wika</string>
+  <string name="set_locale_summary">Pumili ng locale at wika para sa Orbot</string>
+  <string name="wizard_locale_title">Pumili ng Wika</string>
+  <string name="wizard_locale_msg">Iwanang default o palitan ang kasalukuyang wika</string>
+  <string name="powered_by">powered by Tor</string>
+  <string name="btn_save_settings">I-Save ang Settings</string>
+  <string name="no_internet_connection_tor">Walang connection sa internet; Ang Tor ay naka-standby mode...</string>
+  <string name="bandwidth_">Bandwidth:</string>
+  <string name="down">baba</string>
+  <string name="up">taas</string>
+  <string name="pref_disable_network_title">Walang Auto-Sleep sa Network</string>
+  <string name="pref_disable_network_summary">Ilagay ang Tor sa sleep kapag walang internet na pwede</string>
+  <string name="newnym">Ikaw ay nagpalit ng bagong pagkakakilanlan sa Tor!</string>
+  <string name="menu_verify_browser">Browser</string>
+  <string name="menu_use_chatsecure">Gamitin ang ChatSecure</string>
+  <string name="permission_manage_tor_label">Manage Tor</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Activate</string>
+  <string name="apps_mode">Apps VPN Mode</string>
+  <string name="send_email">Send Email</string>
+  <string name="install_orweb">I-install ang Orfox</string>
+  <string name="standard_browser">Standard Browser</string>
+  <string name="vpn_default_world">Mundo</string>
+</resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
new file mode 100644
index 0000000..ac75025
--- /dev/null
+++ b/app/src/main/res/values-tr/strings.xml
@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot başka uygulamaların interneti daha güvenli olarak kullanmasını sağlayan ücretsiz bir proxy uygulamasıdır. Orbot Tor\'u kullanarak internet trafiğinizi şifreler ve dünya üzerindeki pek çok farklı bilgisayardan geçirerek gizler. Tor sizin kişisel özgürlüğünüzü ve mahremiyetinizi, gizli ticari aktivitelerinizi ve bağlantılarınızı koruma altına alan bir yazılım ve açık ağdır.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">https://check.torproject.org/?lang=tr</string>
+  <string name="secure_default_web_url">https://check.torproject.org/?lang=tr</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">Tor\'u başlat ve durdur</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot başlatılıyor...</string>
+  <string name="status_activated">Tor ağına bağlandı</string>
+  <string name="status_disabled">Orbot devre dışı bırakıldı</string>
+  <string name="status_shutting_down">Tor hizmeti kapatılıyor</string>
+  <string name="tor_process_starting">Tor kullanımı başlatılıyor...</string>
+  <string name="tor_process_complete">tamamlandı.</string>
+  <string name="tor_process_waiting">bekliyor.</string>
+  <string name="not_anonymous_yet">UYARI: Bağlantınız henüz anonim değildir! Lütfen uygulamalarınızı HTTP 127.0.0.1:8118  veya SOCKS4A / SOCKS5 127.0.0.1:9050 vekil sunucusu kullanacak şekilde yapılandırınız.</string>
+  <string name="menu_home">Başlangıç</string>
+  <string name="menu_browse">Göz At</string>
+  <string name="menu_settings">Ayarlar</string>
+  <string name="menu_log">Günlük</string>
+  <string name="menu_info">Yardım</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Başlat</string>
+  <string name="menu_stop">Durdur</string>
+  <string name="menu_about">Hakkında</string>
+  <string name="menu_promo_apps">Uygulamaları alın... </string>
+  <string name="main_layout_download">İndir</string>
+  <string name="main_layout_upload">Yükle</string>
+  <string name="button_help">Yardım</string>
+  <string name="button_close">Kapat</string>
+  <string name="button_about">Hakkında</string>
+  <string name="button_clear_log">Günlüğü Temizle</string>
+  <string name="menu_verify">Kontrol Et</string>
+  <string name="menu_exit">Çıkış</string>
+  <string name="menu_scan">QR kodu tarama</string>
+  <string name="menu_share_bridge">QR kodu paylaş</string>
+  <string name="press_to_start">- başlatmak için uzun basın -</string>
+  <string name="pref_trans_proxy_group">Şeffaf Vekillendirme (Yeniden Başlatma Gerektirir)</string>
+  <string name="pref_trans_proxy_title">Şeffaf Vekillendirme</string>
+  <string name="pref_trans_proxy_summary">Uygulamalar için Otomatik Tor Uyarlaması</string>
+  <string name="pref_transparent_all_title">Herşeyi Tor ile Uyarla</string>
+  <string name="pref_transparent_all_summary">Tor\'a uyarlanmış uygulamaların vekil sunucu bağlantıları</string>
+  <string name="pref_transparent_port_fallback_title">Vekil Sunucu Yanıtsız Kalma Bildirim Portu</string>
+  <string name="pref_transparent_port_fallback_summary">UYARI: Genel portlardan (80,443, v.b.) kaçınınız. SADECE \'Hepsi\' veya \'Uygulama\' modu çalışmadığında kullanınız.</string>
+  <string name="pref_transparent_port_title">Port Listesi</string>
+  <string name="pref_transparent_port_summary">Vekil sunucu port listesi. *SADECE* \'Hepsi\' veya \'Uygulama\' modu çalışmadığında kullanınız.</string>
+  <string name="pref_transparent_port_dialog">Vekil sunucu portlarını giriniz</string>
+  <string name="pref_has_root">Yönetici Erişimi Talebi</string>
+  <string name="pref_has_root_summary">Şeffaf Vekillendirme için Yönetici Erişimi Talebi</string>
+  <string name="status_install_success">Tor binarileri başarıyla yüklendi!</string>
+  <string name="status_install_fail">Tor binary dosyaları yüklenemedi. Lütfen günlüğü kontrol ediniz ve tor-assistants at torproject.org adresini kullanarak bilgilendirme yapınız.</string>
+  <string name="title_error">Uygulama Hatası</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Orbot Hakkında</string>
+  <string name="btn_next">İleri</string>
+  <string name="btn_back">Geri</string>
+  <string name="btn_finish">Bitir</string>
+  <string name="btn_okay">Tamam</string>
+  <string name="btn_cancel">İptal
+            </string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Bazı Orbot detayları</string>
+  <string name="wizard_details_msg">Orbot; Tor, Libevent ve Polipo içeren bir açık kaynak uygulamadır. Yerel bir HTTP proxy (8118) ve Tor ağı içine SOCKS proxy (9050) sağlamaktadır. Orbot ayrıca rootlu cihazlar için tüm internet trafiğini Tor üzerinden gönderme yeteneğine sahiptir. </string>
+  <string name="wizard_permissions_root">İzin Verildi</string>
+  <string name="wizard_permissions_stock">Orbot İzinleri</string>
+  <string name="wizard_premissions_msg_root">Mükemmel! Root izinlerinizin Orbot için aktif olduğunu saptadık. Bu gücü akıllıca kullanacağız.</string>
+  <string name="wizard_permissions_msg_stock">Gerekli olmamakla birlikte, eğer cihazınızın root erişimi varsa Orbot daha güçlü bir araç olabilir. Orbot\'a süper güçlerini vermek için aşağıdaki butonu kullanın!</string>
+  <string name="wizard_permissions_no_root">Root(superuser) erişiminiz ya da neden bahsettiğimiz hakkında bir fikriniz yoksa sadece eklentilerin Orbot\'la birlikte çalışabilmeleri için yapıldığından emin olun.</string>
+  <string name="wizard_permissions_consent">Anlıyorum ve Superuser olmadan devam etmek istiyorum</string>
+  <string name="wizard_permission_enable_root">Orbot\'a root erişimi ver</string>
+  <string name="wizard_configure">Tor Bildirimlerini Ayarla</string>
+  <string name="wizard_configure_msg">Orbot, tüm uygulamaların veya seçtiğiniz uygulamaların trafiğini Tor üzerinden yönlendirme seçeneği sunar.</string>
+  <string name="wizard_configure_all">Tüm Uygulamaları Tor Üzerinden Vekillendir</string>
+  <string name="wizard_configure_select_apps">Tor için ayrı ayrı uygulamalar seç.</string>
+  <string name="wizard_tips_tricks">Orbot\'un Etkin Olduğu Eklentiler</string>
+  <string name="wizard_tips_msg">Aşağıdaki uygulamalar Orbot ile birlikte çalışmak üzere geliştirilmiştir. Uygulamaları hemen kurmak için ilgili düğmelere tıklayabilir veya uygulamalara daha sonra Google Play, GuardianProject.info web adresi veya F-Droid.org üzerinden erişebilirsiniz.</string>
+  <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="wizard_tips_twitter">Twitter proxy sunucusunu \"localhost\" ve bağlantı noktası 8118 olarak ayarlayın</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Bir öykü yarat ve güvenliği tor\'a bırak!</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>
+  <string name="wizard_exit_at_first_screen_toast">Lütfen kullanmadan önce Orbot\'u yapılandırın!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Bu, Orbot\'un ayarlanıp ayarlanmadığını ve Tor\'a bağlanıp bağlanmadığınızı anlamanız amacıyla tarayıcınızda https://check.torproject.org adresini açacak.</string>
+  <string name="pref_hs_group">Gizlenmiş servis sunucusu</string>
+  <string name="pref_general_group">Genel</string>
+  <string name="pref_start_boot_title">Orbot\'u Telefonla Birlikte Başlat</string>
+  <string name="pref_start_boot_summary">Android cihaz açıldığında otomatik olarak Orbot\'u başlat ve Tor\'a bağlan.</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Uyarı</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">İzinler</string>
+  <string name="wizard_permissions_root_msg1">İsterseniz Orbot\'a \'Superuser\' erişimi vererek saydam proxy gibi gelişmiş ayarları aktif hale getirebilirsiniz.</string>
+  <string name="wizard_permissions_root_msg2">Bunu yapmak istemiyorsanız, lütfen Orbot ile çalışmak üzere yapılmış uygulamalar kullandığınızdan emin olun</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox: Gizliliği geliştirilmiş bir tarayıcı Tor üzerinden çalışır</string>
+  <string name="wizard_tips_play">Google Play\'deki tüm Guardian Projesi uygulamalarına bakın</string>
+  <string name="wizard_tips_fdroid">Tüm Guardian Project uygulamalarını F-Droid vasıtasıyla bulun</string>
+  <string name="wizard_tips_fdroid_org">Tüm Guardian Project uygulamalarına bu adresten erişin https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Şeffaf Vekillendirme</string>
+  <string name="wizard_transproxy_msg">Bu, uygulamalarınızı Tor üzerinden, herhangi bir ayar yapmadan çalıştırmanıza olanak sağlar.</string>
+  <string name="wizard_transproxy_hint">(Neden bahsettiğimiz hakkında bir fikriniz yoksa bu kutucuğu işaretleyin)</string>
+  <string name="wizard_transproxy_none">Hiçbiri</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Kablosuz ağlar için Tor açık proxy ve USB Tethering\'e izin ver (yeniden başlatmayı gerektirir)</string>
+  <string name="button_grant_superuser">Superuser Erişimi Talebi</string>
+  <string name="pref_select_apps">Uygulamaları Seç</string>
+  <string name="pref_select_apps_summary">Tor Üzerinden Yönlendirilecek Uygulamaları Seç</string>
+  <string name="pref_node_configuration">Düğüm Ayarları</string>
+  <string name="pref_node_configuration_summary">Bu ayarlar bağlantınızın anonimliğini azaltabilecek gelişmiş ayarlardır.</string>
+  <string name="pref_entrance_node">Giriş Noktaları</string>
+  <string name="pref_entrance_node_summary">İlk düğüm için parmak izleri, rumuzlar, ülkeler, adresler</string>
+  <string name="pref_entrance_node_dialog">Giriş Düğümlerini Girin</string>
+  <string name="pref_allow_background_starts_title">Arka planda çalışmaya izin ver</string>
+  <string name="pref_allow_background_starts_summary">Herhangi bir uygulamanın Orbot aracılığıyla Tor ve ilgili hizmetleri başlatması için izin ver</string>
+  <string name="button_proxy_all">Tüm bağlantılar için Vekil Sunucu kullan</string>
+  <string name="button_proxy_none">Vekil Sunucu kullanma</string>
+  <string name="button_invert_selection">Ters seçim</string>
+  <string name="pref_proxy_title">Giden Ağ Sunucusu (tercihe bağlı)</string>
+  <string name="pref_proxy_type_title">Giden proxy tipi</string>
+  <string name="pref_proxy_type_summary">Proxy sunucusunu kullanmak için protokoller: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Proxy tipini girin</string>
+  <string name="pref_proxy_host_title">Giden proxy sunucusu</string>
+  <string name="pref_proxy_host_summary">Vekil Sunucusu adı</string>
+  <string name="pref_proxy_host_dialog">Vekil Host\'u girin</string>
+  <string name="pref_proxy_port_title">Giden vekil bağlantı noktası</string>
+  <string name="pref_proxy_port_summary">Vekil Sunucusu bağlantı noktası</string>
+  <string name="pref_proxy_port_dialog">Vekil bağlantı noktasını girin</string>
+  <string name="pref_proxy_username_title">Giden Vekil Kullanıcı Adı</string>
+  <string name="pref_proxy_username_summary">Vekil Kullanıcı Adı (tercihe bağlı)</string>
+  <string name="pref_proxy_username_dialog">Vekil Kullanıcı Adı girin</string>
+  <string name="pref_proxy_password_title">Giden Vekil Parolası</string>
+  <string name="pref_proxy_password_summary">Vekil parolası (tercihe bağlı)</string>
+  <string name="pref_proxy_password_dialog">Vekil Parolası girin</string>
+  <string name="status">Durum</string>
+  <string name="setting_up_full_transparent_proxying_">Tamamen saydam vekil kuruluyor...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Uygulamaya özel saydam proxy kuruluyor...</string>
+  <string name="transparent_proxying_enabled">Saydam vekil AKTİF</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy Tethering\'e açıldı!</string>
+  <string name="warning_error_starting_transparent_proxying_">UYARI: şeffaf proxy başlatılırken hata oluştu</string>
+  <string name="transproxy_rules_cleared">TransProxy kuralları temizlendi</string>
+  <string name="couldn_t_start_tor_process_">Tor işlemi başlatılamadı</string>
+  <string name="privoxy_is_running_on_port_">Polipo bu port üzerinde çalışıyor:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Port tabanlı şeffaf vekillendirme ayarlanıyor...</string>
+  <string name="bridge_error">Köprü hatası</string>
+  <string name="bridge_requires_ip">Köprü özelliğini kullanmak adına, en az bir tane köprü IP adresi girmelisiniz.</string>
+  <string name="send_email_for_bridges">Gmail hesabınızdan bridges at torproject.org adresine içinde sadece \"get bridges\" yazılı bir eposta gönderin.</string>
+  <string name="error">Hata</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">ErişilebilirAdresleriniz ayarlarınız bir istisnaya yol açtı!</string>
+  <string name="your_relay_settings_caused_an_exception_">Tor aktarıcı ayarlarınız bir istisnaya yol açtı!</string>
+  <string name="exit_nodes">Çıkış Düğümleri</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Son düğüm için parmak izleri, rumuzlar, ülkeler, adresler</string>
+  <string name="enter_exit_nodes">Çıkış bağlantılarını girin</string>
+  <string name="exclude_nodes">Şu bağlantıları dahil etmeyin</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Dahil edilmeyecek parmak izleri, takma adlar, ülkeler ve adresler</string>
+  <string name="enter_exclude_nodes">Giriş bağlantılarını girin</string>
+  <string name="strict_nodes">Değişmeyen bağlantılar</string>
+  <string name="use_only_these_specified_nodes">*Sadece* bu bağlantıları kullan</string>
+  <string name="bridges">Köprüler</string>
+  <string name="use_bridges">Köprü kullan</string>
+  <string name="bridges_obfuscated">Gizlenmiş köprüler</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Tor ağına başka giriş bağlantılarına izin ver</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Yapılandırılan köprüler gizlenmiş ise izin ver</string>
+  <string name="ip_address_and_port_of_bridges">Köprülerin IP adresleri ve bağlantı noktaları</string>
+  <string name="enter_bridge_addresses">Köprü Adresleri Gir</string>
+  <string name="relays">Aktarıcılar</string>
+  <string name="relaying">Aktarmak</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Cihazınızı çıkış yapmayan aktarıcı olması için aktif edin</string>
+  <string name="relay_port">Aktarıcı Portu</string>
+  <string name="listening_port_for_your_tor_relay">Tor aktarıcınız için dinleme port\'u</string>
+  <string name="enter_or_port">OR port\'u gir</string>
+  <string name="relay_nickname">Aktarıcı rumuzu</string>
+  <string name="the_nickname_for_your_tor_relay">Tor aktarıcınız için rumuz</string>
+  <string name="enter_a_custom_relay_nickname">Özel aktarıcı rumuzu girin</string>
+  <string name="reachable_addresses">Ulaşılabilir adresler</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Bir güvenlik duvarı arkasındaki sınırlı kullanıcı olarak bağlan</string>
+  <string name="reachable_ports">Ulaşılabilir bağlantı noktaları</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Sınırlayıcı güvenlik duvarı ardındaki ulaşılabilir bağlantı noktaları</string>
+  <string name="enter_ports">Bağlantı noktaları gir</string>
+  <string name="enable_hidden_services">Gizlenmiş Servis Sunucusu</string>
+  <string name="run_servers_accessible_via_the_tor_network">cihazdaki sunucunun Tor ağından ulaşılmasına izin ver</string>
+  <string name="enter_localhost_ports_for_hidden_services">gizlenmiş servis sunucuları için localhost bağlantı noktası gir</string>
+  <string name="hidden_service_ports">Gizlenmiş Servis Bağlantı Noktaları</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Gizlenmiş servisiniz için adreslenebilir ad (otomatik olarak verilmiştir)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">hata giderme kaydını tut (görüntülemek için adb veya aLogCat gerekir)</string>
+  <string name="project_home">Proje adres(ler)i:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor Lisansı</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Üçüncü Parti Yazılım:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Bir uygulama Tor ağında gizlenmiş sunucu bağlantı noktası %S açmak istiyor. Eğer uygulamaya güveniyorsanız bu güvenlidir.</string>
+  <string name="found_existing_tor_process">varolan bir Tor işlemi bulundu...</string>
+  <string name="something_bad_happened">Kötü bir şey oldu. Kayıtlara bakınız</string>
+  <string name="hidden_service_on">gizlenmiş servis:</string>
+  <string name="unable_to_read_hidden_service_name">gizli hizmet adı okunamıyor</string>
+  <string name="unable_to_start_tor">Tor başlatılamadı:</string>
+  <string name="unable_to_reset_tor">Cihazınızı yeniden başlatın, Tor\'u sıfırlamak mümkün değil! </string>
+  <string name="pref_use_sys_iptables_title">Varsayılan Ip tablolarını kullan</string>
+  <string name="pref_use_sys_iptables_summary">Orbot ile birlikte gelenler yerine kurulu iptables binary kullan</string>
+  <string name="error_installing_binares">Tor binary kurulumu veya yükseltilmesi mümkün değil.</string>
+  <string name="pref_use_persistent_notifications">Orbot bağlı olduğu sürece simgeyi araç çubuğunda tut</string>
+  <string name="pref_use_persistent_notifications_title">Bildirimler her zaman açık</string>
+  <string name="pref_use_expanded_notifications">Tor çıkış ülkesi ve IP için genişletilmiş bildirim göster</string>
+  <string name="pref_use_expanded_notifications_title">Genişletilmiş Bildirimler</string>
+  <string name="notification_using_bridges">Köprüler etkinleştirildi!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Dil</string>
+  <string name="set_locale_summary">Orbot için yerel ayarları ve dili seç</string>
+  <string name="wizard_locale_title">Dili seçin</string>
+  <string name="wizard_locale_msg">Varsayılanda bırak veya geçerli dile geç</string>
+  <string name="powered_by">Tor tarafından desteklenmektedir</string>
+  <string name="btn_save_settings">Ayarları kaydet</string>
+  <string name="no_internet_connection_tor">İnternet bağlantısı yok; Tor bekleme modunda...</string>
+  <string name="bandwidth_">Bant genişliği:</string>
+  <string name="down">aşağı</string>
+  <string name="up">yukarı</string>
+  <string name="pref_disable_network_title">Bağlantı yokken Otomatik Uykuya Geç</string>
+  <string name="pref_disable_network_summary">İnternet olmadığında Tor\'u uykuya al</string>
+  <string name="newnym">Yeni bir Tor kimliğine geçiş yaptınız!</string>
+  <string name="menu_verify_browser">Tarayıcı</string>
+  <string name="menu_use_chatsecure">ChatSecure Kullan</string>
+  <string name="permission_manage_tor_label">Tor\'u Yönet</string>
+  <string name="permission_manage_tor_description">Tor servisini kontrol etmek için bu uygulamayı etkinleştir</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orfox yüklü gibi görünmüyor. Bu konuyla alakalı yardım istiyor musun, ya da sadece tarayıcı mı açılsın?</string>
+  <string name="install_apps_">Uygulamalar kurulsun mu?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Hiçbir ağ bağlantısı yok. Tor uyku moduna alınıyor...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Ağ bağlantısı iyi. Tor uyandırılıyor... </string>
+  <string name="updating_settings_in_tor_service">Tor hizmet ayarları güncellemesi</string>
+  <string name="pref_socks_title">SOCKS için Tor kullan</string>
+  <string name="pref_socks_dialog">SOCKS Port Yapılandırma</string>
+  <string name="pref_transport_title">Tor TransProxy Port</string>
+  <string name="pref_transport_summary">Tor Şeffaf Vekil Proxy Port\'u için (varsayılan olarak: 9040 veya devre dışı bırakmak için 0) değerlerini öneriyor</string>
+  <string name="pref_transport_dialog">TransProxy Port Yapılandırma</string>
+  <string name="pref_dnsport_title">Tor DNS Port</string>
+  <string name="pref_dnsport_dialog">DNS Port Yapılandırma</string>
+  <string name="pref_torrc_title">Torrc Özel Yapılandırma</string>
+  <string name="pref_torrc_summary">SADECE UZMANLAR: Doğrudan torrc yapılandırma satırları girin</string>
+  <string name="pref_torrc_dialog">Torrc yapılandırma</string>
+  <string name="wizard_tips_martus">Mobil Martus - Benetech İnsan Hakları Belgeleri Uygulaması</string>
+  <string name="your_tor_public_ips_">Umumi Tor IP adresiniz:</string>
+  <string name="app_conflict">Uygulama çatışması</string>
+  <string name="pref_transproxy_refresh_title">TransProxy Otomatik Yenileme</string>
+  <string name="pref_transproxy_refresh_summary">Ağ durumu değiştiğinde TransProxy kurallarını yeniden uygula</string>
+  <string name="pref_transproxy_flush_title">TransProxy Kurallarını KALDIR</string>
+  <string name="pref_transproxy_flush_summary">Tüm TransProxy ağ kurallarını temizlemek için buraya dokunun</string>
+  <string name="transparent_proxy_rules_flushed_">Şeffaf vekil kuralları silindi!</string>
+  <string name="you_do_not_have_root_access_enabled">ROOT erişim izniniz yok</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Ayarların etkin olması için Orbot\'u durdurup yeniden başlatmak gerekebilir.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Köprüler Güncellendi</string>
+  <string name="restart_orbot_to_use_this_bridge_">Değişiklikleri etkinleştirmek için lütfen Orbot\'u yeniden başlatın</string>
+  <string name="menu_qr">QR Kodları</string>
+  <string name="bridge_mode">Köprü Modu</string>
+  <string name="get_bridges_email">Eposta</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Etkinleştirin</string>
+  <string name="apps_mode">Uygulamalar için VPN Modu</string>
+  <string name="send_email">Eposta Gönder</string>
+  <string name="install_orweb">Orfox yükle</string>
+  <string name="standard_browser">Standart Tarayıcı</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOT: Sadece standart Tor köprüleri Intel X86/ATOM cihazlarda çalışır</string>
+  <string name="vpn_default_world">Dünya</string>
+</resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
new file mode 100644
index 0000000..9672e2c
--- /dev/null
+++ b/app/src/main/res/values-uk/strings.xml
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot — це вільна програма для проксі-з\'єднань, яка дозволяє іншим додаткам безпечніше використовувати інтернет-з\'єднання. Orbot використовує Tor для шифрування інтернет-трафіку, який далі приховується під час пересилання через кілька комп\'ютерів у різних частинах планети. Tor є вільним програмним забезпеченням, а також відкритою мережею, що допомагає захиститися від мережевого стеження, яке загрожує особистій свободі та приватному життю, конфіденційній бізнес-діяльності і контактам, а також державної програми безпеки, що в
 ідома як аналіз трафіку.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">запуск і зупинка Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Запуск Orbot...</string>
+  <string name="status_activated">Під\'єднаний до мережі Tor</string>
+  <string name="status_disabled">«Orbot» від\'єднаний</string>
+  <string name="tor_process_starting">Запускається клієнт Tor...</string>
+  <string name="tor_process_complete">завершено.</string>
+  <string name="tor_process_waiting">очікування...</string>
+  <string name="not_anonymous_yet">Попередження: Ваш трафік ще не анонімний! Будь ласка, налаштуйте свої додатки для використання HTTP проксі 127.0.0.1:8118 або ж SOCKS4A або SOCKS5 проксі 127.0.0.1:9050</string>
+  <string name="menu_home">Домівка</string>
+  <string name="menu_browse">Перегляд</string>
+  <string name="menu_settings">Налаштування</string>
+  <string name="menu_log">Журнал</string>
+  <string name="menu_info">Довідка</string>
+  <string name="menu_start">Запустити</string>
+  <string name="menu_stop">Зупинити</string>
+  <string name="menu_about">Про програму</string>
+  <string name="main_layout_download">Завантажити</string>
+  <string name="main_layout_upload">Завантажити</string>
+  <string name="button_help">Довідка</string>
+  <string name="button_close">Закрити</string>
+  <string name="button_about">Про програму</string>
+  <string name="button_clear_log">Очистити журнал</string>
+  <string name="menu_verify">Перевірка</string>
+  <string name="menu_exit">Вихід</string>
+  <string name="menu_scan">Сканувати BridgeQR</string>
+  <string name="menu_share_bridge">Поділитися BridgeQR</string>
+  <string name="press_to_start">- довге натиснення для запуску -</string>
+  <string name="pref_trans_proxy_group">Прозорий проксі (Потрібен root)</string>
+  <string name="pref_trans_proxy_title">Прозорий проксі</string>
+  <string name="pref_trans_proxy_summary">Автоматична торифікація додатків</string>
+  <string name="pref_transparent_all_title">Направляти все через Tor</string>
+  <string name="pref_transparent_all_summary">Направляти трафік всіх додатків через Tor</string>
+  <string name="pref_transparent_port_fallback_title">Резервний проксі порт</string>
+  <string name="pref_transparent_port_fallback_summary">ПОПЕРЕДЖЕННЯ: Обходить загальні порти (80, 443, і т.д.). *ВИКОРИСТУВУВАТИ ТІЛЬКИ* якщо режими «Все» або «Додатки» не працюють.</string>
+  <string name="pref_transparent_port_title">Список Портів</string>
+  <string name="pref_transparent_port_summary">Список портів для проксифікації. *ВИКОРИСТОВУВАТИ ТІЛЬКИ* якщо режими «Все» або «Додатки» не працюють.</string>
+  <string name="pref_transparent_port_dialog">Введіть порти для проксифікації</string>
+  <string name="pref_has_root">Запитати root доступ</string>
+  <string name="pref_has_root_summary">Запитати root доступ для прозорої проксифікації</string>
+  <string name="status_install_success">Додаток Tor успішно встановленей!</string>
+  <string name="status_install_fail">Не вдалося встановити додаток Tor. Будь ласка, перевірте системний журнал і повідомте нам: tor-assistants at torproject.org</string>
+  <string name="title_error">Помилка додатку</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Про Orbot</string>
+  <string name="btn_next">Вперед</string>
+  <string name="btn_back">Назад</string>
+  <string name="btn_finish">Завершити</string>
+  <string name="btn_okay">OK</string>
+  <string name="btn_cancel">Відміна</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Деякі відомості про програму Orbot</string>
+  <string name="wizard_details_msg">Orbot — це програма з відкритим кодом, яка містить Tor, LibEvent та Polipo. Він надає локальний HTTP-проксі (8118) і SOCKS-проксі (9050) у мережу Tor. Orbot також дозволяє на пристроях з правами root пересилати весь інтернет-трафік через Tor.</string>
+  <string name="wizard_permissions_root">Дозвіл отримано</string>
+  <string name="wizard_permissions_stock">Дозволи Orbot</string>
+  <string name="wizard_premissions_msg_root">Чудово! Ми визначили, що ви надалили root права для Orbot. Ми будемо використовувати цю можливість з розумом.</string>
+  <string name="wizard_permissions_msg_stock"> Хоча це й не вимагається, Orbot може бути потужнішим інструментом, якщо ваш пристрій має права root. Натисніть на кнопку нижче і надайте Orbot суперсилу! </string>
+  <string name="wizard_permissions_no_root">Якщо у вас немає root прав або ви не розумієте про що говоримо, просто впевніться, що використовуєте додатки, розроблені для Orbot.</string>
+  <string name="wizard_permissions_consent">Я розумію і хочу продовжити без прав суперкористувача</string>
+  <string name="wizard_permission_enable_root">Надати root права Orbot</string>
+  <string name="wizard_configure">Налаштувати Tor-ифікацію</string>
+  <string name="wizard_configure_msg">Програма Orbot дає вам можливість маршрутизувати трафік всіх додатків через Tor АБО вибрати додатки для маршрутизації самостійно.</string>
+  <string name="wizard_configure_all">Маршрутизувати всі додатки через Tor</string>
+  <string name="wizard_configure_select_apps">Виберіть додатки для маршрутизації через Tor</string>
+  <string name="wizard_tips_tricks">Orbot-задіяні додатки</string>
+  <string name="wizard_tips_msg">Ми радимо вам завантажити і використовувати додатки, які вміють працювати напряму через Orbot. Натисніть на кнопки нижче, щоб запустити процес встановлення.</string>
+  <string name="wizard_tips_otrchat">ChatSecure - Захищений обмін повідомленнями в Android</string>
+  <string name="wizard_tips_proxy">Налаштування проксі — дізнайтесь як налаштувати додатки для роботи з Orbot</string>
+  <string name="wizard_tips_duckgo">Додаток пошукової системи DuckDuckGo</string>
+  <string name="wizard_tips_twitter">Twitter підтримує http проксі «localhost:8118»</string>
+  <string name="wizard_tips_story_maker">StoryMaker — Запишіть історію і залиште її Tor\'у для безпеки!</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_proxy_help_msg">Якщо програмка для Android, яку Ви використовуєте, підтримує HTTP або SOCKS проксі, то Ви можете налаштувати її на під\'єднання до Orbot і використання Tor.\n\n\n Значення хоста — 127.0.0.1 або «localhost». Для HTTP, номер порту — 8118. Для SOCKS проксі — 9050. По можливості, використовуйте SOCKS4A або SOCKS5.\n \n\n\n Ви можете дізнатись більше про роботу через проксі на Android, прочитавши цей FAQ: http://tinyurl.com/proxyandroid\n</string>
+  <string name="wizard_final">Програма Orbot готова до використання!</string>
+  <string name="wizard_final_msg">Мільйони людей у всьому світі використовують Tor з різних причин.\n\nЖурналісти і блогери, активісти захисту прав людини, судові виконавці, солдати, корпорації, громадяни країн з репресивним режимом, і прості люди… а тепер готові і Ви!</string>
+  <string name="wizard_exit_at_first_screen_toast">Будь ласка, налаштуйте Orbot, перш ніж почнете ним користуватись!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Це призведе до запуску веб-браузера, вибраного на вашому пристрої за замовчуванням, і підключення до сайту https://check.torproject.org, з метою перевірки правильності роботи Orbot і визначення, чи під\'єднані ви до мережі Tor.</string>
+  <string name="pref_hs_group">Приховані сервіси</string>
+  <string name="pref_general_group">Основні</string>
+  <string name="pref_start_boot_title">Запуск Orbot при ввімкненні</string>
+  <string name="pref_start_boot_summary">Автоматичний запуск Orbot та з\'єднання Tor під час запуску вашого пристрою</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot дозволяє використовувати Tor на Android!\n\nTor дозволяє Вам захиститися від фільтрації вмісту, аналізу трафіку і спостереження за мережею, які ставлять під загрозу приватність, конфіденційну інформацію та особисті стосунки.\n\nЦей майстер допоможе Вам налаштувати Orbot і Tor на Вашому пристрої.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Попередження</string>
+  <string name="wizard_warning_msg">Просте встановлення Orbot не зробить автоматично Ваш мобільний трафік анонімним.\n\nВи повинні правильно налаштувати Orbot, Ваш пристрій та інші додатки, щоб успішно використовувати Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Дозволи</string>
+  <string name="wizard_permissions_root_msg1">Ви також можете за бажанням надати Orbot права «Суперкористувача» для доступу до просунутих можливостей, типу \"Прозора Проксифікація\".</string>
+  <string name="wizard_permissions_root_msg2">Якщо ви не хочете робити це, тоді будь ласка, впевніться, що використовуєте додатки створені для роботи з Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Схоже, ваш пристрій не має root-прав або не надає доступу до «Суперкористувача».\n\nБудь ласка, спробуйте натомість режим «Додатки» на головному екрані.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Додатки, що працюють з Orbot:</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: додаток для спілкування з підтримкою Off-the-Record шифрування</string>
+  <string name="wizard_tips_play">Знайти всі додатки Guardian Project на Google Play</string>
+  <string name="wizard_tips_fdroid">Знайти всі додатки Guardian Project на F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Знайти всі додатки Guardian Project на https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Прозоре Проксування</string>
+  <string name="wizard_transproxy_msg">Це дозволить вашим додаткам автоматично працювати в мережі Tor без будь-якої конфігурації.</string>
+  <string name="wizard_transproxy_hint">(Позначте даний пункт, якщо ви не знаєте про що йде мова)</string>
+  <string name="wizard_transproxy_none">Ні</string>
+  <string name="pref_transparent_tethering_title">Роздача Tor</string>
+  <string name="pref_transparent_tethering_summary">Ввімкнути Прозору Проксифікацію Tor для пристроїв з роздачею по Wi-Fi і USB (потрібен перезапуск)</string>
+  <string name="button_grant_superuser">Запитати Доступ Суперкористувача</string>
+  <string name="pref_select_apps">Вибрані додатки</string>
+  <string name="pref_select_apps_summary">Вибрати додатки для направлення через Tor</string>
+  <string name="pref_node_configuration">Конфігурація вузла</string>
+  <string name="pref_node_configuration_summary">Це додаткові налаштування, які можуть знизити вашу анонімність</string>
+  <string name="pref_entrance_node">Вхідні вузли</string>
+  <string name="pref_entrance_node_summary">Відбитки, ніки, країни та адреси для першого стрибка</string>
+  <string name="pref_entrance_node_dialog">Введіть вхідні вузли</string>
+  <string name="button_proxy_all">Усі через проксі</string>
+  <string name="button_proxy_none">Жоден через проксі</string>
+  <string name="button_invert_selection">Інвертувати виділення</string>
+  <string name="pref_proxy_title">Вихідна проксі мережа</string>
+  <string name="pref_proxy_type_title">Тип Проксі</string>
+  <string name="pref_proxy_type_summary">Протокол для використання проксі-сервером: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Введіть Тип Проксі</string>
+  <string name="pref_proxy_host_title">Хост Проксі</string>
+  <string name="pref_proxy_host_summary">Ім\'я хоста проксі-сервера</string>
+  <string name="pref_proxy_host_dialog">Введіть Хост Проксі</string>
+  <string name="pref_proxy_port_title">Порт Проксі</string>
+  <string name="pref_proxy_port_summary">Порт проксі-сервера</string>
+  <string name="pref_proxy_port_dialog">Введіть порт Проксі</string>
+  <string name="pref_proxy_username_title">Ім\'я користувача для вихідного проксі-з\'єднання</string>
+  <string name="pref_proxy_username_summary">Ім\'я користувача для проксі-з\'єднання (вказувати не обов\'язково)</string>
+  <string name="pref_proxy_username_dialog">Введіть Ім\'я користувача проксі-з\'єднання</string>
+  <string name="pref_proxy_password_title">Пароль вихідного проксі-з\'єднання</string>
+  <string name="pref_proxy_password_summary">Пароль проксі-з\'єднання (вказувати не обов\'язково)</string>
+  <string name="pref_proxy_password_dialog">Введіть пароль проксі-з\'єднання</string>
+  <string name="status">Статус</string>
+  <string name="setting_up_full_transparent_proxying_">Встановлення загальної прозорої проксифікації...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Встановлення заснованої на додатках прозорої проксифікації...</string>
+  <string name="transparent_proxying_enabled">Прозора проксифікація ВВІМКНЕНА</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy підтримує Роздачу!</string>
+  <string name="warning_error_starting_transparent_proxying_">УВАГА: помилка запуску прозорої проксифікації!</string>
+  <string name="transproxy_rules_cleared">Правила TransProxy видалені</string>
+  <string name="couldn_t_start_tor_process_">Неможливо запустити Tor: </string>
+  <string name="privoxy_is_running_on_port_">Polipo працює на порті: </string>
+  <string name="setting_up_port_based_transparent_proxying_">Встановлення засноване на портах прозорої проксифікації...</string>
+  <string name="bridge_error">Помилка Мосту</string>
+  <string name="bridge_requires_ip">Для використання мосту, необхідно задати IP адресу як мінімум одного мосту.</string>
+  <string name="send_email_for_bridges">Відправте email на адресу bridges at torproject.org з рядком «get bridges» в тілі повідомлення із облікового запису gmail.</string>
+  <string name="error">Помилка</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Ваші налаштування Доступних Адрес викликали виключення!</string>
+  <string name="your_relay_settings_caused_an_exception_">Налаштування вашого ретранслятора викликали виключення!</string>
+  <string name="exit_nodes">Вихідні Вузли</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Відбитки, ніки, країни та адреси для останнього стрибка</string>
+  <string name="enter_exit_nodes">Введіть Вихідні Вузли</string>
+  <string name="exclude_nodes">Виключені Вузли</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Відбитки, ніки, країни та адреси на виключення</string>
+  <string name="enter_exclude_nodes">Введіть Виключені Вузли</string>
+  <string name="strict_nodes">Точні Вузли</string>
+  <string name="use_only_these_specified_nodes">Використовувати *тільки* ці задані вузли</string>
+  <string name="bridges">Мости</string>
+  <string name="use_bridges">Використрвувати Мости</string>
+  <string name="bridges_obfuscated">Обфусковані Мости</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Включити альтернативні вхідні вузли в мережу Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Задані мости обфусковані</string>
+  <string name="ip_address_and_port_of_bridges">IP адреси і порти мостів</string>
+  <string name="enter_bridge_addresses">Введіть Адреси Мостів</string>
+  <string name="relays">Ретранслятори</string>
+  <string name="relaying">Ретрансляція</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Дозволити вашому пристрою бути невихідним ретранслятором</string>
+  <string name="relay_port">Порт ретранслятора</string>
+  <string name="listening_port_for_your_tor_relay">Слухаючий порт для вашого ретранслятора Tor</string>
+  <string name="enter_or_port">Введіть порт OR</string>
+  <string name="relay_nickname">Ім\'я ретранслятора</string>
+  <string name="the_nickname_for_your_tor_relay">Ім\'я для вашого ретранслятора Tor</string>
+  <string name="enter_a_custom_relay_nickname">Введіть користувацьке ім\'я ретранслятора</string>
+  <string name="reachable_addresses">Доступні Адреси</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Запускати як клієнт за брандмауером з обмежуючими політиками</string>
+  <string name="reachable_ports">Доступні порти</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Порти доступні із обмежуваного брандмауера</string>
+  <string name="enter_ports">Введіть порти</string>
+  <string name="enable_hidden_services">Ввімкнути Приховані Служби</string>
+  <string name="run_servers_accessible_via_the_tor_network">запустити сервери доступні через мережу Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">введіть локальні порти для прихованих служб</string>
+  <string name="hidden_service_ports">Порти Прихованої Служби</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">адресоване ім\'я для вашої прихованої служби (сгенеровано автоматично)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ввімкнути вивід логу налогодження (потрібно використовувати adb або aLogCat для перегляду)</string>
+  <string name="project_home">Домашня сторінка(и) проекту: </string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Ліцензія Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Програми сторонніх розробників: </string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Додаток хоче відкрити прихований порт сервера %S мережі Tor. Це безпечно, якщо ви довіряєте цьому додатку.</string>
+  <string name="found_existing_tor_process">знайдено існуючий процес Tor...</string>
+  <string name="something_bad_happened">Виникла якась помилка. Перевірте лог</string>
+  <string name="hidden_service_on">прихована служба на:</string>
+  <string name="unable_to_read_hidden_service_name">неможливо прочитати ім\'я прихованої служби</string>
+  <string name="unable_to_start_tor">Неможливо запустити Tor:</string>
+  <string name="unable_to_reset_tor">Перезавантажте свій пристрій, не вдається перезапустити Tor!</string>
+  <string name="pref_use_sys_iptables_title">Використовувати Iptables за замовчуванням</string>
+  <string name="pref_use_sys_iptables_summary">використовувати вбудований бінарник iptables замість того що надається з Orbot</string>
+  <string name="error_installing_binares">Бінарні файли Tor не змогли встановитися або оновитися.</string>
+  <string name="pref_use_persistent_notifications">Завжди показувати іконку в панелі завдань коли Orbot підключений</string>
+  <string name="pref_use_persistent_notifications_title">Сповіщення про постійну роботу</string>
+  <string name="pref_use_expanded_notifications">Показати розширене сповіщення з країною виходу Tor та IP</string>
+  <string name="pref_use_expanded_notifications_title">Розширені сповіщення</string>
+  <string name="notification_using_bridges">Мости ввімкнуті!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Мова</string>
+  <string name="set_locale_summary">Вибрати локаль і мову для Orbot</string>
+  <string name="wizard_locale_title">Вибрати Мову</string>
+  <string name="wizard_locale_msg">Залишити за замовчуванням або переключити поточну мову</string>
+  <string name="powered_by">від Tor</string>
+  <string name="btn_save_settings">Зберегти Налаштування</string>
+  <string name="no_internet_connection_tor">Немає інтернет-з\'єднання; Tor в режимі очікування…</string>
+  <string name="bandwidth_">Канал:</string>
+  <string name="down">вх</string>
+  <string name="up">вих</string>
+  <string name="pref_disable_network_title">Не використовувати режим сну</string>
+  <string name="pref_disable_network_summary">Переводити в режим сну при відсутності інтернет-з\'єднання</string>
+  <string name="newnym">Ви перемкнулись на новий ідентифікатор Tor!</string>
+  <string name="menu_use_chatsecure">Використовувати ChatSecure</string>
+  <string name="permission_manage_tor_label">Керування Tor</string>
+  <string name="permission_manage_tor_description">Дозволити додатку керувати сервісом Tor</string>
+  <string name="install_apps_">Встановити додатки?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Немає доступу до мережі інтернет. Tor переходить в режим сну…</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Доступ до мережі хороший. Tor виходить з режиму сну…</string>
+  <string name="updating_settings_in_tor_service">оновлення налаштувань у сервісі Tor</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Порт, який Tor надає своєму SOCKS-проксі (за замовчуванням: 9050 або 0 для вимкнення)</string>
+  <string name="pref_socks_dialog">Налаштування порту SOCKS</string>
+  <string name="pref_transport_title">Порт Tor TransProxy</string>
+  <string name="pref_transport_summary">Порт, який Tor надає своєму відкритому проксі (за замовчуванням: 9040 або 0 для вимкнення)</string>
+  <string name="pref_transport_dialog">Налаштування порту Tor TransProxy</string>
+  <string name="pref_dnsport_title">Порт Tor DNS</string>
+  <string name="pref_dnsport_summary">Порт, який Tor надає своєму DNS (за замовчуванням: 5400 або 0 для вимкнення)</string>
+  <string name="pref_dnsport_dialog">Налаштування порту DNS</string>
+  <string name="pref_torrc_title">Додаткові налаштування Torrc</string>
+  <string name="pref_torrc_summary">ЛИШЕ ДЛЯ ЕКСПЕРТІВ: введіть безпосередні рядки налаштувань torrc</string>
+  <string name="pref_torrc_dialog">Додаткове у Torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus — програма Benetech Human Rights Documentation </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_">Будь ласка, вимкніть цей додаток у Android->Налаштування->Програми, якщо у Вас виникають проблеми з Orbot: </string>
+  <string name="app_conflict">Конфлікт програм</string>
+  <string name="pref_transproxy_refresh_title">Автоперезапуск Transproxy</string>
+  <string name="pref_transproxy_refresh_summary">Повторно застосувати правила Transproxy, коли зміниться стан мережі</string>
+  <string name="pref_transproxy_flush_title">ПРИМУСОВЕ ВИЛУЧЕННЯ Transproxy</string>
+  <string name="pref_transproxy_flush_summary">Натисніть тут, щоб зрівняти усі правила мережі transproxy ЗАРАЗ</string>
+  <string name="transparent_proxy_rules_flushed_">Правила прозорого проксі зрівняно!</string>
+  <string name="you_do_not_have_root_access_enabled">У Вас не ввімкнено ROOT-доступ</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Вам може бути потрібно зупинити і запустити Orbot, щоб зміни налаштувань вступили в дію.</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Мости оновлено</string>
+  <string name="restart_orbot_to_use_this_bridge_">Будь ласка, перезапустіть Orbot, щоб зміни ввійшли в силу</string>
+  <string name="menu_qr">QR-коди</string>
+  <string name="bridge_mode">Режим мосту</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Веб</string>
+  <string name="activate">Активувати</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Ви можете увімкнути пропускання трафіку усіх програм на Вашому прострої через мережу Tor, скориставшись функцією VPN в Android.\n\n*УВАГА* Це нова, експериментальна функція і в деяких випадках може не запуститися автоматично або зупинитись. Її НЕ варто використовувати для анонімності і ЛИШЕ для обходу фаєрволів та фільтрів.</string>
+  <string name="send_email">Надіслати листа</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Ви можете отримати адресу мосту через електронну пошту, веб або відсканувавши QR-код мосту. Оберіть «Email» чи «Веб» унизу, щоб подати запит на адресу мосту.\n\nКоли у Вас буде адреса, скопіюйте і вставте її у розділі «Мости» налаштувань Orbot і перезапустіть його.</string>
+  <string name="standard_browser">Стандартний браузер</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">ПРИМІТКА: Лише стандартні мости Tor працюють на пристроях з Intel X86/Atom</string>
+</resources>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
new file mode 100644
index 0000000..21abd16
--- /dev/null
+++ b/app/src/main/res/values-ur/strings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_browse">براؤز کیجیے</string>
+  <string name="menu_info">مدد</string>
+  <string name="button_help">مدد</string>
+  <string name="button_close">بند کیجیے</string>
+  <string name="btn_back">پیچھے</string>
+  <string name="btn_cancel">تنسیخ کیجیے</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/app/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml
new file mode 100644
index 0000000..785d967
--- /dev/null
+++ b/app/src/main/res/values-uz/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="status_starting_up">Orbot ishga tushirilmoqda…</string>
+  <string name="status_activated">Tor tarmog\'iga ulangan</string>
+  <string name="menu_home">Uy</string>
+  <string name="menu_settings">Moslamalar</string>
+  <string name="menu_info">Yordam</string>
+  <string name="menu_about">Dastur haqida</string>
+  <string name="main_layout_download">Yuklab olish</string>
+  <string name="main_layout_upload">Yuklash</string>
+  <string name="button_help">Yordam</string>
+  <string name="button_close">Yopish</string>
+  <string name="button_about">Dasur haqida</string>
+  <string name="menu_verify">Tekshirish</string>
+  <string name="menu_exit">Chiqish</string>
+  <string name="title_error">Dastur xatosi</string>
+  <string name="wizard_title">Orbot</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <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>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Umumiy</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="pref_proxy_type_dialog">Proksi turini kiriting</string>
+  <string name="pref_proxy_password_summary">Proksi maxfiy so\'zi (Qo\'shimcha)</string>
+  <string name="pref_proxy_password_dialog">Proksi maxfiy so\'zini kiriting</string>
+  <string name="status">Holati</string>
+  <string name="error">Xato</string>
+  <string name="the_tor_license">Tor litsenziyasi</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="found_existing_tor_process">Mavjud bo\'lgan Tor jarayoni topildi...</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Orbot uchun lokal va tilni tanlash</string>
+  <string name="wizard_locale_title">Tilni tanlansh</string>
+  <string name="btn_save_settings">Moslamalarni saqlash</string>
+</resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
new file mode 100644
index 0000000..6562b4e
--- /dev/null
+++ b/app/src/main/res/values-vi/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot là một ứng dụng proxy miễn phí, được thiết kế để làm cho các ứng dụng khác kết nối với Internet một cách an toàn. Orbot sử dụng Tor để mã hóa các kết nối Internet rồi ẩn danh nó thông qua một loạt các nút trong mạng Tor. Tor là phần mềm miễn phí và là một mạng lưới mở giúp bạn chống lại sự giám sát mạng, vốn đe dọa riêng tư trực tuyến, hay các hoạt động bí mật...</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">khởi động và ngừng Tor</string>
+  <string name="tor_proxy_service_process">dịch vụ tor proxy</string>
+  <string name="status_starting_up">Ortbot đang khởi động...</string>
+  <string name="status_activated">Đã kết nối với mạng Tor</string>
+  <string name="status_disabled">Orbot đã được vô hiệu hóa</string>
+  <string name="status_shutting_down">Đang tắt dịch vụ Tor</string>
+  <string name="tor_process_starting">Bắt đầu Tor</string>
+  <string name="tor_process_complete">hoàn thành.</string>
+  <string name="tor_process_waiting">đang chờ.</string>
+  <string name="not_anonymous_yet">Chú ý: Kết nối của bạn chưa phải là ẩn danh! Hãy cài đặt các ứng dụng của bạn để sử dụng HTTP Proxy 127.0.0.1:8118, Proxy SOCKS4A hoặc proxy SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Trang chủ</string>
+  <string name="menu_browse">Trình duyệt</string>
+  <string name="menu_settings">Thiết lập</string>
+  <string name="menu_log">Nhật ký</string>
+  <string name="menu_info">Giúp đỡ</string>
+  <string name="menu_apps">Mạng riêng ảo</string>
+  <string name="menu_start">Bắt đầu</string>
+  <string name="menu_stop">Ngừng</string>
+  <string name="menu_about">Về</string>
+  <string name="menu_promo_apps">Các ứng dụng khác...</string>
+  <string name="main_layout_download">Tải về</string>
+  <string name="main_layout_upload">Tải lên</string>
+  <string name="button_help">Giúp đỡ</string>
+  <string name="button_close">Đóng</string>
+  <string name="button_about">Giới thiệu</string>
+  <string name="button_clear_log">Xóa nhật ký</string>
+  <string name="menu_verify">Kiểm tra</string>
+  <string name="menu_exit">Thoát</string>
+  <string name="menu_scan">Quét mã BridgeQR</string>
+  <string name="menu_share_bridge">Xuất mã BridgeQR</string>
+  <string name="press_to_start">- nhấn giữ để khởi động -</string>
+  <string name="pref_trans_proxy_group">Proxy trong suốt (Yêu cầu root)</string>
+  <string name="pref_trans_proxy_title">Proxy trong suốt</string>
+  <string name="pref_trans_proxy_summary">Tự động áp dụng Tor cho ứng dụng</string>
+  <string name="pref_transparent_all_title">Áp dụng Tor cho tất cả ứng dụng</string>
+  <string name="pref_transparent_all_summary">Chuyển tất cả các kết nối của các ứng dụng qua Tor</string>
+  <string name="pref_transparent_port_fallback_title">Cổng Proxy dự phòng</string>
+  <string name="pref_transparent_port_fallback_summary">CHÚ Ý: Tránh dùng các cổng thông dụng (80, 443, v.v...). *CHỈ* dùng nếu chế độ \"áp dụng Tor cho tất cả\" hoặc \"chọn ứng dụng\" không dùng được.</string>
+  <string name="pref_transparent_port_title">Danh sách cổng</string>
+  <string name="pref_transparent_port_summary">Liệt kê các cổng để áp dụng proxy. *CHỈ* dùng nếu chế độ \"áp dụng Tor cho tất cả\" hoặc \"chọn ứng dụng\" không dùng được.</string>
+  <string name="pref_transparent_port_dialog">Điền số cổng để áp dụng proxy</string>
+  <string name="pref_has_root">Yêu cầu root</string>
+  <string name="pref_has_root_summary">Yêu cầu root để kích hoạt proxy trong suốt</string>
+  <string name="status_install_success">Tập nhị phân của Tor đã được cài đặt!</string>
+  <string name="status_install_fail">Tập nhị phân của Tor bị lỗi khi cài đặt. Xin hãy kiểm tra nhật ký và thông báo cho tor-assistants at torproject.org</string>
+  <string name="title_error">Ứng dụng bị lỗi</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Về Orbot</string>
+  <string name="btn_next">Tiếp</string>
+  <string name="btn_back">Trở về</string>
+  <string name="btn_finish">Kết thúc</string>
+  <string name="btn_okay">Đồng ý</string>
+  <string name="btn_cancel">Hủy</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Vài chi tiết về Orbot</string>
+  <string name="wizard_details_msg">Orbot là một ứng dụng mã nguồn mở có chứa Tor, LibEvent và Polipo. Nó cung cấp một proxy HTTP nội bộ (8118) và một proxy SOCKS (9050) tới mạng Tor. Orbot cũng có khả năng chuyển tất cả các kết nối Internet thông qua Tor trên các thiết bị đã root.</string>
+  <string name="wizard_permissions_root">Đã cho phép quyền</string>
+  <string name="wizard_permissions_stock">Quyền truy cập của Orbot</string>
+  <string name="wizard_premissions_msg_root">Tuyệt! Chúng tôi đã nhận ra máy bạn có root được kích hoạt cho Orbot. Chúng tôi sẽ tận dụng điều này.</string>
+  <string name="wizard_permissions_msg_stock">Mặc dù không cần thiết, nhưng Orbot có thể trở thành một công cụ mạnh mẽ hơn nếu thiết bị của bạn có root. Hãy ấn nút dưới đây để cho phép Orbot có \"siêu năng lực\"!</string>
+  <string name="wizard_permissions_no_root">Nếu bạn không root hoặc không rành về những gì chúng tôi trình bày, xin chỉ dùng những ứng dụng đã được tạo ra để dùng kết hợp với Orbot.</string>
+  <string name="wizard_permissions_consent">Tôi hiểu rõ và sẽ tiếp tục dùng mà không cần root</string>
+  <string name="wizard_permission_enable_root">Cho phép Orbot truy cập root</string>
+  <string name="wizard_configure">Cài đặt thông báo cho Tor</string>
+  <string name="wizard_configure_msg">Orbot cho phép chuyển tất cả các kết nối của các ứng dụng qua Tor HOẶC áp dụng cho từng ứng dụng riêng lẻ.</string>
+  <string name="wizard_configure_all">Áp dụng proxy Tor cho tất cả các ứng dụng</string>
+  <string name="wizard_configure_select_apps">Lựa chọn từng ứng dụng để áp dụng Tor</string>
+  <string name="wizard_tips_tricks">Các ứng dụng đã được áp dụng Tor</string>
+  <string name="wizard_tips_msg">Những ứng dụng sau đây đã được thiết lập để dùng với Orbot. Nhấn ứng dụng bất kỳ để cài đặt ngay bây giờ, hoặc bạn có thể tìm những ứng dụng này trên Google Play, tại trang GuardianProject.info hoặc qua F-Droid.org.</string>
+  <string name="wizard_tips_otrchat">ChatSecure - Ứng dụng IM (tin nhắn tức thời) bảo mật cho Android</string>
+  <string name="wizard_tips_proxy">Cài đặt Proxy - Tìm hiểu cách thiết lập ứ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="wizard_tips_twitter">Cài proxy của Twitter với host là \"localhost\" và cổng là 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Viết một câu chuyện rồi để nó cho Tor để bảo mật!</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
+  <string name="wizard_proxy_help_info">Cài đặt proxy</string>
+  <string name="wizard_proxy_help_msg">Nếu ứng dụng Android mà bạn đang dùng hỗ trợ giao thức proxy HTTP hay SOCKS, thì bạn có thể cấu hình nó kết nối tới Orbot và sử dụng Tor.\n\n\n Cài đặt host mặc định là 127.0.0.1 hoặc \"localhost\". Với HTTP, cổng là 8118, còn SOCKS là 9050. Bạn nên dùng SOCKS4A hoặc SOCKS5 nếu có thể.\n \n\n\n Bạn có thể tìm hiểu thêm về cấu hình proxy trên Android qua mục FAQ tại: http://tinyurl.com/proxyandroid</string>
+  <string name="wizard_final">Orbot đã sẵn sàng!</string>
+  <string name="wizard_final_msg">Hàng trăm ngàn người trên toàn thế giới dùng Tor với nhiều lý do. Những nhà báo, blogger, các nhà hoạt động nhân quyền, an ninh, quân đội, tổ chức, công dân của những nước bị đang bị đàn áp, hoặc chỉ là những người dân bình thường... và bây giờ là bạn cũng đang chuẩn bị là một trong số họ!</string>
+  <string name="wizard_exit_at_first_screen_toast">Vui lòng thiết lập Orbot trước khi bạn sử dụng nó!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Bạn đã kết nối thành công tới mạng Tor - nhưng điều đó KHÔNG có nghĩa là thiết bị của bạn đã hoàn toàn an toàn. Bạn có thể kiểm tra kết nối của bạn qua nút \"Trình duyệt\". \n\nTruy cập ttps://guardianproject.info/apps/orbot hoặc gửi email tới help at guardianproject.info để biết thêm chi tiết.</string>
+  <string name="tor_check">Sẽ mở trang web https://check.torproject.org để kiểm tra xem Orbot đã được cài đặt đúng chưa và bạn có đang kết nối qua Tor hay không.</string>
+  <string name="pref_hs_group">Dịch vụ web hosting ẩn</string>
+  <string name="pref_general_group">Tổng quát</string>
+  <string name="pref_start_boot_title">Chạy Orbot khi khởi động thiết bị</string>
+  <string name="pref_start_boot_summary">Tự khởi động Orbot và kết nối vào mạng Tor sau khi thiết bị Android của bạn khởi động</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot mang Tor đến Android! \n\nTor giúp bạn chống lại bộ lọc nội dung mạng, các hoạt động phân tích kết nối mạng và theo dõi mạng, vốn đe dọa tới sự riêng tư, các thông tin bí mật và các mối quan hệ cá nhân trên mạng. \n\nHướng dẫn này sẽ giúp bạn thiết lập Orbot và Tor trên thiết bị của bạn.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Cảnh báo</string>
+  <string name="wizard_warning_msg">Chỉ đơn thuần cài đặt Orbot sẽ không tự động ẩn danh các kết nối mạng di động của bạn.\n\nBạn bắt buộc phải thiết lập Orbot đúng cách, để thiết bị của bạn và các ứng dụng khác sử dụng Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Quyền ứng dụng</string>
+  <string name="wizard_permissions_root_msg1">Bạn có thể tuỳ ý cho phép Orbot có truy cập root để kích hoạt những tính năng nâng cao, như dùng proxy trong suốt chẳng hạn.</string>
+  <string name="wizard_permissions_root_msg2">Nếu bạn không muốn làm điều này, xin hãy dùng những ứng dụng được tạo để dùng với Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Thiết bị của bạn hình như chưa root hoặc đã cấp quyền root hoặc truy cập root.\n\nVui lòng chọn chế độ \"VPN\" trên màn hình chính để thay thế.</string>
+  <!--TipsAndTricks screen-->
+  <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 không-theo-dõi</string>
+  <string name="wizard_tips_orweb">Orfox: Trình duyệt với tính năng bảo mật nâng cao, hoạt động thông qua Tor</string>
+  <string name="wizard_tips_play">Tìm những ứng dụng của Guardian Project trên Google Play</string>
+  <string name="wizard_tips_fdroid">Tìm những ứng dụng của Guardian Project trên F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Tìm những ứng dụng của Guardian Project trên https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxy trong suốt</string>
+  <string name="wizard_transproxy_msg">Cài đặt này cho phép các ứng dụng của bạn tự động kết nối qua mạng Tor mà không cần thiết lập.</string>
+  <string name="wizard_transproxy_hint">(Hãy chọn ô này nếu bạn không hiểu những gì chúng tôi đang nói)</string>
+  <string name="wizard_transproxy_none">Không có</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Kích hoạt proxy Tor trong suốt để dùng cho WiFi/USB Tethering (cần khởi động lại)</string>
+  <string name="button_grant_superuser">Yều cầu truy cập root</string>
+  <string name="pref_select_apps">Chọn ứng dụng</string>
+  <string name="pref_select_apps_summary">Chọn những ứng dụng mà bạn muốn kết nối qua Tor</string>
+  <string name="pref_node_configuration">Cấu hình nút</string>
+  <string name="pref_node_configuration_summary">Những cài đặt nâng cao này có thể giảm sự ẩn danh của bạn</string>
+  <string name="pref_entrance_node">Nút vào (Entrace Nodes)</string>
+  <string name="pref_entrance_node_summary">Dấu theo dõi (Fingerprint), biệt hiệu, quốc gia và địa chỉ cho nút đầu tiên</string>
+  <string name="pref_entrance_node_dialog">Nhập thông tin nút vào</string>
+  <string name="pref_allow_background_starts_title">Cho phép khởi động ngầm</string>
+  <string name="pref_allow_background_starts_summary">Cho phép ứng dụng bất kỳ yêu cầu Orbot khởi động Tor và các dịch vụ liên quan</string>
+  <string name="button_proxy_all">Proxy tất cả</string>
+  <string name="button_proxy_none">Không dùng proxy</string>
+  <string name="button_invert_selection">Đảo ngược lựa chọn</string>
+  <string name="pref_proxy_title">Proxy mạng ngõ ra (Outbound Network) (Tùy chọn)</string>
+  <string name="pref_proxy_type_title">Loại proxy ngõ ra</string>
+  <string name="pref_proxy_type_summary">Giao thức dùng cho proxy: HTTP, HTTPS, SOCKS4, SOCKS5</string>
+  <string name="pref_proxy_type_dialog">Nhập loại proxy</string>
+  <string name="pref_proxy_host_title">Host proxy ngõ ra</string>
+  <string name="pref_proxy_host_summary">Hostname của proxy</string>
+  <string name="pref_proxy_host_dialog">Nhập host của proxy</string>
+  <string name="pref_proxy_port_title">Cổng Proxy ngõ ra</string>
+  <string name="pref_proxy_port_summary">Cổng của proxy</string>
+  <string name="pref_proxy_port_dialog">Nhập cổng Proxy</string>
+  <string name="pref_proxy_username_title">Tên tài khoản proxy ngõ ra</string>
+  <string name="pref_proxy_username_summary">Tên tài khoản proxy (tùy chọn)</string>
+  <string name="pref_proxy_username_dialog">Nhập tên tài khoản proxy</string>
+  <string name="pref_proxy_password_title">Mật khẩu Proxy ngõ ra</string>
+  <string name="pref_proxy_password_summary">Mật khẩu proxy (tùy chọn)</string>
+  <string name="pref_proxy_password_dialog">Nhập mật khẩu proxy</string>
+  <string name="status">Tình trạng</string>
+  <string name="setting_up_full_transparent_proxying_">Đang cấu hình proxy trong suốt cho tất cả...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Đang cấu hình proxy trong suốt cho các ứng dụng được chọn...</string>
+  <string name="transparent_proxying_enabled">Proxy trong suốt ĐƯỢC KÍCH HOẠT</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy đã được kích hoạt để dùng cho tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">CHÚ Ý: có lỗi khi khởi động proxy trong suốt!</string>
+  <string name="transproxy_rules_cleared">Quy tắc TransProxy đã được xóa</string>
+  <string name="couldn_t_start_tor_process_">Không thể khởi động tiến trình Tor:</string>
+  <string name="privoxy_is_running_on_port_">Polipo đang chạy ở cổng:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Đang cài đặt proxy trong suốt theo cổng</string>
+  <string name="bridge_error">Lỗi bridge</string>
+  <string name="bridge_requires_ip">Để dùng chức năng bridge, bạn phải nhập ít nhất một địa chỉ IP dùng cho bridge.</string>
+  <string name="send_email_for_bridges">Gửi một email đến bridges at torproject.org với dòng chữ \"get bridges\" trong thư từ một tài khoản gmail.</string>
+  <string name="error">Lỗi</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Thiết lập ReachableAddresses đã gây ra một vấn đề! </string>
+  <string name="your_relay_settings_caused_an_exception_">Thiết lập relay của bạn đã gây ra một vấn đề!</string>
+  <string name="exit_nodes">Nút cuối (Exit Nodes)</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Dấu theo dõi, biệt hiệu, quốc gia và địa chỉ cho nút cuối cùng</string>
+  <string name="enter_exit_nodes">Nhập thông tin nút cuối</string>
+  <string name="exclude_nodes">Loại trừ nút</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Dấu theo dõi, biệt hiệu, quốc gia và địa chỉ để loại trừ</string>
+  <string name="enter_exclude_nodes">Nhập vào những nút để loại trừ</string>
+  <string name="strict_nodes">Nút chỉ định</string>
+  <string name="use_only_these_specified_nodes">*Chỉ* dùng những nút được liệt kê</string>
+  <string name="bridges">Bridge</string>
+  <string name="use_bridges">Dùng bridge</string>
+  <string name="bridges_obfuscated">Các bridge được che giấu</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Kích hoạt các nút vào khác để vào mạng Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Kích hoạt nếu như các bridge đã được cấu hình là bridge đã được che giấu</string>
+  <string name="ip_address_and_port_of_bridges">Địa chỉ IP và cổng của bridge</string>
+  <string name="enter_bridge_addresses">Nhập địa chỉ bridge</string>
+  <string name="relays">Relay</string>
+  <string name="relaying">Chức năng relay</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Cho phép thiết bị bạn trở thành một nút relay (không phải nút cuối)</string>
+  <string name="relay_port">Cổng cho relay</string>
+  <string name="listening_port_for_your_tor_relay">Cổng tiếp nhận cho việc relay</string>
+  <string name="enter_or_port">Nhập cổng OR</string>
+  <string name="relay_nickname">Biệt hiệu nút relay</string>
+  <string name="the_nickname_for_your_tor_relay">Biệt hiệu cho nút Tor-relay của bạn</string>
+  <string name="enter_a_custom_relay_nickname">Nhập biệt hiệu tuỳ ý</string>
+  <string name="reachable_addresses">Địa chỉ truy cập được (Reachable Addresses)</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Chạy như một máy con (client) đằng sau tường lửa với các thiết lập thu hẹp</string>
+  <string name="reachable_ports">Cổng truy cập được</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Cổng truy cập được đằng sau tường lửa</string>
+  <string name="enter_ports">Nhập số cổng</string>
+  <string name="enable_hidden_services">Host web ẩn</string>
+  <string name="run_servers_accessible_via_the_tor_network">Cho phép máy chủ được thiết lập trong thiết bị của bạn có thể truy cập được qua mạng Tor.</string>
+  <string name="enter_localhost_ports_for_hidden_services">Nhập cổng localhost cho web ẩn</string>
+  <string name="hidden_service_ports">Cổng web ẩn</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Địa chỉ hợp lệ cho web ẩn của bạn (được tự động tạo ra)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Kích hoạt nhật ký gỡ lỗi ở đầu ra (phải dùng adb hoặc aLogCat để xem)</string>
+  <string name="project_home">Các trang chủ dự án:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Giấy phép của Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Phần mềm bên thứ 3:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Một ứng dụng muốn mở cổng ẩn %S đến mạng Tor. Đây là điều an toàn nếu như bạn tin tưởng vào ứng dụng này.</string>
+  <string name="found_existing_tor_process">tìm ra tiến trình hiện hành của Tor...</string>
+  <string name="something_bad_happened">Có gì đó không ổn. Xin xem lại nhật ký</string>
+  <string name="hidden_service_on">web ẩn trong:</string>
+  <string name="unable_to_read_hidden_service_name">không thể đọc được tên dịch vụ ẩn</string>
+  <string name="unable_to_start_tor">Không thể khởi động Tor được: </string>
+  <string name="unable_to_reset_tor">Khởi động lại thiết bị của bạn, không thể thiết đặt lại Tor!</string>
+  <string name="pref_use_sys_iptables_title">Dùng Iptables mặc định</string>
+  <string name="pref_use_sys_iptables_summary">dùng tập nhị phân iptables của hệ thống thay vì dùng tập nhị phân được  đi kèm với Orbot</string>
+  <string name="error_installing_binares">Tập nhị phân của Tor không thể cài hoặc nâng cấp được.</string>
+  <string name="pref_use_persistent_notifications">Luôn giữ thông báo trong thanh trạng thái khi Orbot được kết nối</string>
+  <string name="pref_use_persistent_notifications_title">Thông báo thường trực</string>
+  <string name="pref_use_expanded_notifications">Hiển thị thông báo mở rộng với IP và quốc gia của nút cuối (Tor exit-node)</string>
+  <string name="pref_use_expanded_notifications_title">Thông báo mở rộng</string>
+  <string name="notification_using_bridges">Bridge đã được kích hoạt!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Ngôn ngữ</string>
+  <string name="set_locale_summary">Chọn ngôn ngữ cho Orbot</string>
+  <string name="wizard_locale_title">Chọn ngôn ngữ</string>
+  <string name="wizard_locale_msg">Giữ cài đặt mặc định hoặc chuyển qua ngôn ngữ khác</string>
+  <string name="powered_by">được hỗ trợ bởi Tor</string>
+  <string name="btn_save_settings">Lưu thiết lập</string>
+  <string name="no_internet_connection_tor">Không có kết nối Internet; Tor đang ở chế độ chờ...</string>
+  <string name="bandwidth_">Băng thông:</string>
+  <string name="down">tải xuống</string>
+  <string name="up">tải lên</string>
+  <string name="pref_disable_network_title">Tự động \"ngủ\" khi không có mạng</string>
+  <string name="pref_disable_network_summary">Chuyển Tor sang chế độ ngủ nếu không có Internet</string>
+  <string name="newnym">Bạn đã chuyển sang một mạch Tor mới!</string>
+  <string name="menu_verify_browser">Trình duyệt</string>
+  <string name="menu_use_chatsecure">Dùng ChatSecure</string>
+  <string name="permission_manage_tor_label">Quản lý Tor</string>
+  <string name="permission_manage_tor_description">Cho phép ứng dụng này điều khiển dịch vụ Tor</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Có vẻ như bạn chưa cài Orfox. Bạn có cần giúp không, hay chỉ cần mở trình duyệt thường thôi?</string>
+  <string name="install_apps_">Cài đặt ứng dụng?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Không có mạng. Đang chuyển Tor sang chế độ ngủ...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Kết nối mạng tốt. Đang \"đánh thức\" Tor...</string>
+  <string name="updating_settings_in_tor_service">đang cập nhật cài đặt dịch vụ Tor</string>
+  <string name="pref_socks_title">Cổng SOCKS</string>
+  <string name="pref_socks_summary">Cổng để Tor đặt proxy SOCKS lên (mặc định: 9050 hoặc 0 để vô hiệu hóa)</string>
+  <string name="pref_socks_dialog">Cấu hình cổng SOCKS</string>
+  <string name="pref_transport_title">Cổng proxy trong suốt của Tor</string>
+  <string name="pref_transport_summary">Cổng để Tor đặt proxy trong suốt lên (mặc định: 9040 hoặc 0 để vô hiệu hóa)</string>
+  <string name="pref_transport_dialog">Cấu hình cổng proxy trong suốt</string>
+  <string name="pref_dnsport_title">Cổng DNS Tor</string>
+  <string name="pref_dnsport_summary">Cổng để Tor đặt DNS của nó lên (mặc định: 5400 hoặc 0 để vô hiệu hóa)</string>
+  <string name="pref_dnsport_dialog">Cấu hình cổng DNS</string>
+  <string name="pref_torrc_title">Cấu hình tùy chỉnh cho Torrc</string>
+  <string name="pref_torrc_summary">CHỈ NGƯỜI DÙNG CHUYÊN MÔN: nhập các thiết lập trực tiếp cho torrc</string>
+  <string name="pref_torrc_dialog">Torrc tùy chỉnh</string>
+  <string name="wizard_tips_martus">Mobile Martus - Ứng dụng cung cấp các tài liệu về nhân quyền của Benetech</string>
+  <string name="your_tor_public_ips_">Các IP Tor công cộng của bạn là:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Vui lòng vô hiệu hóa ứng dụng này trong Android->Settings->Apps nếu bạn đang gặp vấn đề với Orbot:</string>
+  <string name="app_conflict">Xung đột ứng dụng</string>
+  <string name="pref_transproxy_refresh_title">Tự động làm mới proxy trong suốt</string>
+  <string name="pref_transproxy_refresh_summary">Áp dụng lại các quy tắc proxy trong suốt khi trạng thái mạng thay đổi</string>
+  <string name="pref_transproxy_flush_title">ÉP BUỘC XÓA các quy tắc proxy trong suốt</string>
+  <string name="pref_transproxy_flush_summary">Chạm vào đây để xóa sạch các quy tắc proxy trong suốt NGAY BÂY GIỜ</string>
+  <string name="transparent_proxy_rules_flushed_">Quy tắc proxy trong suốt đã được xóa!</string>
+  <string name="you_do_not_have_root_access_enabled">Bạn không có quyền truy cập ROOT</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Bạn có thể cần kết nối lại Orbot để các thay đổi được áp dụng</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Bridge được cập nhật</string>
+  <string name="restart_orbot_to_use_this_bridge_">Vui lòng khởi động lại Orbot để áp dụng thay đổi</string>
+  <string name="menu_qr">Mã QR</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Nếu như mạng di động của bạn chặn Tor, bạn có thể dùng bridge (cầu nối) để truy cập mạng Tor. CHỌN một trong những bridge ở trên để kích hoạt bridge.</string>
+  <string name="bridge_mode">Chế độ bridge</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Kích hoạt</string>
+  <string name="apps_mode">Chế độ ứng dụng VPN</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Bạn có thể làm cho tất cả ứng dụng của bạn kết nối qua mạng Tor bằng cách sử dụng tính năng VPN (Mạng riêng ảo) của Android.\n\n*CHÚ Ý* Đây là một tính năng mới, đang thử nghiệm và nó có thể không tự động chạy, hoặc có thể dừng lại đột ngột. Nó KHÔNG nên được dùng cho ẩn danh, và chỉ nên dùng để vượt qua các tường lửa và bộ lọc.</string>
+  <string name="send_email">Gửi email</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Bạn có thể lấy một địa chỉ bridge qua email, web hoặc quét mã QR. Chọn \"Email\" hoặc \"Web\" bên dưới để yêu cầu một địa chỉ bridge.\n\nMột khi đã có địa chỉ, hãy sao chép nó vào thiết đặt \"Bridge\" trong cài đặt Orbot rồi khởi động lại phần mềm.</string>
+  <string name="install_orweb">Cài đặt Orfox</string>
+  <string name="standard_browser">Trình duyệt thường</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">LƯU Ý: Chỉ có bridge Tor chuẩn mới hoạt động trên các thiết bị Intel x86/Atom</string>
+  <string name="vpn_default_world">Toàn cầu</string>
+</resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..e050c23
--- /dev/null
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot 是一款免费的代理应用,能够让其他应用更安全地使用互联网。通过在位于世界各地的一系列计算机之间进行跳转,Orbot 可利用 Tor 对网络通信进行加密并隐藏。Tor 是一款免费的软件,并且是一个开放的网络。它可以保护用户免受流量分析的危害,这种网络监控可对个人自由与隐私、商业机密活动和关系以及国家安全造成威胁。</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">启动和停止 Tor</string>
+  <string name="tor_proxy_service_process">Tor 代理服务</string>
+  <string name="status_starting_up">Orbot 正在启动...</string>
+  <string name="status_activated">已连接到 Tor 网络</string>
+  <string name="status_disabled">Orbot 已停用</string>
+  <string name="status_shutting_down">Tor服务 正在关闭</string>
+  <string name="tor_process_starting">正在启动 Tor 客户端...</string>
+  <string name="tor_process_complete">完成。</string>
+  <string name="tor_process_waiting">等待。</string>
+  <string name="not_anonymous_yet">警告:你的网络通讯并非匿名!请设置应用程序,使用 HTTP 代理 127.0.0.1:8118 或者 SOCKS4A、SOCKS5 代理 127.0.0.1:9050</string>
+  <string name="menu_home">首页</string>
+  <string name="menu_browse">浏览</string>
+  <string name="menu_settings">设置</string>
+  <string name="menu_log">日志</string>
+  <string name="menu_info">帮助</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">启动</string>
+  <string name="menu_stop">停止</string>
+  <string name="menu_about">关于</string>
+  <string name="menu_promo_apps">获取应用…</string>
+  <string name="main_layout_download">下载</string>
+  <string name="main_layout_upload">上传</string>
+  <string name="button_help">帮助</string>
+  <string name="button_close">关闭</string>
+  <string name="button_about">关于</string>
+  <string name="button_clear_log">清除日志</string>
+  <string name="menu_verify">检查</string>
+  <string name="menu_exit">退出</string>
+  <string name="menu_scan">扫描网桥QR码</string>
+  <string name="menu_share_bridge">分享网桥QR码</string>
+  <string name="press_to_start">- 长按启动 -</string>
+  <string name="pref_trans_proxy_group">透明代理(需要 Root 权限)</string>
+  <string name="pref_trans_proxy_title">透明代理</string>
+  <string name="pref_trans_proxy_summary">应用程序自动使用 Tor</string>
+  <string name="pref_transparent_all_title">所有应用程序使用 Tor</string>
+  <string name="pref_transparent_all_summary">所有应用程序都通过 Tor 连接网络</string>
+  <string name="pref_transparent_port_fallback_title">备用代理端口</string>
+  <string name="pref_transparent_port_fallback_summary">警告:避免使用常用端口(80、443 等)。仅在“应用程序”或“应用程序”模式无法工作时使用。</string>
+  <string name="pref_transparent_port_title">端口列表</string>
+  <string name="pref_transparent_port_summary">代理端口列表。仅在“应用程序”或“应用程序”模式无法工作时使用。</string>
+  <string name="pref_transparent_port_dialog">输入代理端口</string>
+  <string name="pref_has_root">请求 Root 访问权限</string>
+  <string name="pref_has_root_summary">为透明代理请求获取 Root 访问权限</string>
+  <string name="status_install_success">Tor 程序安装成功!</string>
+  <string name="status_install_fail">Tor 程序无法安装。请查看日志并将其发送到 tor-assistants at torproject.org</string>
+  <string name="title_error">应用程序错误</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">关于 Orbot</string>
+  <string name="btn_next">下一步</string>
+  <string name="btn_back">上一步</string>
+  <string name="btn_finish">完成</string>
+  <string name="btn_okay">确定</string>
+  <string name="btn_cancel">取消</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">更多 Orbot 信息</string>
+  <string name="wizard_details_msg">Orbot 是一个包含 Tor、LibEvent 和 Polipo 的开源应用程序。它提供了一个本地 HTTP 代理 (8118) 和一个 SOCKS 代理 (9050) 前往 Tor 网络。Orbot 也有能力在 root 过的设备上将所有互联网流量通过 Tor 发送。</string>
+  <string name="wizard_permissions_root">已获取权限</string>
+  <string name="wizard_permissions_stock">Orbot 权限</string>
+  <string name="wizard_premissions_msg_root">好极了!我们检测到 Orbot 已获取 Root 权限 。我们会谨慎地使用这一权限。</string>
+  <string name="wizard_permissions_msg_stock">虽非必须,但是具有 Root 访问权限的设备可以让 Orbot 变得更强大。请使用下面的按钮授予 Orbot 这一强大的能力!</string>
+  <string name="wizard_permissions_no_root">如果没有 Root 访问权限或不明白此处所说的内容,只需确保 Orbot 支持所用的应用即可。</string>
+  <string name="wizard_permissions_consent">我明白并愿意在未获取 Root 权限的情况下继续操作</string>
+  <string name="wizard_permission_enable_root">为 Orbot 获取 Root 权限</string>
+  <string name="wizard_configure">配置 Tor 网络</string>
+  <string name="wizard_configure_msg">Orbot 提供了选项,可指定所有应用程序使用 Tor 网络或指定某些应用通过 Tor 网络进行通讯。</string>
+  <string name="wizard_configure_all">所有应用程序都使用 Tor</string>
+  <string name="wizard_configure_select_apps">选择使用 Tor 的应用程序</string>
+  <string name="wizard_tips_tricks">Orbot 支持的应用</string>
+  <string name="wizard_tips_msg">以下应用可与 Orbot 一起使用。点击下面的按钮安装,也可以通过 Google Play 商店、GuardianProject.info 网站或 F-Droid.org 查找。</string>
+  <string name="wizard_tips_otrchat">ChatSecure - Android 上的安全即时通讯客户端</string>
+  <string name="wizard_tips_proxy">代理设置 - 学习如何配置应用程序使用 Orbot</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo 搜索引擎应用程序</string>
+  <string name="wizard_tips_twitter">将 Twitter 代理的主机设置 localhost 并将端口设置为 8118</string>
+  <string name="wizard_tips_story_maker">故事制造者--乱说些什么,并用Tor保证您的安全!</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_proxy_help_msg">如果 Android 应用程序支持 HTTP 或 SOCKS 代理,那么您可对它进行配置来连接到 Orbot 并使用 Tor 网络。 主机设置为 127.0.0.1 或 localhost。对于 HTTP,端口设置为 8118;对于 SOCKS,端口设置为 9050。如果可以,请尽量使用 SOCKS4A 或 SOCKS5 代理。 更多有关 Android 代理信息,请参阅 http://tinyurl.com/proxyandroid 中的常见问题</string>
+  <string name="wizard_final">Orbot 已就绪!</string>
+  <string name="wizard_final_msg">全球数以万计的人正在使用Tor,他们中有媒体记者,博客家,人权主义者,改革宣扬者,军官,公司职工,以及同您一样的普通市民!现在,您也准备好了!</string>
+  <string name="wizard_exit_at_first_screen_toast">请在您开始使用它前配置 Orbot!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">您已经成功连接到Tor网络,但不代表您的设备是安全的。您可以使用“浏览器”按钮测试您的连接。
+
+访问https://guardianproject.info/apps/orbot 或发送邮件至help at guardianproject.info 来了解更多。</string>
+  <string name="tor_check">浏览器将启动并访问:https://check.torproject.org,以便检查 Orbot 配置是否正确以及是否可连接 Tor 网络。</string>
+  <string name="pref_hs_group">隐藏服务主机</string>
+  <string name="pref_general_group">常规</string>
+  <string name="pref_start_boot_title">开机时启动 Orbot</string>
+  <string name="pref_start_boot_summary">Android 设备开机时自动启动 Orbot 并连接 Tor 网络</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot使Android支持Tor网络!
+Tor帮助你避开那些威胁到你的隐私,重要信息和社交关系的内容过滤,流量分析以及网络审查。
+这个向导将帮助你配置Orbot在你设备商以便访问Tor。</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">警告</string>
+  <string name="wizard_warning_msg">简单的安装完Orbot并不能自动的匿名你的移动流量。
+你必须适当的配置Orbot,以及你的设备及应用以成功匿名使用Tor。</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">权限</string>
+  <string name="wizard_permissions_root_msg1">可选择授予 Orbot “Superuser”访问权限,以便启用高级功能,例如透明代理。</string>
+  <string name="wizard_permissions_root_msg2">如果不愿授予 Orbot 该权限,请确保应用程序可使用 Orbot。</string>
+  <string name="wizard_permissions_no_root_msg">您的设备似乎尚未 root,或者未提供 root 或“超级用户”的访问权限。\n\n请改为尝试主屏幕的“应用”模式。</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">使用 Orbot 的应用程序</string>
+  <string name="wizard_tips_gibberbot">ChatSecure:具有 OTF 加密共的安全通讯应用</string>
+  <string name="wizard_tips_orweb">Orfox:隐私增强浏览器采用 Tor 工作</string>
+  <string name="wizard_tips_play">在 Google Play 商店查找所有 Guardian Project 的应用程序</string>
+  <string name="wizard_tips_fdroid">在 F-Droid 查找所有 Guardian Project 的应用程序</string>
+  <string name="wizard_tips_fdroid_org">在 https://f-droid.org 查找所有 Guardian Project 的应用程序</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">透明代理</string>
+  <string name="wizard_transproxy_msg">可使应用程序无需配置即可自动通过 Tor 连接网络。</string>
+  <string name="wizard_transproxy_hint">(如果不明白这里所说的问题,请选择该选项)</string>
+  <string name="wizard_transproxy_none">无</string>
+  <string name="pref_transparent_tethering_title">Tor 网络共享</string>
+  <string name="pref_transparent_tethering_summary">对 Wifi 和 USB 网络共享设备启用透明代理(需重新启动)</string>
+  <string name="button_grant_superuser">请求 Superuser 访问权限</string>
+  <string name="pref_select_apps">选择应用程序</string>
+  <string name="pref_select_apps_summary">选择通过 Tor 连接网络的应用程序</string>
+  <string name="pref_node_configuration">节点配置</string>
+  <string name="pref_node_configuration_summary">这些高级设置可降低你的匿名度</string>
+  <string name="pref_entrance_node">入口节点</string>
+  <string name="pref_entrance_node_summary">用于首次跳转的密钥指纹、昵称、国家与地址</string>
+  <string name="pref_entrance_node_dialog">输入入口节点</string>
+  <string name="pref_allow_background_starts_title">允许后台启动</string>
+  <string name="pref_allow_background_starts_summary">允许任何应用告知 Orbot 启动 Tor 及相关服务</string>
+  <string name="button_proxy_all">全部代理</string>
+  <string name="button_proxy_none">全不代理</string>
+  <string name="button_invert_selection">反选</string>
+  <string name="pref_proxy_title">出站网络代理(可选)</string>
+  <string name="pref_proxy_type_title">出站代理类型</string>
+  <string name="pref_proxy_type_summary">代理服务器使用的协议:HTTP、HTTPS、Socks4、Socks5</string>
+  <string name="pref_proxy_type_dialog">输入代理类型</string>
+  <string name="pref_proxy_host_title">出站代理主机</string>
+  <string name="pref_proxy_host_summary">代理服务器主机名</string>
+  <string name="pref_proxy_host_dialog">输入代理主机</string>
+  <string name="pref_proxy_port_title">出站代理端口</string>
+  <string name="pref_proxy_port_summary">代理服务器端口</string>
+  <string name="pref_proxy_port_dialog">输入代理端口</string>
+  <string name="pref_proxy_username_title">出站代理用户名</string>
+  <string name="pref_proxy_username_summary">代理用户名(可选)</string>
+  <string name="pref_proxy_username_dialog">请输入代理用户名</string>
+  <string name="pref_proxy_password_title">出站代理密码</string>
+  <string name="pref_proxy_password_summary">代理密码(可选)</string>
+  <string name="pref_proxy_password_dialog">请输入代理密码</string>
+  <string name="status">状态</string>
+  <string name="setting_up_full_transparent_proxying_">正在对所有应用程序进行透明代理设置...</string>
+  <string name="setting_up_app_based_transparent_proxying_">正在对所选应用程序进行透明代理设置...</string>
+  <string name="transparent_proxying_enabled">透明代理已启用</string>
+  <string name="transproxy_enabled_for_tethering_">已为网络共享激活 TransProxy !</string>
+  <string name="warning_error_starting_transparent_proxying_">警告:启动透明代理时发生错误!</string>
+  <string name="transproxy_rules_cleared">已清除 TransProxy 规则</string>
+  <string name="couldn_t_start_tor_process_">无法启动 Tor 进程:</string>
+  <string name="privoxy_is_running_on_port_">Polipo 正运行在端口:</string>
+  <string name="setting_up_port_based_transparent_proxying_">正在对基于端口的透明代理进行设置...</string>
+  <string name="bridge_error">网桥错误</string>
+  <string name="bridge_requires_ip">为了需使用网桥,必须至少输入一个网桥 IP 地址。</string>
+  <string name="send_email_for_bridges">如需获取网桥地址,请使用 gmail 发送电子邮件至 bridges at torproject.org 并在正文内填上“ get bridges”。</string>
+  <string name="error">错误</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">可访问地址设置导致异常!</string>
+  <string name="your_relay_settings_caused_an_exception_">中继设置导致异常!</string>
+  <string name="exit_nodes">出口节点</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">最后跳转的密钥指纹、昵称、国家与地址</string>
+  <string name="enter_exit_nodes">输入出口节点</string>
+  <string name="exclude_nodes">排除节点</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">排除的密钥指纹、昵称、国家与地址</string>
+  <string name="enter_exclude_nodes">输入排除节点</string>
+  <string name="strict_nodes">限制节点</string>
+  <string name="use_only_these_specified_nodes">仅使用这些指定节点</string>
+  <string name="bridges">网桥</string>
+  <string name="use_bridges">使用网桥</string>
+  <string name="bridges_obfuscated">混淆网桥</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">使用其他入口节点连接到 Tor 网络</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">已配置的网桥为混淆网桥时启用</string>
+  <string name="ip_address_and_port_of_bridges">网桥的 IP 地址和端口</string>
+  <string name="enter_bridge_addresses">输入网桥地址</string>
+  <string name="relays">中继</string>
+  <string name="relaying">中继转发</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">仅设置被设置为非出口中继</string>
+  <string name="relay_port">中继端口</string>
+  <string name="listening_port_for_your_tor_relay">Tor 中继的侦听端口</string>
+  <string name="enter_or_port">输入 OR 端口</string>
+  <string name="relay_nickname">中继昵称</string>
+  <string name="the_nickname_for_your_tor_relay">Tor 中继昵称</string>
+  <string name="enter_a_custom_relay_nickname">输入自定义中继昵称</string>
+  <string name="reachable_addresses">可访问地址</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">在具有限制策略防火墙内,作为客户端运行</string>
+  <string name="reachable_ports">可访问端口</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">防火墙限定的可访问端口</string>
+  <string name="enter_ports">输入端口</string>
+  <string name="enable_hidden_services">隐藏服务主机</string>
+  <string name="run_servers_accessible_via_the_tor_network">允许设备上的服务器可通过 Tor 网络访问</string>
+  <string name="enter_localhost_ports_for_hidden_services">输入隐藏服务的本地主机端口</string>
+  <string name="hidden_service_ports">隐藏服务端口</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">隐藏服务的地址(自动生成)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">启用调试日志输出(必须使用 adb 或 aLongCat 查看)</string>
+  <string name="project_home">项目主页(s):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor 许可证</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">第三方软件:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">应用程序试图打开隐藏服务主机端口 %S 连接 Tor 网络。对于可信应用这是安全的。</string>
+  <string name="found_existing_tor_process">发现当前已存在 Tor 进程...</string>
+  <string name="something_bad_happened">发生错误,请检查日志</string>
+  <string name="hidden_service_on">隐藏服务位于:</string>
+  <string name="unable_to_read_hidden_service_name">无法读取隐藏服务名称</string>
+  <string name="unable_to_start_tor">无法启动 Tor:</string>
+  <string name="unable_to_reset_tor">重新启动您的设备,无法重置 Tor!</string>
+  <string name="pref_use_sys_iptables_title">使用默认 iptables </string>
+  <string name="pref_use_sys_iptables_summary">使用内置的 iptables 程序替代 Orbot 绑定的 iptables </string>
+  <string name="error_installing_binares">无法安装或更新 Tor 程序。</string>
+  <string name="pref_use_persistent_notifications">Orbot 连接后始终在通知栏显示图标</string>
+  <string name="pref_use_persistent_notifications_title">始终显示通知</string>
+  <string name="pref_use_expanded_notifications">显示扩展的通知,有关 Tor 出口的国家和 IP</string>
+  <string name="pref_use_expanded_notifications_title">扩展的通知</string>
+  <string name="notification_using_bridges">已启用网桥!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">语言</string>
+  <string name="set_locale_summary">选择 Orbot 的区域设置与语言</string>
+  <string name="wizard_locale_title">选择语言</string>
+  <string name="wizard_locale_msg">保持默认或切换为当前所用语言</string>
+  <string name="powered_by">由 Tor 提供</string>
+  <string name="btn_save_settings">保存设置</string>
+  <string name="no_internet_connection_tor">没有互联网连接;Tor 处于待机状态…</string>
+  <string name="bandwidth_">宽带速度:</string>
+  <string name="down">下行</string>
+  <string name="up">上行</string>
+  <string name="pref_disable_network_title">无网络自动休眠</string>
+  <string name="pref_disable_network_summary">没有网络连接时,暂时停用 Tor</string>
+  <string name="newnym">已切换为新的 Tor 标识!</string>
+  <string name="menu_verify_browser">浏览器</string>
+  <string name="menu_use_chatsecure">使用 ChatSecure</string>
+  <string name="permission_manage_tor_label">管理 Tor</string>
+  <string name="permission_manage_tor_description">启用该应用可对 Tor 服务进行控制</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">似乎您还没有安装 Orfox。是否需要帮助,或者我们应该打开浏览器?</string>
+  <string name="install_apps_">安装应用?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">没有网络连接;让 Tor 进入睡眠…</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">网络连接良好。正在唤醒 Tor...</string>
+  <string name="updating_settings_in_tor_service">正在更新 Tor 服务中的设置</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Tor 提供其 SOCKS 代理的端口 (默认: 9050, 0 禁用)</string>
+  <string name="pref_socks_dialog">SOCKS 端口配置</string>
+  <string name="pref_transport_title">Tor 透明代理端口</string>
+  <string name="pref_transport_summary">Tor 提供透明代理的端口 (默认: 9040, 0 禁用)</string>
+  <string name="pref_transport_dialog">透明代理配置</string>
+  <string name="pref_dnsport_title">Tor DNS 端口</string>
+  <string name="pref_dnsport_summary">Tor 提供 DNS 的端口 (默认: 5400, 0 禁用)</string>
+  <string name="pref_dnsport_dialog">DNS 端口配置</string>
+  <string name="pref_torrc_title">Torrc 自定义配置</string>
+  <string name="pref_torrc_summary">仅供专家:直接输入 torrc 配置行</string>
+  <string name="pref_torrc_dialog">自定义 Torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus - 美国人权文件 App</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>
+  <string name="pref_transproxy_refresh_title">透明代理自动刷新</string>
+  <string name="pref_transproxy_refresh_summary">在网络状态改变时重新应用透明代理规则</string>
+  <string name="pref_transproxy_flush_title">透明代理强制移除</string>
+  <string name="pref_transproxy_flush_summary">点按这里立即刷新所有透明代理的网络规则</string>
+  <string name="transparent_proxy_rules_flushed_">透明代理规则已刷新!</string>
+  <string name="you_do_not_have_root_access_enabled">您还没有 ROOT 访问权限</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">您可能需要停止并重新启动 Orbot 才能使设置更改生效。</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">网桥已更新</string>
+  <string name="restart_orbot_to_use_this_bridge_">请重启 Orbot 以使变更生效</string>
+  <string name="menu_qr">QR码</string>
+  <string name="bridge_mode">网桥模式</string>
+  <string name="get_bridges_email">电子邮件</string>
+  <string name="get_bridges_web">网页</string>
+  <string name="activate">激活</string>
+  <string name="apps_mode">应用 VPN 模式</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">通过开启VPN功能,您可以让您设备上全部的应用程序使用Tor网络。
+警告!!!
+这是一项实验性的功能。在某些情况下,它可能停止或不能自动启动。它不应用于保持匿名,仅用于穿透防火墙和连接过滤系统。</string>
+  <string name="send_email">发送电子邮件</string>
+  <string name="install_orweb">安装 Orfox</string>
+  <string name="standard_browser">标准版浏览器</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">注意:只有标准的 Tor 网桥可以在 Intel X86/ATOM 设备上工作</string>
+  <string name="vpn_default_world">世界</string>
+</resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..b255c75
--- /dev/null
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot是一款免費的網絡代理應用程式,用來保護其他應用程式的上網安全。
+Orbot使用Tor在全球一系列的電腦間跳躍,以便隱藏網路流量並加密。Tor是個免費軟體也是個開放網路,能幫您抵禦流量分析。它是某一種網路監控,牽涉到個人的自由與隱私、商業部分的機密關係和活動、甚至國家安全。</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">開始和停止 Tor</string>
+  <string name="tor_proxy_service_process">tor 代理服務</string>
+  <string name="status_starting_up">Orbot 正在啟動中...</string>
+  <string name="status_activated">已連線至 Tor 網路</string>
+  <string name="status_disabled">Orbot 已停用</string>
+  <string name="status_shutting_down">Tor服務 正在關閉</string>
+  <string name="tor_process_starting">啟動Tor 用戶端...</string>
+  <string name="tor_process_complete">完成。</string>
+  <string name="tor_process_waiting">等待。</string>
+  <string name="not_anonymous_yet">警告:您的網路尚未匿名!請設定您的應用程式使用HTTP 代理伺服器 127.0.0.1:8118 或 SOCKS4A 或 SOCKS5 代理伺服器 127.0.0.1:9050</string>
+  <string name="menu_home">首頁</string>
+  <string name="menu_browse">瀏覽</string>
+  <string name="menu_settings">設定</string>
+  <string name="menu_log">記錄檔</string>
+  <string name="menu_info">說明</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">開始</string>
+  <string name="menu_stop">停止</string>
+  <string name="menu_about">關於</string>
+  <string name="menu_promo_apps">取得應用程式…</string>
+  <string name="main_layout_download">下載</string>
+  <string name="main_layout_upload">上傳</string>
+  <string name="button_help">說明</string>
+  <string name="button_close">關閉</string>
+  <string name="button_about">關於</string>
+  <string name="button_clear_log">清除記錄檔</string>
+  <string name="menu_verify">檢查</string>
+  <string name="menu_exit">離開</string>
+  <string name="menu_scan">掃描連接橋QR</string>
+  <string name="menu_share_bridge">分享連接橋QR</string>
+  <string name="press_to_start">- 請長按以開始 - </string>
+  <string name="pref_trans_proxy_group">通透式代理伺服器(需要 Root)</string>
+  <string name="pref_trans_proxy_title">通透式代理伺服器</string>
+  <string name="pref_trans_proxy_summary">自動啟動 Tor於應用程式</string>
+  <string name="pref_transparent_all_title">Tor Everything</string>
+  <string name="pref_transparent_all_summary">所有應用程式皆透過Tor 代理伺服器</string>
+  <string name="pref_transparent_port_fallback_title">備用連接埠代理</string>
+  <string name="pref_transparent_port_fallback_summary">警告: 避免常用的埠口(80、443等等)。在「所有」或是「App」模式都失效的時候*才使用*。</string>
+  <string name="pref_transparent_port_title">埠清單</string>
+  <string name="pref_transparent_port_dialog">輸入代理埠</string>
+  <string name="pref_has_root">請求 Root 存取權</string>
+  <string name="pref_has_root_summary">爲通透式代理請求 Root 存取權</string>
+  <string name="status_install_success">Tor 二進制檔案安裝成功!</string>
+  <string name="title_error">應用程式錯誤</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">關於 Orbot</string>
+  <string name="btn_next">前進</string>
+  <string name="btn_back">返回</string>
+  <string name="btn_finish">結束</string>
+  <string name="btn_okay">確定</string>
+  <string name="btn_cancel">取消</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Orbot 的一些詳細資料</string>
+  <string name="wizard_details_msg">Orbot是個開源的應用程式,包含了Tor,LibEvent和Polipo。它提供了本地HTTP代理 (8118)和SOCKS代理 (9050)以進入Tor網路。Orbot也能夠在已Root的裝置上,以Tor傳送所有的網路流量。</string>
+  <string name="wizard_permissions_root">已取得權限</string>
+  <string name="wizard_permissions_stock">Orbot 權限</string>
+  <string name="wizard_configure">組態 Tor 網路</string>
+  <string name="wizard_configure_all">所有應用程式都透過 Tor 代理</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo 搜尋引擎應用程式</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
+  <string name="wizard_proxy_help_info">代理伺服器設定</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">一般</string>
+  <string name="pref_start_boot_summary">當你的 Android  裝置啟動時自動開啟 Orbot 並連接 Tor 網路</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">警告</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">權限</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_play">在 Google Play 尋找所有的 Guardian Project 應用程式</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">通透式代理</string>
+  <string name="wizard_transproxy_none">無</string>
+  <string name="pref_select_apps">選擇應用程式</string>
+  <string name="button_invert_selection">反向選擇</string>
+  <string name="status">狀態</string>
+  <string name="error">錯誤</string>
+  <string name="enter_ports">輸入埠</string>
+  <string name="project_home">專案首頁:</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">第三方軟體:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">語言</string>
+  <string name="wizard_locale_title">選擇語言</string>
+  <string name="btn_save_settings">儲存設定</string>
+  <string name="menu_verify_browser">瀏覽器</string>
+  <string name="permission_manage_tor_label">管理 Tor</string>
+  <string name="install_apps_">安裝應用程式?</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_dnsport_title">Tor DNS 埠</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="menu_qr">QR 碼</string>
+  <string name="send_email">寄送電子信件</string>
+  <string name="standard_browser">標準版瀏覽器</string>
+  <string name="vpn_default_world">世界</string>
+</resources>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
new file mode 100644
index 0000000..30d20c1
--- /dev/null
+++ b/app/src/main/res/values/arrays.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+
+	<string-array name="bridge_options">
+	    <item>Obfs4 (Best)</item>
+	    <item>Obfs3</item>
+	    <item>ScrambleSuit</item>
+	    <item>Tunnel through Azure</item>
+	    <item>Tunnel through Amazon</item>
+	    <item>Tunnel through Google</item>
+	    <item>Get New Bridges</item>
+	    <item></item>
+	</string-array>
+    
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..19e06e7
--- /dev/null
+++ b/app/src/main/res/values/colors.xml
@@ -0,0 +1,8 @@
+
+    <resources>
+        <color name="panel_background">#ffffff</color>
+        <color name="panel_background_dark">#efefef</color>
+        <color name="panel_background_main">#efefef</color>
+        <color name="bright_green">#ccff2a</color>
+        <color name="dark_green">#669901</color>
+    </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..f96195c
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,361 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/dimens.xml
+**
+** Copyright 2006, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+    <!-- The width that is used when creating thumbnails of applications. -->
+    <dimen name="thumbnail_width">164dp</dimen>
+    <!-- The height that is used when creating thumbnails of applications. -->
+    <dimen name="thumbnail_height">145dp</dimen>
+    <!-- The standard size (both width and height) of an application icon that
+         will be displayed in the app launcher and elsewhere. -->
+    <dimen name="app_icon_size">48dip</dimen>
+    <!-- The maximum number of action buttons that should be permitted within
+         an action bar/action mode. This will be used to determine how many
+         showAsAction="ifRoom" items can fit. "always" items can override this. -->
+    <integer name="max_action_buttons">2</integer>
+    <dimen name="toast_y_offset">64dip</dimen>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">25dip</dimen>
+    <!-- Height of the bottom navigation / system bar. -->
+    <dimen name="navigation_bar_height">48dp</dimen>
+    <!-- Height of the bottom navigation bar in portrait; often the same as @dimen/navigation_bar_height -->
+    <dimen name="navigation_bar_height_landscape">48dp</dimen>
+    <!-- Width of the navigation bar when it is placed vertically on the screen -->
+    <dimen name="navigation_bar_width">42dp</dimen>
+    <!-- Height of notification icons in the status bar -->
+    <dimen name="status_bar_icon_size">24dip</dimen>
+    <!-- Size of the giant number (unread count) in the notifications -->
+    <dimen name="status_bar_content_number_size">48sp</dimen>
+    <!-- Height of the system bar (combined status & navigation); used by
+         SystemUI internally, not respected by the window manager. -->
+    <dimen name="system_bar_height">@dimen/navigation_bar_height</dimen>
+    <!-- Height of notification icons in the system bar -->
+    <dimen name="system_bar_icon_size">32dip</dimen>
+    <!-- Margin at the edge of the screen to ignore touch events for in the windowshade. -->
+    <dimen name="status_bar_edge_ignore">5dp</dimen>
+
+    <!-- Minimum size of the fastscroll overlay -->
+    <dimen name="fastscroll_overlay_size">104dp</dimen>
+    <!-- Text size of the fastscroll overlay -->
+    <dimen name="fastscroll_overlay_text_size">52sp</dimen>
+    <!-- Padding of the fastscroll overlay -->
+    <dimen name="fastscroll_overlay_padding">16dp</dimen>
+    <!-- Width of the fastscroll thumb -->
+    <dimen name="fastscroll_thumb_width">64dp</dimen>
+    <!-- Height of the fastscroll thumb -->
+    <dimen name="fastscroll_thumb_height">52dp</dimen>
+    <!-- Min width for a tablet device -->
+    <dimen name="min_xlarge_screen_width">800dp</dimen>
+
+    <!-- Default height of a key in the password keyboard for alpha (used by keyguard) -->
+    <dimen name="password_keyboard_key_height_alpha">56dip</dimen>
+    <!-- Default height of a key in the password keyboard for numeric (used by keyguard) -->
+    <dimen name="password_keyboard_key_height_numeric">56dip</dimen>
+    <!-- Default correction for the space key in the password keyboard  (used by keyguard) -->
+    <dimen name="password_keyboard_spacebar_vertical_correction">4dip</dimen>
+    <!-- Default horizontal gap between keys in the password keyboard (used by keyguard) -->
+    <dimen name="password_keyboard_horizontalGap">3dip</dimen>
+    <!-- Default vertical gap between keys in the password keyboard (used by keyguard) -->
+    <dimen name="password_keyboard_verticalGap">9dip</dimen>
+
+    <!-- Size of lockscreen outerring on unsecure unlock LockScreen -->
+    <dimen name="keyguard_lockscreen_outerring_diameter">270dp</dimen>
+
+    <!-- Default target placement radius for GlowPadView. Should be 1/2 of outerring diameter. -->
+    <dimen name="glowpadview_target_placement_radius">135dip</dimen>
+
+    <!-- Default glow radius for GlowPadView -->
+    <dimen name="glowpadview_glow_radius">75dip</dimen>
+
+    <!-- Default distance beyond which GlowPadView snaps to the matching target -->
+    <dimen name="glowpadview_snap_margin">40dip</dimen>
+
+    <!-- Default distance from each snap target that GlowPadView considers a "hit" -->
+    <dimen name="glowpadview_inner_radius">15dip</dimen>
+
+    <!-- Preference activity side margins -->
+    <dimen name="preference_screen_side_margin">0dp</dimen>
+    <!-- Preference activity side margins negative-->
+    <dimen name="preference_screen_side_margin_negative">0dp</dimen>
+    <!-- Preference activity top margin -->
+    <dimen name="preference_screen_top_margin">0dp</dimen>
+    <!-- Preference activity bottom margin -->
+    <dimen name="preference_screen_bottom_margin">0dp</dimen>
+    <!-- Preference widget area width (to the left of the text) -->
+    <dimen name="preference_widget_width">48dp</dimen>
+    <!-- Preference fragment padding, bottom -->
+    <dimen name="preference_fragment_padding_bottom">0dp</dimen>
+    <!-- Preference fragment padding, sides -->
+    <dimen name="preference_fragment_padding_side">16dp</dimen>
+    <!-- Weight of the left pane in a multi-pane preference layout. -->
+    <integer name="preferences_left_pane_weight">4</integer>
+    <!-- Weight of the right pane in a multi-pane preference layout. So the split is 40:60 -->
+    <integer name="preferences_right_pane_weight">6</integer>
+    <!-- Padding to the left of the preference panel breadcrumb -->
+    <dimen name="preference_breadcrumb_paddingLeft">0dp</dimen>
+    <!-- Padding to the right of the preference panel breadcrumb -->
+    <dimen name="preference_breadcrumb_paddingRight">0dp</dimen>
+    <!-- Minimum space to allocate to the left of a preference item for an icon.
+        This helps in aligning titles when some items have icons and some don't. When space is
+        at a premium, we don't pre-allocate any space. -->
+    <dimen name="preference_icon_minWidth">0dp</dimen>
+    <!-- The platform's desired minimum size for a dialog's width when it
+         is along the major axis (that is the screen is landscape).  This may
+         be either a fraction or a dimension. -->
+    <item type="dimen" name="dialog_min_width_major">65%</item>
+
+    <!-- The platform's desired fixed width for a dialog along the major axis
+         (the screen is in landscape). This may be either a fraction or a dimension.-->
+    <item type="dimen" name="dialog_fixed_width_major">320dp</item>
+    <!-- The platform's desired fixed width for a dialog along the minor axis
+         (the screen is in portrait). This may be either a fraction or a dimension.-->
+    <item type="dimen" name="dialog_fixed_width_minor">320dp</item>
+    <!-- The platform's desired fixed height for a dialog along the major axis
+         (the screen is in portrait). This may be either a fraction or a dimension.-->
+    <item type="dimen" name="dialog_fixed_height_major">80%</item>
+    <!-- The platform's desired fixed height for a dialog along the minor axis
+         (the screen is in landscape). This may be either a fraction or a dimension.-->
+    <item type="dimen" name="dialog_fixed_height_minor">100%</item>
+
+    <!-- Preference activity, vertical padding for the header list -->
+    <dimen name="preference_screen_header_vertical_padding">0dp</dimen>
+
+    <dimen name="preference_screen_header_padding_side">16dip</dimen>
+    <integer name="preference_screen_header_scrollbarStyle">0x02000000</integer> <!-- outsideOverlay -->
+
+    <integer name="preference_fragment_scrollbarStyle">0x02000000</integer> <!-- outsideOverlay -->
+
+    <dimen name="preference_item_padding_side">8dip</dimen>
+    <dimen name="preference_item_padding_inner">8dip</dimen>
+    <dimen name="preference_child_padding_side">16dip</dimen>
+
+    <!-- The platform's desired minimum size for a dialog's width when it
+         is along the minor axis (that is the screen is portrait).  This may
+         be either a fraction or a dimension. -->
+    <item type="dimen" name="dialog_min_width_minor">95%</item>
+
+    <!-- The width of the big icons in notifications. -->
+    <dimen name="notification_large_icon_width">64dp</dimen>
+    <!-- The width of the big icons in notifications. -->
+    <dimen name="notification_large_icon_height">64dp</dimen>
+
+    <!-- Minimum width of the search view text entry area. -->
+    <dimen name="search_view_text_min_width">160dip</dimen>
+
+    <!-- Preferred width of the search view. -->
+    <dimen name="search_view_preferred_width">320dip</dimen>
+
+    <!-- Dialog title height -->
+    <dimen name="alert_dialog_title_height">64dip</dimen>
+    <!-- Dialog button bar height -->
+    <dimen name="alert_dialog_button_bar_height">48dip</dimen>
+
+    <!-- Default height of an action bar. -->
+    <dimen name="action_bar_default_height">48dip</dimen>
+    <!-- Vertical padding around action bar icons. -->
+    <dimen name="action_bar_icon_vertical_padding">8dip</dimen>
+    <!-- Text size for action bar titles -->
+    <dimen name="action_bar_title_text_size">18dp</dimen>
+    <!-- Text size for action bar subtitles -->
+    <dimen name="action_bar_subtitle_text_size">14dp</dimen>
+    <!-- Top margin for action bar subtitles -->
+    <dimen name="action_bar_subtitle_top_margin">-3dp</dimen>
+    <!-- Bottom margin for action bar subtitles -->
+    <dimen name="action_bar_subtitle_bottom_margin">5dip</dimen>
+
+    <!-- Size of clock font in LockScreen on Unsecure unlock screen. -->
+    <dimen name="keyguard_lockscreen_clock_font_size">80dip</dimen>
+
+    <!-- Size of status line font on Unsecure unlock LockScreen. -->
+    <dimen name="keyguard_lockscreen_status_line_font_size">14dip</dimen>
+
+    <!-- Size of right margin on Unsecure unlock LockScreen -->
+    <dimen name="keyguard_lockscreen_status_line_font_right_margin">42dip</dimen>
+
+    <!-- Size of top margin on Clock font to edge on unlock LockScreen -->
+    <dimen name="keyguard_lockscreen_status_line_clockfont_top_margin">22dip</dimen>
+
+    <!-- Size of top margin on Clock font to edge on unlock LockScreen -->
+    <dimen name="keyguard_lockscreen_status_line_clockfont_bottom_margin">12dip</dimen>
+
+    <!-- Padding on left margin of PIN text entry field to center it when del button is showing -->
+    <dimen name="keyguard_lockscreen_pin_margin_left">40dip</dimen>
+
+    <!-- Height of FaceUnlock view in keyguard -->
+    <dimen name="face_unlock_height">330dip</dimen>
+
+    <!-- Minimum popup width for selecting an activity in ActivityChooserDialog/ActivityChooserView. -->
+    <dimen name="activity_chooser_popup_min_width">200dip</dimen>
+
+    <!-- The default gap between components in a layout. -->
+    <dimen name="default_gap">8dip</dimen>
+
+    <!-- Text padding for dropdown items -->
+    <dimen name="dropdownitem_text_padding_left">8dip</dimen>
+
+    <!-- Text padding for dropdown items -->
+    <dimen name="dropdownitem_text_padding_right">8dip</dimen>
+
+    <!-- Width of the icon in a dropdown list -->
+    <dimen name="dropdownitem_icon_width">32dip</dimen>
+
+    <!-- Default width for a textview error popup -->
+    <dimen name="textview_error_popup_default_width">240dip</dimen>
+
+    <!-- Volume panel y offset -->
+    <dimen name="volume_panel_top">80dp</dimen>
+
+    <!-- Default padding to apply to AppWidgetHostViews containing widgets targeting API level 14 and up. -->
+    <dimen name="default_app_widget_padding_left">8dp</dimen>
+    <dimen name="default_app_widget_padding_top">8dp</dimen>
+    <dimen name="default_app_widget_padding_right">8dp</dimen>
+    <dimen name="default_app_widget_padding_bottom">8dp</dimen>
+
+    <!-- Minimum width for an action button in the menu area of an action bar -->
+    <dimen name="action_button_min_width">56dip</dimen>
+
+    <!-- Maximum height for a stacked tab bar as part of an action bar -->
+    <dimen name="action_bar_stacked_max_height">48dp</dimen>
+
+    <!-- Maximum width for a stacked action bar tab. This prevents
+         action bar tabs from becoming too wide on a wide screen when only
+         a few are present. -->
+    <dimen name="action_bar_stacked_tab_max_width">180dp</dimen>
+
+    <!-- Size of notification text (see TextAppearance.StatusBar.EventContent) -->
+    <dimen name="notification_text_size">14dp</dimen>
+    <!-- Size of notification text titles (see TextAppearance.StatusBar.EventContent.Title) -->
+    <dimen name="notification_title_text_size">18dp</dimen>
+    <!-- Size of smaller notification text (see TextAppearance.StatusBar.EventContent.Line2, Info, Time) -->
+    <dimen name="notification_subtext_size">12dp</dimen>
+
+    <!-- Keyguard dimensions -->
+    <!-- TEMP -->
+    <dimen name="kg_security_panel_height">600dp</dimen>
+
+    <!-- Height of security view in keyguard. -->
+    <dimen name="kg_security_view_height">480dp</dimen>
+
+    <!-- Width of widget view in keyguard. -->
+    <dimen name="kg_widget_view_width">0dp</dimen>
+
+    <!-- Height of widget view in keyguard. -->
+    <dimen name="kg_widget_view_height">0dp</dimen>
+
+    <!-- Size of the clock font in keyguard's status view -->
+    <dimen name="kg_status_clock_font_size">75dp</dimen>
+
+    <!-- Size of the date font in keyguard's status view  -->
+    <dimen name="kg_status_date_font_size">15dp</dimen>
+
+    <!-- Size of the generic status lines keyguard's status view  -->
+    <dimen name="kg_status_line_font_size">13dp</dimen>
+
+    <!-- Size of margin on the right of keyguard's status view -->
+    <dimen name="kg_status_line_font_right_margin">16dp</dimen>
+
+    <!-- Top margin for the clock view -->
+    <dimen name="kg_clock_top_margin">-16dp</dimen>
+
+    <!-- Horizontal gap between keys in PIN and SIM PIN numeric keyboards in keyguard -->
+    <dimen name="kg_key_horizontal_gap">0dp</dimen>
+
+    <!-- Horizontal gap between keys in PIN and SIM PIN numeric keyboards in keyguard -->
+    <dimen name="kg_key_vertical_gap">0dp</dimen>
+
+    <!-- Horizontal gap between keys in PIN and SIM PIN numeric keyboards in keyguard -->
+    <dimen name="kg_pin_key_height">60dp</dimen>
+
+    <!-- Space reserved at the bottom of secure views (pin/pattern/password/SIM pin/SIM puk) -->
+    <dimen name="kg_secure_padding_height">46dp</dimen>
+
+    <!-- The height of the runway lights strip -->
+    <dimen name="kg_runway_lights_height">7dp</dimen>
+
+    <!-- The height of the runway lights strip -->
+    <dimen name="kg_runway_lights_vertical_padding">2dp</dimen>
+
+    <!-- Horizontal padding for the widget pager -->
+    <dimen name="kg_widget_pager_horizontal_padding">16dp</dimen>
+
+    <!-- Top padding for the widget pager -->
+    <dimen name="kg_widget_pager_top_padding">0dp</dimen>
+
+    <!-- Bottom padding for the widget pager -->
+    <dimen name="kg_widget_pager_bottom_padding">64dp</dimen>
+
+    <!-- Top margin for the runway lights. We add a negative margin in large
+        devices to account for the widget pager padding -->
+    <dimen name="kg_runway_lights_top_margin">0dp</dimen>
+
+    <!-- Touch slop for the global toggle accessibility gesture -->
+    <dimen name="accessibility_touch_slop">80dip</dimen>
+
+    <!-- Width of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
+    <dimen name="keyguard_security_width">320dp</dimen>
+
+    <!-- Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
+    <dimen name="keyguard_security_height">400dp</dimen>
+
+    <!-- Margin around the various security views -->
+    <dimen name="keyguard_security_view_margin">8dp</dimen>
+
+    <!-- Margin around the various security views -->
+    <dimen name="keyguard_muliuser_selector_margin">8dp</dimen>
+
+    <!-- Stroke width of the frame for the circular avatars. -->
+    <dimen name="keyguard_avatar_frame_stroke_width">2dp</dimen>
+
+    <!-- Shadow radius under the frame for the circular avatars. -->
+    <dimen name="keyguard_avatar_frame_shadow_radius">1dp</dimen>
+
+    <!-- Size of the avator on hte multiuser lockscreen. -->
+    <dimen name="keyguard_avatar_size">66dp</dimen>
+
+    <!-- Size of the text under the avator on the multiuser lockscreen. -->
+    <dimen name="keyguard_avatar_name_size">10sp</dimen>
+
+    <!-- Size of the region along the edge of the screen that will accept
+         swipes to scroll the widget area. -->
+    <dimen name="kg_edge_swipe_region_size">24dp</dimen>
+
+    <!-- If the height if keyguard drops below this threshold (most likely
+    due to the appearance of the IME), then drop the multiuser selector. -->
+    <dimen name="kg_squashed_layout_threshold">600dp</dimen>
+
+    <!-- The height of widgets which do not support vertical resizing. This is only
+    used on tablets; on phones, this size is determined by the space left by the
+    security mode. -->
+    <dimen name="kg_small_widget_height">160dp</dimen>
+
+    <!-- Rounded corner radius for video subtitles. -->
+    <dimen name="subtitle_corner_radius">2dp</dimen>
+
+    <!-- Shadow radius for video subtitles. -->
+    <dimen name="subtitle_shadow_radius">2dp</dimen>
+
+    <!-- Shadow offset for video subtitles. -->
+    <dimen name="subtitle_shadow_offset">2dp</dimen>
+
+    <!-- Outline width for video subtitles. -->
+    <dimen name="subtitle_outline_width">2dp</dimen>
+
+    <!-- width of ImmersiveModeConfirmation (-1 for match_parent) -->
+    <dimen name="immersive_mode_cling_width">-1px</dimen>
+</resources>
diff --git a/app/src/main/res/values/pdnsd.xml b/app/src/main/res/values/pdnsd.xml
new file mode 100644
index 0000000..522f765
--- /dev/null
+++ b/app/src/main/res/values/pdnsd.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="pdnsd_conf" formatted="false">
+global {
+	perm_cache=0;
+	cache_dir="/data/data/org.torproject.android/app_bin";
+	server_port = 8091;
+	server_ip = 0.0.0.0;
+	query_method=udp_only;
+	min_ttl=15m;
+	max_ttl=1w;
+	timeout=10;
+	daemon=on;
+	pid_file="/data/data/org.torproject.android/app_bin/pdnsd.pid";
+
+}
+
+server {
+	label= "upstream";
+	ip = %s;
+	port = %d;
+	uptest = none;
+}
+
+rr {
+	name=localhost;
+	reverse=on;
+	a=127.0.0.1;
+	owner=localhost;
+	soa=localhost,root.localhost,42,86400,900,86400,86400;
+}
+	</string>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..59fcb77
--- /dev/null
+++ b/app/src/main/res/values/strings.xml
@@ -0,0 +1,339 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">start and stop Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot is starting…</string>
+  <string name="status_activated">Connected to the Tor network</string>
+  <string name="status_disabled">Orbot is deactivated</string>
+  <string name="status_shutting_down">TorService is shutting down</string>
+  <string name="tor_process_starting">Starting Tor client…</string>
+  <string name="tor_process_complete">complete.</string>
+  <string name="tor_process_waiting">waiting.</string>
+  <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string>
+  <string name="menu_home">Home</string>
+  <string name="menu_browse">Browse</string>
+  <string name="menu_settings">Settings</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Help</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Start</string>
+  <string name="menu_stop">Stop</string>
+  <string name="menu_about">About</string>
+  <string name="menu_promo_apps">Get apps…</string>
+  <string name="main_layout_download">Download</string>
+  <string name="main_layout_upload">Upload</string>
+  <string name="button_help">Help</string>
+  <string name="button_close">Close</string>
+  <string name="button_about">About</string>
+  <string name="button_clear_log">Clear Log</string>
+  <string name="menu_verify">Check</string>
+  <string name="menu_exit">Exit</string>
+  <string name="menu_scan">Scan BridgeQR</string>
+  <string name="menu_share_bridge">Share BridgeQR</string>
+  <string name="press_to_start">- long press to start -</string>
+  <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string>
+  <string name="pref_trans_proxy_title">Transparent Proxying</string>
+  <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string>
+  <string name="pref_transparent_all_title">Tor Everything</string>
+  <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string>
+  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
+  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
+  <string name="pref_transparent_port_title">Port List</string>
+  <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
+  <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
+  <string name="pref_has_root">Request Root Access</string>
+  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
+  <string name="status_install_success">Tor binaries successfully installed!</string>
+  <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants at torproject.org</string>
+  <string name="title_error">Application Error</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">About Orbot</string>
+  <string name="btn_next">Next</string>
+  <string name="btn_back">Back</string>
+  <string name="btn_finish">Finish</string>
+  <string name="btn_okay">Okay</string>
+  <string name="btn_cancel">Cancel</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Some Orbot Details</string>
+  <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Polipo. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string>
+  <string name="wizard_permissions_root">Permission Granted</string>
+  <string name="wizard_permissions_stock">Orbot Permissions</string>
+  <string name="wizard_premissions_msg_root">Excellent! We\'ve detected that you have root permissions enabled for Orbot. We will use this power wisely.</string>
+  <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string>
+  <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string>
+  <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string>
+  <string name="wizard_permission_enable_root">Grant Root for Orbot</string>
+  <string name="wizard_configure">Configure Torification</string>
+  <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string>
+  <string name="wizard_configure_all">Proxy All Apps Through Tor</string>
+  <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string>
+  <string name="wizard_tips_tricks">Orbot-enabled Apps</string>
+  <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later on Google Play, at GuardianProject.info website or via F-Droid.org.</string>
+  <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="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="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>
+  <string name="wizard_final">Orbot is ready!</string>
+  <string name="wizard_final_msg">Millions of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens… and now you are ready to, as well!</string>
+  <string name="wizard_exit_at_first_screen_toast">Please configure Orbot before you can start using it!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Browser\' button to test your connection. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help at guardianproject.info to learn more.</string>
+  <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
+  <string name="pref_hs_group">Hidden Service Hosting</string>
+  <string name="pref_general_group">General</string>
+  <string name="pref_start_boot_title">Start Orbot on Boot</string>
+  <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Warning</string>
+  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permissions</string>
+  <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
+  <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide root or \'Superuser\' access.\n\nPlease try the \'Apps\' mode on the main screen instead.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox: Privacy-enhanced browser that works through Tor</string>
+  <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string>
+  <string name="wizard_tips_fdroid">Find all Guardian Project apps on F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Find all Guardian Project apps on https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <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>
+  <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
+  <string name="wizard_transproxy_none">None</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string>
+  <string name="button_grant_superuser">Request Superuser Access</string>
+  <string name="pref_select_apps">Select Apps</string>
+  <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
+  <string name="pref_node_configuration">Node Configuration</string>
+  <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string>
+  <string name="pref_entrance_node">Entrance Nodes</string>
+  <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
+  <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
+  <string name="pref_allow_background_starts_title">Allow Background Starts</string>
+  <string name="pref_allow_background_starts_summary">Let any app tell Orbot to start Tor and related services</string>
+  
+  <string name="button_proxy_all">Proxy All</string>
+  <string name="button_proxy_none">Proxy None</string>
+  <string name="button_invert_selection">Invert Selection</string>
+
+  <string name="pref_proxy_title">Outbound Network Proxy (Optional)</string>
+  
+  <string name="pref_proxy_type_title">Outbound Proxy Type</string>
+  <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Enter Proxy Type</string>
+  
+  <string name="pref_proxy_host_title">Outbound Proxy Host</string>
+  <string name="pref_proxy_host_summary">Proxy Server hostname</string>
+  <string name="pref_proxy_host_dialog">Enter Proxy Host</string>
+  
+  <string name="pref_proxy_port_title">Outbound Proxy Port</string>
+  <string name="pref_proxy_port_summary">Proxy Server port</string>
+  <string name="pref_proxy_port_dialog">Enter Proxy port</string>
+
+  <string name="pref_proxy_username_title">Outbound Proxy Username</string>
+  <string name="pref_proxy_username_summary">Proxy Username (Optional)</string>
+  <string name="pref_proxy_username_dialog">Enter Proxy Username</string>
+  
+  <string name="pref_proxy_password_title">Outbound Proxy Password</string>
+  <string name="pref_proxy_password_summary">Proxy Password (Optional)</string>
+  <string name="pref_proxy_password_dialog">Enter Proxy Password</string>
+  
+  
+  
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying…</string>
+  <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying…</string>
+  <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
+  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
+  <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
+  <string name="privoxy_is_running_on_port_">Polipo is running on port: </string>
+  <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying…</string>
+  <string name="bridge_error">Bridge Error</string>
+  <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
+  <string name="send_email_for_bridges">Send an email to bridges at torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
+  <string name="error">Error</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
+  <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
+  <string name="exit_nodes">Exit Nodes</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
+  <string name="enter_exit_nodes">Enter Exit Nodes</string>
+  <string name="exclude_nodes">Exclude Nodes</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
+  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
+  <string name="strict_nodes">Strict Nodes</string>
+  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
+  <string name="bridges">Bridges</string>
+  <string name="use_bridges">Use Bridges</string>
+  <string name="bridges_obfuscated">Obfuscated Bridges</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string>
+  <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string>
+  <string name="enter_bridge_addresses">Enter Bridge Addresses</string>
+  <string name="relays">Relays</string>
+  <string name="relaying">Relaying</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string>
+  <string name="relay_port">Relay Port</string>
+  <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string>
+  <string name="enter_or_port">Enter OR port</string>
+  <string name="relay_nickname">Relay nickname</string>
+  <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string>
+  <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string>
+  <string name="reachable_addresses">Reachable Addresses</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string>
+  <string name="reachable_ports">Reachable ports</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string>
+  <string name="enter_ports">Enter ports</string>
+  <string name="enable_hidden_services">Hidden Service Hosting</string>
+  <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string>
+  <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string>
+  <string name="hidden_service_ports">Hidden Service Ports</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string>
+  <string name="project_home">Project Home(s): </string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">The Tor License</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3rd-Party-Software: </string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string>
+  <string name="found_existing_tor_process">found existing Tor process…</string>
+  <string name="something_bad_happened">Something bad happened. Check the log</string>
+  <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>
+  
+  <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string>
+  
+  <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string>
+  <string name="pref_use_persistent_notifications_title">Always-On Notifications</string>
+  
+  <string name="pref_use_expanded_notifications">Show expanded notification with Tor exit country and IP</string>
+  <string name="pref_use_expanded_notifications_title">Expanded Notifications</string>
+  
+  <string name="notification_using_bridges">Bridges enabled!</string>
+  <string name="default_bridges"/>
+  <string name="set_locale_title">Language</string>
+  <string name="set_locale_summary">Choose the locale and language for Orbot</string>
+  <string name="wizard_locale_title">Choose Language</string>
+  <string name="wizard_locale_msg">Leave default or switch the current language</string>
+  <string name="powered_by">powered by Tor</string>
+  <string name="btn_save_settings">Save Settings</string>
+  <string name="no_internet_connection_tor">No internet connection; Tor is on standby…</string>
+  <string name="bandwidth_">Bandwidth:</string>
+  <string name="down">down</string>
+  <string name="up">up</string>
+  <string name="pref_disable_network_title">No Network Auto-Sleep</string>
+  <string name="pref_disable_network_summary">Put Tor to sleep when there is no internet available</string>
+  <string name="newnym">You\'ve switched to a new Tor identity!</string>
+  
+    <string name="menu_verify_browser">Browser</string>
+    <string name="menu_use_chatsecure">Use ChatSecure</string>
+
+    <string name="permission_manage_tor_label">Manage Tor</string>
+    <string name="permission_manage_tor_description">Enable this app to control the Tor service</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">It doesn\'t seem like you have Orfox installed. Want help with that, or should we just open the browser?</string>
+    <string name="install_apps_">Install apps?</string>
+    <string name="no_network_connectivity_putting_tor_to_sleep_">No network connectivity. Putting Tor to sleep…</string>
+    <string name="network_connectivity_is_good_waking_tor_up_">Network connectivity is good. Waking Tor up…</string>
+    <string name="updating_settings_in_tor_service">updating settings in Tor service</string>
+  
+    <string name="pref_socks_title">Tor SOCKS</string>
+    <string name="pref_socks_summary">Port that Tor offers its SOCKS proxy on (default: 9050 or 0 to disable)</string>
+    <string name="pref_socks_dialog">SOCKS Port Config</string>
+    
+    <string name="pref_transport_title">Tor TransProxy Port</string>
+    <string name="pref_transport_summary">Port that Tor offers its Transparent Proxy on (default: 9040 or 0 to disable)</string>
+    <string name="pref_transport_dialog">TransProxy Port Config</string>
+    
+    
+    <string name="pref_dnsport_title">Tor DNS Port</string>
+    <string name="pref_dnsport_summary">Port that Tor offers its DNS on (default: 5400 or 0 to disable)</string>
+    <string name="pref_dnsport_dialog">DNS Port Config</string>
+    
+    
+    <string name="pref_torrc_title">Torrc Custom Config</string>
+    <string name="pref_torrc_summary">EXPERTS ONLY: enter direct torrc config lines</string>
+    <string name="pref_torrc_dialog">Custom Torrc</string>
+    
+    <string name="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</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>
+  
+
+  <string name="pref_transproxy_refresh_title">Transproxy Auto-Refresh</string>
+  <string name="pref_transproxy_refresh_summary">Re-apply Transproxy rules when the network state changes</string>
+  
+  <string name="pref_transproxy_flush_title">Transproxy FORCE REMOVE</string>
+  <string name="pref_transproxy_flush_summary">Tap here to flush all transproxy network rules NOW</string>
+  <string name="transparent_proxy_rules_flushed_">Transparent proxy rules flushed!</string>
+  <string name="you_do_not_have_root_access_enabled">You do not have ROOT access enabled</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">You may need to stop and start Orbot for settings change to be enabled.</string>
+  
+  <string name="menu_vpn">VPN</string>
+  
+  <string name="kbps">kbps</string>
+  
+  <string name="mbps">mbps</string>
+  
+  <string name="kb">KB</string>
+  
+  <string name="mb">MB</string>
+  
+  <string name="bridges_updated">Bridges Updated</string>
+  
+  <string name="restart_orbot_to_use_this_bridge_">Please restart Orbot to enable the changes</string>
+  
+  <string name="menu_qr">QR Codes</string>
+  
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">If your mobile network actively blocks Tor, you can use a Bridge to access the network. SELECT one of the bridge types above to enable bridges.</string>
+  
+  <string name="bridge_mode">Bridge Mode</string>
+  
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  
+  <string name="activate">Activate</string>
+  
+  <string name="apps_mode">Apps VPN Mode</string>
+  
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">You can enable all apps on your device to run through the Tor network using the VPN feature of Android.\n\n*WARNING* This is a new, experimental feature and in some cases may not start automatically, or may stop. It should NOT be used for anonymity, and ONLY used for getting through firewalls and filters.</string>
+  
+  <string name="send_email">Send Email</string>
+  
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">You can get a bridge address through email, the web or by scanning a bridge QR code. Select \'Email\' or \'Web\' below to request a bridge address.\n\nOnce you have an address, copy & paste it into the \"Bridges\" preference in Orbot\'s setting and restart.</string>
+  
+  <string name="install_orweb">Install Orfox</string>
+  
+  <string name="standard_browser">Standard Browser</string>
+  
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTE: Only standard Tor bridges work on Intel X86/ATOM devices</string>
+
+	<string name="vpn_default_world">World</string>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..b3fe8af
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="NotificationText" parent="android:TextAppearance.StatusBar.EventContent" />
+    <style name="NotificationTitle" parent="android:TextAppearance.StatusBar.EventContent.Title" />
+</resources>
diff --git a/app/src/main/res/values/theme.xml b/app/src/main/res/values/theme.xml
new file mode 100644
index 0000000..e51e533
--- /dev/null
+++ b/app/src/main/res/values/theme.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+    <style name="DefaultTheme" parent="Theme.AppCompat.NoActionBar">
+    </style>
+    
+</resources>
+
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
new file mode 100644
index 0000000..f34548e
--- /dev/null
+++ b/app/src/main/res/xml/preferences.xml
@@ -0,0 +1,269 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+<PreferenceCategory android:title="@string/pref_general_group">
+<CheckBoxPreference 
+android:defaultValue="true" 
+android:key="pref_start_boot"
+android:title="@string/pref_start_boot_title"
+android:summary="@string/pref_start_boot_summary"
+android:enabled="true"/>
+
+<CheckBoxPreference
+android:defaultValue="true" 
+android:key="pref_persistent_notifications"
+android:summary="@string/pref_use_persistent_notifications"
+android:enabled="true" 
+android:title="@string/pref_use_persistent_notifications_title"/>
+
+<CheckBoxPreference
+android:defaultValue="true" 
+android:key="pref_expanded_notifications"
+android:summary="@string/pref_use_expanded_notifications"
+android:enabled="true" 
+android:title="@string/pref_use_expanded_notifications_title"/>
+
+<CheckBoxPreference
+android:defaultValue="true" 
+android:key="pref_allow_background_starts"
+android:summary="@string/pref_allow_background_starts_summary"
+android:title="@string/pref_allow_background_starts_title"/>
+
+ <ListPreference android:title="@string/set_locale_title"
+   android:key="pref_default_locale"
+   android:summary="@string/set_locale_summary"
+   android:defaultValue="en">
+ </ListPreference>
+
+</PreferenceCategory>
+
+<PreferenceCategory android:title="@string/pref_trans_proxy_group">
+
+<CheckBoxPreference 
+android:defaultValue="false" 
+android:key="has_root"
+android:title="@string/pref_has_root"
+android:summary="@string/pref_has_root_summary"
+android:enabled="true"/>
+    
+<CheckBoxPreference 
+android:defaultValue="false" 
+android:key="pref_transparent"
+android:title="@string/pref_trans_proxy_title"
+android:summary="@string/pref_trans_proxy_summary"
+android:enabled="true"/>
+
+<CheckBoxPreference
+android:defaultValue="false" 
+android:key="pref_transparent_all"
+android:summary="@string/pref_transparent_all_summary"
+android:enabled="true" 
+android:title="@string/pref_transparent_all_title"/>
+
+<Preference
+android:defaultValue="" 
+android:key="pref_transparent_app_list"
+android:title="@string/pref_select_apps"
+android:summary="@string/pref_select_apps_summary"
+android:enabled="true"/>
+
+<CheckBoxPreference
+android:defaultValue="false" 
+android:key="pref_transparent_tethering"
+android:summary="@string/pref_transparent_tethering_summary"
+android:enabled="true" 
+android:dependency="has_root"
+android:title="@string/pref_transparent_tethering_title"/>
+
+
+</PreferenceCategory>
+
+<PreferenceCategory android:title="@string/pref_node_configuration"
+ android:summary="@string/pref_node_configuration_summary">
+ 
+<EditTextPreference android:key="pref_entrance_nodes"
+android:title="@string/pref_entrance_node"
+android:summary="@string/pref_entrance_node_summary"
+android:dialogTitle="@string/pref_entrance_node_dialog"
+/>
+<EditTextPreference android:key="pref_exit_nodes"
+android:title="@string/exit_nodes"
+android:summary="@string/fingerprints_nicks_countries_and_addresses_for_the_last_hop"
+android:dialogTitle="@string/enter_exit_nodes"
+/>
+<EditTextPreference android:key="pref_exclude_nodes"
+android:title="@string/exclude_nodes"
+android:summary="@string/fingerprints_nicks_countries_and_addresses_to_exclude"
+android:dialogTitle="@string/enter_exclude_nodes"
+/>
+
+<CheckBoxPreference android:defaultValue="false" 
+android:title="@string/strict_nodes" android:key="pref_strict_nodes" 
+android:summary="@string/use_only_these_specified_nodes"/>
+
+</PreferenceCategory> 
+<PreferenceCategory android:title="@string/bridges">
+
+<CheckBoxPreference android:defaultValue="false" 
+android:title="@string/use_bridges" android:key="pref_bridges_enabled" 
+android:summary="@string/enable_alternate_entrance_nodes_into_the_tor_network"/>
+
+<EditTextPreference android:key="pref_bridges_list"
+android:title="@string/bridges"
+android:summary="@string/ip_address_and_port_of_bridges"
+android:dialogTitle="@string/enter_bridge_addresses"
+android:defaultValue="@string/default_bridges"
+android:inputType="textMultiLine|textNoSuggestions"
+/>
+
+</PreferenceCategory>
+
+<PreferenceCategory android:title="@string/relays">
+<CheckBoxPreference android:key="pref_or"
+android:defaultValue="false"
+android:title="@string/relaying"
+android:summary="@string/enable_your_device_to_be_a_non_exit_relay"
+android:enabled="true"
+/>
+
+<EditTextPreference android:key="pref_or_port"
+android:defaultValue="9001"
+android:title="@string/relay_port"
+android:summary="@string/listening_port_for_your_tor_relay"
+android:dialogTitle="@string/enter_or_port"
+/>
+
+<EditTextPreference android:key="pref_or_nickname"
+android:defaultValue="OrbotRelay"
+android:title="@string/relay_nickname"
+android:summary="@string/the_nickname_for_your_tor_relay"
+android:dialogTitle="@string/enter_a_custom_relay_nickname"
+/>
+
+</PreferenceCategory>
+
+<PreferenceCategory android:title="ReachableAddresses">
+<CheckBoxPreference
+android:key="pref_reachable_addresses"
+android:defaultValue="false"
+android:title="@string/reachable_addresses"
+android:summary="@string/run_as_a_client_behind_a_firewall_with_restrictive_policies"
+android:enabled="true"></CheckBoxPreference>
+
+<EditTextPreference
+android:key="pref_reachable_addresses_ports"
+android:defaultValue="*:80,*:443"
+android:title="@string/reachable_ports"
+android:summary="@string/ports_reachable_behind_a_restrictive_firewall"
+android:dialogTitle="@string/enter_ports"
+/>
+</PreferenceCategory>
+
+<PreferenceCategory android:title="@string/pref_hs_group">
+<CheckBoxPreference android:title="@string/enable_hidden_services" 
+android:summary="@string/run_servers_accessible_via_the_tor_network" android:key="pref_hs_enable"></CheckBoxPreference>
+<EditTextPreference android:summary="@string/enter_localhost_ports_for_hidden_services" 
+android:title="@string/hidden_service_ports" android:enabled="false" android:key="pref_hs_ports"></EditTextPreference>
+
+<EditTextPreference android:key="pref_hs_hostname" 
+android:summary="@string/the_addressable_name_for_your_hidden_service_generated_automatically_" 
+android:title=".Onion Hostname"></EditTextPreference>
+</PreferenceCategory>
+
+<PreferenceCategory android:title="@string/pref_proxy_title">
+<EditTextPreference android:key="pref_proxy_type"
+android:title="@string/pref_proxy_type_title"
+android:summary="@string/pref_proxy_type_summary"
+android:dialogTitle="@string/pref_proxy_type_dialog"
+/>
+<EditTextPreference android:key="pref_proxy_host"
+android:title="@string/pref_proxy_host_title"
+android:summary="@string/pref_proxy_host_summary"
+android:dialogTitle="@string/pref_proxy_host_dialog"
+/>
+<EditTextPreference android:key="pref_proxy_port"
+android:title="@string/pref_proxy_port_title"
+android:summary="@string/pref_proxy_port_summary"
+android:dialogTitle="@string/pref_proxy_port_dialog"
+/>
+
+<EditTextPreference android:key="pref_proxy_username"
+android:title="@string/pref_proxy_username_title"
+android:summary="@string/pref_proxy_username_summary"
+android:dialogTitle="@string/pref_proxy_username_dialog"
+/>
+<EditTextPreference android:key="pref_proxy_password"
+android:title="@string/pref_proxy_password_title"
+android:summary="@string/pref_proxy_password_summary"
+android:dialogTitle="@string/pref_proxy_password_dialog"
+/>
+</PreferenceCategory>
+
+<PreferenceCategory android:title="Debug">
+    
+    <EditTextPreference android:key="pref_socks"
+android:title="@string/pref_socks_title"
+android:summary="@string/pref_socks_summary"
+android:dialogTitle="@string/pref_socks_dialog"
+android:defaultValue="9050"
+/>
+    
+      <EditTextPreference android:key="pref_transport"
+android:title="@string/pref_transport_title"
+android:summary="@string/pref_transport_summary"
+android:dialogTitle="@string/pref_transport_dialog"
+android:defaultValue="9040"
+/>
+      
+        <EditTextPreference android:key="pref_dnsport"
+android:title="@string/pref_dnsport_title"
+android:summary="@string/pref_dnsport_summary"
+android:dialogTitle="@string/pref_dnsport_dialog"
+android:defaultValue="5400"
+/>
+    
+  <EditTextPreference android:key="pref_custom_torrc"
+android:title="@string/pref_torrc_title"
+android:summary="@string/pref_torrc_summary"
+android:dialogTitle="@string/pref_torrc_dialog"
+android:defaultValue=""
+/>
+    
+  
+<CheckBoxPreference
+android:key="pref_enable_logging"
+android:defaultValue="false"
+android:title="Debug Log"
+android:summary="@string/enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"
+android:enabled="true"></CheckBoxPreference>
+
+
+<CheckBoxPreference
+android:defaultValue="false" 
+android:key="pref_use_sys_iptables"
+android:summary="@string/pref_use_sys_iptables_summary"
+android:enabled="true" 
+android:title="@string/pref_use_sys_iptables_title"/>
+
+
+<CheckBoxPreference
+android:defaultValue="true" 
+android:key="pref_disable_network"
+android:summary="@string/pref_disable_network_summary"
+android:enabled="true" 
+android:title="@string/pref_disable_network_title"/>
+
+<CheckBoxPreference
+android:defaultValue="false" 
+android:key="pref_transproxy_refresh"
+android:summary="@string/pref_transproxy_refresh_summary"
+android:enabled="true" 
+android:title="@string/pref_transproxy_refresh_title"/>
+
+<Preference
+android:key="pref_transproxy_flush"
+android:summary="@string/pref_transproxy_flush_summary"
+android:enabled="true" 
+android:title="@string/pref_transproxy_flush_title"/>
+
+</PreferenceCategory>
+</PreferenceScreen>
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..856d3d7
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,15 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.1.0'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
diff --git a/external/Makefile b/external/Makefile
index 211df76..e232cdd 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -226,8 +226,8 @@ tor/configure:
 
 tor/Makefile: tor/configure
 	cp fix_android_0.2.6.4rc_build.patch tor
-	cd tor && \
-		git apply fix_android_0.2.6.4rc_build.patch
+#	cd tor && \
+#		git apply fix_android_0.2.6.4rc_build.patch
 	cp config.sub tor
 	cp config.guess tor
 	cd tor && \
diff --git a/external/tor b/external/tor
index 7a489a6..fa6a228 160000
--- a/external/tor
+++ b/external/tor
@@ -1 +1 @@
-Subproject commit 7a489a638911012069981702065b952a5809d249
+Subproject commit fa6a228ce86c2737447f32c78eedc00083eb826c
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..13372ae
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..122a0dc
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..9d82f78
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..aec9973
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+ at if "%DEBUG%" == "" @echo off
+ at rem ##########################################################################
+ at rem
+ at rem  Gradle startup script for Windows
+ at rem
+ at rem ##########################################################################
+
+ at rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+ at rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+ at rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+ at rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+ at rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+ at rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+ at rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+ at rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+ at rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/jsocksAndroid/build.gradle b/jsocksAndroid/build.gradle
new file mode 100644
index 0000000..f2901a8
--- /dev/null
+++ b/jsocksAndroid/build.gradle
@@ -0,0 +1,18 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 23
+    buildToolsVersion "23.0.2"
+
+    defaultConfig {
+        minSdkVersion 8
+        targetSdkVersion 21
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+}
diff --git a/jsocksAndroid/src/main/AndroidManifest.xml b/jsocksAndroid/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..7351fd2
--- /dev/null
+++ b/jsocksAndroid/src/main/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.jsocksandroid"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="21" />
+
+
+</manifest>
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/main/SOCKS.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/main/SOCKS.java
new file mode 100644
index 0000000..9174c7e
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/main/SOCKS.java
@@ -0,0 +1,267 @@
+package com.runjva.sourceforge.jsocks.main;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Hashtable;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+import android.util.Log;
+
+import com.runjva.sourceforge.jsocks.protocol.InetRange;
+import com.runjva.sourceforge.jsocks.protocol.ProxyServer;
+import com.runjva.sourceforge.jsocks.protocol.SocksProxyBase;
+import com.runjva.sourceforge.jsocks.server.IdentAuthenticator;
+
+public class SOCKS {
+
+	private static final int DEFAULT_LISTENING_PORT = 1080;
+
+	static public void usage() {
+		System.out.println("Usage: java SOCKS [inifile1 inifile2 ...]\n"
+				+ "If none inifile is given, uses socks.properties.\n");
+	}
+
+	static public void main(String[] args) {
+
+		String[] file_names;
+		int port = DEFAULT_LISTENING_PORT;
+		String logFile = null;
+		String host = null;
+
+		final IdentAuthenticator auth = new IdentAuthenticator();
+
+		InetAddress localIP = null;
+
+		if (args.length == 0) {
+			file_names = new String[] { "socks.properties" };
+		} else {
+			file_names = args;
+		}
+
+		inform("Loading properties");
+		for (int i = 0; i < file_names.length; ++i) {
+
+			inform("Reading file " + file_names[i]);
+
+			final Properties pr = loadProperties(file_names[i]);
+			if (pr == null) {
+				System.err.println("Loading of properties from "
+						+ file_names[i] + "failed.");
+				usage();
+				return;
+			}
+			if (!addAuth(auth, pr)) {
+				System.err.println("Error in file " + file_names[i] + ".");
+				usage();
+				return;
+			}
+			// First file should contain all global settings,
+			// like port and host and log.
+			if (i == 0) {
+				final String port_s = (String) pr.get("port");
+				if (port_s != null) {
+					try {
+						port = Integer.parseInt(port_s);
+					} catch (final NumberFormatException nfe) {
+						System.err.println("Can't parse port: " + port_s);
+						return;
+					}
+				}
+
+				serverInit(pr);
+				logFile = (String) pr.get("log");
+				host = (String) pr.get("host");
+			}
+
+			// inform("Props:"+pr);
+		}
+
+		if (logFile != null) {
+			System.err.println("log property not supported anymore.");
+		}
+		if (host != null) {
+			try {
+				localIP = InetAddress.getByName(host);
+			} catch (final UnknownHostException uhe) {
+				System.err.println("Can't resolve local ip: " + host);
+				return;
+			}
+		}
+
+		inform("Using Ident Authentication scheme: " + auth);
+		final ProxyServer server = new ProxyServer(auth);
+		server.start(port, 5, localIP);
+	}
+
+	static Properties loadProperties(String file_name) {
+
+		final Properties pr = new Properties();
+
+		try {
+			final InputStream fin = new FileInputStream(file_name);
+			pr.load(fin);
+			fin.close();
+		} catch (final IOException ioe) {
+			return null;
+		}
+		return pr;
+	}
+
+	static boolean addAuth(IdentAuthenticator ident, Properties pr) {
+
+		InetRange irange;
+
+		final String range = (String) pr.get("range");
+		if (range == null) {
+			return false;
+		}
+		irange = parseInetRange(range);
+
+		final String users = (String) pr.get("users");
+
+		if (users == null) {
+			ident.add(irange, null);
+			return true;
+		}
+
+		final Hashtable<String, String> uhash = new Hashtable<String, String>();
+
+		final StringTokenizer st = new StringTokenizer(users, ";");
+		while (st.hasMoreTokens()) {
+			uhash.put(st.nextToken(), "");
+		}
+
+		ident.add(irange, uhash);
+		return true;
+	}
+
+	/**
+	 * Does server initialisation.
+	 */
+	static void serverInit(Properties props) {
+		int val;
+		val = readInt(props, "iddleTimeout");
+		if (val >= 0) {
+			ProxyServer.setIddleTimeout(val);
+			inform("Setting iddle timeout to " + val + " ms.");
+		}
+		val = readInt(props, "acceptTimeout");
+		if (val >= 0) {
+			ProxyServer.setAcceptTimeout(val);
+			inform("Setting accept timeout to " + val + " ms.");
+		}
+		val = readInt(props, "udpTimeout");
+		if (val >= 0) {
+			ProxyServer.setUDPTimeout(val);
+			inform("Setting udp timeout to " + val + " ms.");
+		}
+
+		val = readInt(props, "datagramSize");
+		if (val >= 0) {
+			ProxyServer.setDatagramSize(val);
+			inform("Setting datagram size to " + val + " bytes.");
+		}
+
+		proxyInit(props);
+
+	}
+
+	/**
+	 * Initialises proxy, if any specified.
+	 */
+	static void proxyInit(Properties props) {
+		String proxy_list;
+		SocksProxyBase proxy = null;
+		StringTokenizer st;
+
+		proxy_list = (String) props.get("proxy");
+		if (proxy_list == null) {
+			return;
+		}
+
+		st = new StringTokenizer(proxy_list, ";");
+		while (st.hasMoreTokens()) {
+			final String proxy_entry = st.nextToken();
+
+			final SocksProxyBase p = SocksProxyBase.parseProxy(proxy_entry);
+
+			if (p == null) {
+				exit("Can't parse proxy entry:" + proxy_entry);
+			}
+
+			inform("Adding Proxy:" + p);
+
+			if (proxy != null) {
+				p.setChainProxy(proxy);
+			}
+
+			proxy = p;
+
+		}
+		if (proxy == null) {
+			return; // Empty list
+		}
+
+		final String direct_hosts = (String) props.get("directHosts");
+		if (direct_hosts != null) {
+			final InetRange ir = parseInetRange(direct_hosts);
+			inform("Setting direct hosts:" + ir);
+			proxy.setDirect(ir);
+		}
+
+		ProxyServer.setProxy(proxy);
+	}
+
+	/**
+	 * Inits range from the string of semicolon separated ranges.
+	 */
+	static InetRange parseInetRange(String source) {
+		final InetRange irange = new InetRange();
+
+		final StringTokenizer st = new StringTokenizer(source, ";");
+		while (st.hasMoreTokens()) {
+			irange.add(st.nextToken());
+		}
+
+		return irange;
+	}
+
+	/**
+	 * Integer representaion of the property named name, or -1 if one is not
+	 * found.
+	 */
+	static int readInt(Properties props, String name) {
+		int result = -1;
+		final String val = (String) props.get(name);
+		if (val == null) {
+			return -1;
+		}
+		final StringTokenizer st = new StringTokenizer(val);
+		if (!st.hasMoreElements()) {
+			return -1;
+		}
+		try {
+			result = Integer.parseInt(st.nextToken());
+		} catch (final NumberFormatException nfe) {
+			inform("Bad value for " + name + ":" + val);
+		}
+		return result;
+	}
+
+	// Display functions
+	// /////////////////
+
+	static void inform(String s) {
+		Log.i("SOCKS",s);
+	}
+
+	static void exit(String msg) {
+		System.err.println("Error:" + msg);
+		System.err.println("Aborting operation");
+		System.exit(0);
+	}
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/Authentication.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/Authentication.java
new file mode 100644
index 0000000..7bc58d9
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/Authentication.java
@@ -0,0 +1,35 @@
+package com.runjva.sourceforge.jsocks.protocol;
+
+/**
+ * The Authentication interface provides for performing method specific
+ * authentication for SOCKS5 connections.
+ */
+public interface Authentication {
+	/**
+	 * This method is called when SOCKS5 server have selected a particular
+	 * authentication method, for whch an implementaion have been registered.
+	 * 
+	 * <p>
+	 * This method should return an array {inputstream,outputstream
+	 * [,UDPEncapsulation]}. The reason for that is that SOCKS5 protocol allows
+	 * to have method specific encapsulation of data on the socket for purposes
+	 * of integrity or security. And this encapsulation should be performed by
+	 * those streams returned from the method. It is also possible to
+	 * encapsulate datagrams. If authentication method supports such
+	 * encapsulation an instance of the UDPEncapsulation interface should be
+	 * returned as third element of the array, otherwise either null should be
+	 * returned as third element, or array should contain only 2 elements.
+	 * 
+	 * @param methodId
+	 *            Authentication method selected by the server.
+	 * @param proxySocket
+	 *            Socket used to conect to the proxy.
+	 * @return Two or three element array containing Input/Output streams which
+	 *         should be used on this connection. Third argument is optional and
+	 *         should contain an instance of UDPEncapsulation. It should be
+	 *         provided if the authentication method used requires any
+	 *         encapsulation to be done on the datagrams.
+	 */
+	Object[] doSocksAuthentication(int methodId, java.net.Socket proxySocket)
+			throws java.io.IOException;
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/AuthenticationNone.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/AuthenticationNone.java
new file mode 100644
index 0000000..e682154
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/AuthenticationNone.java
@@ -0,0 +1,22 @@
+package com.runjva.sourceforge.jsocks.protocol;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * SOCKS5 none authentication. Dummy class does almost nothing.
+ */
+public class AuthenticationNone implements Authentication {
+
+	public Object[] doSocksAuthentication(final int methodId,
+			final java.net.Socket proxySocket) throws java.io.IOException {
+
+		if (methodId != 0) {
+			return null;
+		}
+
+		InputStream in = proxySocket.getInputStream();
+		OutputStream out = proxySocket.getOutputStream();
+		return new Object[] { in, out };
+	}
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/InetRange.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/InetRange.java
new file mode 100644
index 0000000..fae1358
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/InetRange.java
@@ -0,0 +1,492 @@
+package com.runjva.sourceforge.jsocks.protocol;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+/**
+ * Class InetRange provides the means of defining the range of inetaddresses.
+ * It's used by Proxy class to store and look up addresses of machines, that
+ * should be contacted directly rather then through the proxy.
+ * <P>
+ * InetRange provides several methods to add either standalone addresses, or
+ * ranges (e.g. 100.200.300.0:100.200.300.255, which covers all addresses on on
+ * someones local network). It also provides methods for checking wether given
+ * address is in this range. Any number of ranges and standalone addresses can
+ * be added to the range.
+ */
+public class InetRange implements Cloneable {
+
+	Hashtable<String, Object[]> host_names;
+	Vector<Object[]> all;
+	Vector<String> end_names;
+
+	boolean useSeparateThread = true;
+
+	/**
+	 * Creates the empty range.
+	 */
+	public InetRange() {
+		all = new Vector<Object[]>();
+		host_names = new Hashtable<String, Object[]>();
+		end_names = new Vector<String>();
+	}
+
+	/**
+	 * Adds another host or range to this range. The String can be one of those:
+	 * <UL>
+	 * <li>Host name. eg.(Athena.myhost.com or 45.54.56.65)
+	 * 
+	 * <li>Range in the form .myhost.net.au <BR>
+	 * In which case anything that ends with .myhost.net.au will be considered
+	 * in the range.
+	 * 
+	 * <li>Range in the form ddd.ddd.ddd. <BR>
+	 * This will be treated as range ddd.ddd.ddd.0 to ddd.ddd.ddd.255. It is not
+	 * necessary to specify 3 first bytes you can use just one or two. For
+	 * example 130. will cover address between 130.0.0.0 and 13.255.255.255.
+	 * 
+	 * <li>Range in the form host_from[: \t\n\r\f]host_to. <br>
+	 * That is two hostnames or ips separated by either whitespace or colon.
+	 * </UL>
+	 */
+	public synchronized boolean add(final String s0) {
+		if (s0 == null) {
+			return false;
+		}
+
+		String s = s0.trim();
+		if (s.length() == 0) {
+			return false;
+		}
+
+		Object[] entry;
+
+		if (s.endsWith(".")) {
+			// thing like: 111.222.33.
+			// it is being treated as range 111.222.33.000 - 111.222.33.255
+
+			final int[] addr = ip2intarray(s);
+			long from, to;
+			from = to = 0;
+
+			if (addr == null) {
+				return false;
+			}
+			for (int i = 0; i < 4; i++) {
+				if (addr[i] >= 0) {
+					from += (((long) addr[i]) << 8 * (3 - i));
+				} else {
+					to = from;
+					while (i < 4) {
+						to += 255l << 8 * (3 - i++);
+					}
+					break;
+				}
+			}
+			entry = new Object[] { s, null, new Long(from), new Long(to) };
+			all.addElement(entry);
+
+		} else if (s.startsWith(".")) {
+			// Thing like: .myhost.com
+
+			end_names.addElement(s);
+			all.addElement(new Object[] { s, null, null, null });
+		} else {
+			final StringTokenizer tokens = new StringTokenizer(s, " \t\r\n\f:");
+			if (tokens.countTokens() > 1) {
+				entry = new Object[] { s, null, null, null };
+				resolve(entry, tokens.nextToken(), tokens.nextToken());
+				all.addElement(entry);
+			} else {
+				entry = new Object[] { s, null, null, null };
+				all.addElement(entry);
+				host_names.put(s, entry);
+				resolve(entry);
+			}
+
+		}
+
+		return true;
+	}
+
+	/**
+	 * Adds another ip for this range.
+	 * 
+	 * @param ip
+	 *            IP os the host which should be added to this range.
+	 */
+	public synchronized void add(final InetAddress ip) {
+		long from, to;
+		from = to = ip2long(ip);
+		all.addElement(new Object[] { ip.getHostName(), ip, new Long(from),
+				new Long(to) });
+	}
+
+	/**
+	 * Adds another range of ips for this range.Any host with ip address greater
+	 * than or equal to the address of from and smaller than or equal to the
+	 * address of to will be included in the range.
+	 * 
+	 * @param from
+	 *            IP from where range starts(including).
+	 * @param to
+	 *            IP where range ends(including).
+	 */
+	public synchronized void add(final InetAddress from, final InetAddress to) {
+		all.addElement(new Object[] {
+				from.getHostAddress() + ":" + to.getHostAddress(), null,
+				new Long(ip2long(from)), new Long(ip2long(to)) });
+	}
+
+	/**
+	 * Checks wether the givan host is in the range. Attempts to resolve host
+	 * name if required.
+	 * 
+	 * @param host
+	 *            Host name to check.
+	 * @return true If host is in the range, false otherwise.
+	 * @see InetRange#contains(String,boolean)
+	 */
+	public synchronized boolean contains(final String host) {
+		return contains(host, true);
+	}
+
+	/**
+	 * Checks wether the given host is in the range.
+	 * <P>
+	 * Algorithm: <BR>
+	 * <ol>
+	 * <li>Look up if the hostname is in the range (in the Hashtable).
+	 * <li>Check if it ends with one of the speciefied endings.
+	 * <li>Check if it is ip(eg.130.220.35.98). If it is check if it is in the
+	 * range.
+	 * <li>If attemptResolve is true, host is name, rather than ip, and all
+	 * previous attempts failed, try to resolve the hostname, and check wether
+	 * the ip associated with the host is in the range.It also repeats all
+	 * previos steps with the hostname obtained from InetAddress, but the name
+	 * is not allways the full name,it is quite likely to be the same. Well it
+	 * was on my machine.
+	 * </ol>
+	 * 
+	 * @param host
+	 *            Host name to check.
+	 * @param attemptResolve
+	 *            Wether to lookup ip address which corresponds to the host,if
+	 *            required.
+	 * @return true If host is in the range, false otherwise.
+	 */
+	public synchronized boolean contains(final String host0,
+			final boolean attemptResolve) {
+		if (all.size() == 0) {
+			return false; // Empty range
+		}
+
+		String host = host0.trim();
+		if (host.length() == 0) {
+			return false;
+		}
+
+		if (checkHost(host)) {
+			return true;
+		}
+		if (checkHostEnding(host)) {
+			return true;
+		}
+
+		final long l = host2long(host);
+		if (l >= 0) {
+			return contains(l);
+		}
+
+		if (!attemptResolve) {
+			return false;
+		}
+
+		try {
+			final InetAddress ip = InetAddress.getByName(host);
+			return contains(ip);
+		} catch (final UnknownHostException uhe) {
+
+		}
+
+		return false;
+	}
+
+	/**
+	 * Checks wether the given ip is in the range.
+	 * 
+	 * @param ip
+	 *            Address of the host to check.
+	 * @return true If host is in the range, false otherwise.
+	 */
+	public synchronized boolean contains(final InetAddress ip) {
+		if (checkHostEnding(ip.getHostName())) {
+			return true;
+		}
+		if (checkHost(ip.getHostName())) {
+			return true;
+		}
+		return contains(ip2long(ip));
+	}
+
+	/**
+	 * Get all entries in the range as strings. <BR>
+	 * These strings can be used to delete entries from the range with remove
+	 * function.
+	 * 
+	 * @return Array of entries as strings.
+	 * @see InetRange#remove(String)
+	 */
+	public synchronized String[] getAll() {
+		final int size = all.size();
+		Object entry[];
+		final String all_names[] = new String[size];
+
+		for (int i = 0; i < size; ++i) {
+			entry = all.elementAt(i);
+			all_names[i] = (String) entry[0];
+		}
+		return all_names;
+	}
+
+	/**
+	 * Removes an entry from this range.<BR>
+	 * 
+	 * @param s
+	 *            Entry to remove.
+	 * @return true if successfull.
+	 */
+	public synchronized boolean remove(final String s) {
+		final Enumeration<Object[]> enumx = all.elements();
+		while (enumx.hasMoreElements()) {
+			final Object[] entry = enumx.nextElement();
+			if (s.equals(entry[0])) {
+				all.removeElement(entry);
+				end_names.removeElement(s);
+				host_names.remove(s);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/** Get string representaion of this Range. */
+	public String toString() {
+		final String all[] = getAll();
+		if (all.length == 0) {
+			return "";
+		}
+
+		String s = all[0];
+		for (int i = 1; i < all.length; ++i) {
+			s += "; " + all[i];
+		}
+		return s;
+	}
+
+	/** Creates a clone of this Object */
+
+	@SuppressWarnings("unchecked")
+	public Object clone() {
+		final InetRange new_range = new InetRange();
+		new_range.all = (Vector<Object[]>) all.clone();
+		new_range.end_names = (Vector<String>) end_names.clone();
+		new_range.host_names = (Hashtable<String, Object[]>) host_names.clone();
+		return new_range;
+	}
+
+	// Private methods
+	// ///////////////
+	/**
+	 * Same as previous but used internally, to avoid unnecessary convertion of
+	 * IPs, when checking subranges
+	 */
+	private synchronized boolean contains(final long ip) {
+		final Enumeration<Object[]> enumx = all.elements();
+		while (enumx.hasMoreElements()) {
+			final Object[] obj = enumx.nextElement();
+			final Long from = obj[2] == null ? null : (Long) obj[2];
+			final Long to = obj[3] == null ? null : (Long) obj[3];
+			if ((from != null) && (from.longValue() <= ip)
+					&& (to.longValue() >= ip)) {
+				return true;
+			}
+
+		}
+		return false;
+	}
+
+	private boolean checkHost(final String host) {
+		return host_names.containsKey(host);
+	}
+
+	private boolean checkHostEnding(final String host) {
+		final Enumeration<String> enumx = end_names.elements();
+		while (enumx.hasMoreElements()) {
+			if (host.endsWith(enumx.nextElement())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private void resolve(final Object[] entry) {
+		// First check if it's in the form ddd.ddd.ddd.ddd.
+		final long ip = host2long((String) entry[0]);
+		if (ip >= 0) {
+			entry[2] = entry[3] = new Long(ip);
+		} else {
+			final InetRangeResolver res = new InetRangeResolver(entry);
+			res.resolve(useSeparateThread);
+		}
+	}
+
+	private void resolve(final Object[] entry, final String from,
+			final String to) {
+		long f, t;
+		if (((f = host2long(from)) >= 0) && ((t = host2long(to)) >= 0)) {
+			entry[2] = new Long(f);
+			entry[3] = new Long(t);
+		} else {
+			final InetRangeResolver res = new InetRangeResolver(entry, from, to);
+			res.resolve(useSeparateThread);
+		}
+	}
+
+	// Class methods
+	// /////////////
+
+	// Converts ipv4 to long value(unsigned int)
+	// /////////////////////////////////////////
+	static long ip2long(final InetAddress ip) {
+		long l = 0;
+		final byte[] addr = ip.getAddress();
+
+		if (addr.length == 4) { // IPV4
+			for (int i = 0; i < 4; ++i) {
+				l += (((long) addr[i] & 0xFF) << 8 * (3 - i));
+			}
+		} else { // IPV6
+			return 0; // Have no idea how to deal with those
+		}
+		return l;
+	}
+
+	long host2long(final String host) {
+		long ip = 0;
+
+		// check if it's ddd.ddd.ddd.ddd
+		if (!Character.isDigit(host.charAt(0))) {
+			return -1;
+		}
+
+		final int[] addr = ip2intarray(host);
+		if (addr == null) {
+			return -1;
+		}
+
+		for (int i = 0; i < addr.length; ++i) {
+			ip += ((long) (addr[i] >= 0 ? addr[i] : 0)) << 8 * (3 - i);
+		}
+
+		return ip;
+	}
+
+	static int[] ip2intarray(final String host) {
+		final int[] address = { -1, -1, -1, -1 };
+		int i = 0;
+		final StringTokenizer tokens = new StringTokenizer(host, ".");
+		if (tokens.countTokens() > 4) {
+			return null;
+		}
+		while (tokens.hasMoreTokens()) {
+			try {
+				address[i++] = Integer.parseInt(tokens.nextToken()) & 0xFF;
+			} catch (final NumberFormatException nfe) {
+				return null;
+			}
+
+		}
+		return address;
+	}
+
+	/*
+	 * //* This was the test main function //**********************************
+	 * 
+	 * public static void main(String args[])throws UnknownHostException{ int i;
+	 * 
+	 * InetRange ir = new InetRange();
+	 * 
+	 * 
+	 * for(i=0;i<args.length;++i){ System.out.println("Adding:" + args[i]);
+	 * ir.add(args[i]); }
+	 * 
+	 * String host; java.io.DataInputStream din = new
+	 * java.io.DataInputStream(System.in); try{ host = din.readLine();
+	 * while(host!=null){ if(ir.contains(host)){
+	 * System.out.println("Range contains ip:"+host); }else{
+	 * System.out.println(host+" is not in the range"); } host = din.readLine();
+	 * } }catch(java.io.IOException io_ex){ io_ex.printStackTrace(); } }
+	 * ******************
+	 */
+
+}
+
+class InetRangeResolver implements Runnable {
+
+	Object[] entry;
+
+	String from;
+	String to;
+
+	InetRangeResolver(final Object[] entry) {
+		this.entry = entry;
+		from = null;
+		to = null;
+	}
+
+	InetRangeResolver(final Object[] entry, final String from, final String to) {
+		this.entry = entry;
+		this.from = from;
+		this.to = to;
+	}
+
+	public final void resolve() {
+		resolve(true);
+	}
+
+	public final void resolve(final boolean inSeparateThread) {
+		if (inSeparateThread) {
+			final Thread t = new Thread(this);
+			t.start();
+		} else {
+			run();
+		}
+
+	}
+
+	public void run() {
+		try {
+			if (from == null) {
+				final InetAddress ip = InetAddress.getByName((String) entry[0]);
+				entry[1] = ip;
+				final Long l = new Long(InetRange.ip2long(ip));
+				entry[2] = l;
+				entry[3] = l;
+			} else {
+				final InetAddress f = InetAddress.getByName(from);
+				final InetAddress t = InetAddress.getByName(to);
+				entry[2] = new Long(InetRange.ip2long(f));
+				entry[3] = new Long(InetRange.ip2long(t));
+
+			}
+		} catch (final UnknownHostException uhe) {
+			// System.err.println("Resolve failed for "+from+','+to+','+entry[0]);
+		}
+	}
+
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/ProxyMessage.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/ProxyMessage.java
new file mode 100644
index 0000000..e7721a1
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/ProxyMessage.java
@@ -0,0 +1,118 @@
+package com.runjva.sourceforge.jsocks.protocol;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * Abstract class which describes SOCKS4/5 response/request.
+ */
+public abstract class ProxyMessage {
+
+	/** Host as an IP address */
+	public InetAddress ip = null;
+
+	/** SOCKS version, or version of the response for SOCKS4 */
+	public int version;
+
+	/** Port field of the request/response */
+	public int port;
+
+	/** Request/response code as an int */
+	public int command;
+
+	/** Host as string. */
+	public String host = null;
+
+	/** User field for SOCKS4 request messages */
+	public String user = null;
+
+	ProxyMessage(int command, InetAddress ip, int port) {
+		this.command = command;
+		this.ip = ip;
+		this.port = port;
+	}
+
+	ProxyMessage() {
+	}
+
+	/**
+	 * Initialises Message from the stream. Reads server response from given
+	 * stream.
+	 * 
+	 * @param in
+	 *            Input stream to read response from.
+	 * @throws SocksException
+	 *             If server response code is not SOCKS_SUCCESS(0), or if any
+	 *             error with protocol occurs.
+	 * @throws IOException
+	 *             If any error happens with I/O.
+	 */
+	public abstract void read(InputStream in) throws SocksException,
+			IOException;
+
+	/**
+	 * Initialises Message from the stream. Reads server response or client
+	 * request from given stream.
+	 * 
+	 * @param in
+	 *            Input stream to read response from.
+	 * @param clinetMode
+	 *            If true read server response, else read client request.
+	 * @throws SocksException
+	 *             If server response code is not SOCKS_SUCCESS(0) and reading
+	 *             in client mode, or if any error with protocol occurs.
+	 * @throws IOException
+	 *             If any error happens with I/O.
+	 */
+	public abstract void read(InputStream in, boolean client_mode)
+			throws SocksException, IOException;
+
+	/**
+	 * Writes the message to the stream.
+	 * 
+	 * @param out
+	 *            Output stream to which message should be written.
+	 */
+	public abstract void write(OutputStream out) throws SocksException,
+			IOException;
+
+	/**
+	 * Get the Address field of this message as InetAddress object.
+	 * 
+	 * @return Host address or null, if one can't be determined.
+	 */
+	public InetAddress getInetAddress() throws UnknownHostException {
+		return ip;
+	}
+
+	/**
+	 * Get string representaion of this message.
+	 * 
+	 * @return string representation of this message.
+	 */
+	public String toString() {
+		return "Proxy Message:\n" + "Version:" + version + "\n" + "Command:"
+				+ command + "\n" + "IP:     " + ip + "\n" + "Port:   " + port
+				+ "\n" + "User:   " + user + "\n";
+	}
+
+	// Package methods
+	// ////////////////
+
+	static final String bytes2IPV4(byte[] addr, int offset) {
+		String hostName = "" + (addr[offset] & 0xFF);
+		for (int i = offset + 1; i < offset + 4; i++) {
+			hostName += "." + (addr[i] & 0xFF);
+		}
+		return hostName;
+	}
+
+	static final String bytes2IPV6(byte[] addr, int offset) {
+		// Have no idea how they look like!
+		return null;
+	}
+
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/ProxyServer.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/ProxyServer.java
new file mode 100644
index 0000000..c8067e8
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/ProxyServer.java
@@ -0,0 +1,699 @@
+package com.runjva.sourceforge.jsocks.protocol;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InterruptedIOException;
+import java.io.OutputStream;
+import java.io.PushbackInputStream;
+import java.net.ConnectException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.NoRouteToHostException;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.nio.channels.SocketChannel;
+
+import android.annotation.SuppressLint;
+import android.net.VpnService;
+import android.util.Log;
+
+import com.runjva.sourceforge.jsocks.server.ServerAuthenticator;
+
+/**
+ * SOCKS4 and SOCKS5 proxy, handles both protocols simultaniously. Implements
+ * all SOCKS commands, including UDP relaying.
+ * <p>
+ * In order to use it you will need to implement ServerAuthenticator interface.
+ * There is an implementation of this interface which does no authentication
+ * ServerAuthenticatorNone, but it is very dangerous to use, as it will give
+ * access to your local network to anybody in the world. One should never use
+ * this authentication scheme unless one have pretty good reason to do so. There
+ * is a couple of other authentication schemes in socks.server package.
+ * 
+ * @see socks.server.ServerAuthenticator
+ */
+public class ProxyServer implements Runnable {
+
+	ServerAuthenticator auth;
+	ProxyMessage msg = null;
+
+	Socket sock = null, remote_sock = null;
+	ServerSocket ss = null;
+	UDPRelayServer relayServer = null;
+	InputStream in, remote_in;
+	OutputStream out, remote_out;
+
+	int mode;
+	static final int START_MODE = 0;
+	static final int ACCEPT_MODE = 1;
+	static final int PIPE_MODE = 2;
+	static final int ABORT_MODE = 3;
+
+	static final int BUF_SIZE = 8192;
+
+	Thread pipe_thread1, pipe_thread2;
+	long lastReadTime;
+
+	static int iddleTimeout = 180000; // 3 minutes
+	static int acceptTimeout = 180000; // 3 minutes
+
+	static SocksProxyBase proxy;
+
+	static VpnService vpnService;
+
+	static boolean DEBUG = false;
+	
+	// Public Constructors
+	// ///////////////////
+
+	/**
+	 * Creates a proxy server with given Authentication scheme.
+	 * 
+	 * @param auth
+	 *            Authentication scheme to be used.
+	 */
+	public ProxyServer(final ServerAuthenticator auth) {
+		this.auth = auth;
+	}
+
+	// Other constructors
+	// //////////////////
+
+	ProxyServer(final ServerAuthenticator auth, final Socket s) {
+		this.auth = auth;
+		this.sock = s;
+		this.mode = START_MODE;
+	}
+
+	// Public methods
+	// ///////////////
+
+	/**
+	 * Set proxy.
+	 * <p>
+	 * Allows Proxy chaining so that one Proxy server is connected to another
+	 * and so on. If proxy supports SOCKSv4, then only some SOCKSv5 requests can
+	 * be handled, UDP would not work, however CONNECT and BIND will be
+	 * translated.
+	 * 
+	 * @param p
+	 *            Proxy which should be used to handle user requests.
+	 */
+	public static void setProxy(final SocksProxyBase p) {
+		proxy = p;
+		// FIXME: Side effect.
+		UDPRelayServer.proxy = proxy;
+	}
+
+	public static void setVpnService (final VpnService v)
+	{
+		vpnService = v;
+	}
+	/**
+	 * Get proxy.
+	 * 
+	 * @return Proxy wich is used to handle user requests.
+	 */
+	public static SocksProxyBase getProxy() {
+		return proxy;
+	}
+
+	/**
+	 * Sets the timeout for connections, how long shoud server wait for data to
+	 * arrive before dropping the connection.<br>
+	 * Zero timeout implies infinity.<br>
+	 * Default timeout is 3 minutes.
+	 */
+	public static void setIddleTimeout(final int timeout) {
+		iddleTimeout = timeout;
+	}
+
+	/**
+	 * Sets the timeout for BIND command, how long the server should wait for
+	 * the incoming connection.<br>
+	 * Zero timeout implies infinity.<br>
+	 * Default timeout is 3 minutes.
+	 */
+	public static void setAcceptTimeout(final int timeout) {
+		acceptTimeout = timeout;
+	}
+
+	/**
+	 * Sets the timeout for UDPRelay server.<br>
+	 * Zero timeout implies infinity.<br>
+	 * Default timeout is 3 minutes.
+	 */
+	public static void setUDPTimeout(final int timeout) {
+		UDPRelayServer.setTimeout(timeout);
+	}
+
+	/**
+	 * Sets the size of the datagrams used in the UDPRelayServer.<br>
+	 * Default size is 64K, a bit more than maximum possible size of the
+	 * datagram.
+	 */
+	public static void setDatagramSize(final int size) {
+		UDPRelayServer.setDatagramSize(size);
+	}
+
+	/**
+	 * Start the Proxy server at given port.<br>
+	 * This methods blocks.
+	 */
+	public void start(final int port) {
+		start(port, 5, null);
+	}
+
+	/**
+	 * Create a server with the specified port, listen backlog, and local IP
+	 * address to bind to. The localIP argument can be used on a multi-homed
+	 * host for a ServerSocket that will only accept connect requests to one of
+	 * its addresses. If localIP is null, it will default accepting connections
+	 * on any/all local addresses. The port must be between 0 and 65535,
+	 * inclusive. <br>
+	 * This methods blocks.
+	 */
+	public void start(final int port, final int backlog,
+			final InetAddress localIP) {
+		try {
+			ss = new ServerSocket(port, backlog, localIP);
+			final String address = ss.getInetAddress().getHostAddress();
+			final int localPort = ss.getLocalPort();
+			debug("Starting SOCKS Proxy on: {}:{}", address, localPort);
+
+			while (true) {
+				final Socket s = ss.accept();
+				final String hostName = s.getInetAddress().getHostName();
+				final int port2 = s.getPort();
+				debug("Accepted from:{}:{}", hostName, port2);
+
+				final ProxyServer ps = new ProxyServer(auth, s);
+				(new Thread(ps)).start();
+			}
+		} catch (final Exception ioe) {
+			ioe.printStackTrace();
+		} finally {
+		}
+	}
+
+	/**
+	 * Stop server operation.It would be wise to interrupt thread running the
+	 * server afterwards.
+	 */
+	public void stop() {
+		try {
+			if (ss != null) {
+				ss.close();
+			}
+		} catch (final IOException ioe) {
+		}
+	}
+
+	// Runnable interface
+	// //////////////////
+	public void run() {
+		switch (mode) {
+		case START_MODE:
+			try {
+				startSession();
+			} catch (final IOException ioe) {
+				handleException(ioe);
+				// ioe.printStackTrace();
+			} finally {
+				abort();
+				if (auth != null) {
+					auth.endSession();
+				}
+				debug("Main thread(client->remote)stopped.");
+			}
+			break;
+		case ACCEPT_MODE:
+			try {
+				doAccept();
+				mode = PIPE_MODE;
+				pipe_thread1.interrupt(); // Tell other thread that connection
+				// have
+				// been accepted.
+				pipe(remote_in, out);
+			} catch (final IOException ioe) {
+				// log("Accept exception:"+ioe);
+				handleException(ioe);
+			} finally {
+				abort();
+				debug("Accept thread(remote->client) stopped");
+			}
+			break;
+		case PIPE_MODE:
+			try {
+				pipe(remote_in, out);
+			} catch (final IOException ioe) {
+			} finally {
+				abort();
+				debug("Support thread(remote->client) stopped");
+			}
+			break;
+		case ABORT_MODE:
+			break;
+		default:
+			debug("Unexpected MODE " + mode);
+		}
+	}
+
+	// Private methods
+	// ///////////////
+	private void startSession() throws IOException {
+		sock.setSoTimeout(iddleTimeout);
+
+		try {
+			auth = auth.startSession(sock);
+		} catch (final IOException ioe) {
+			debug("Auth throwed exception:", ioe);
+			auth = null;
+			return;
+		}
+
+		if (auth == null) { // Authentication failed
+			debug("Authentication failed");
+			return;
+		}
+
+		in = auth.getInputStream();
+		out = auth.getOutputStream();
+
+		msg = readMsg(in);
+		handleRequest(msg);
+	}
+
+	private void handleRequest(final ProxyMessage msg) throws IOException {
+		if (!auth.checkRequest(msg)) {
+			throw new SocksException(SocksProxyBase.SOCKS_FAILURE);
+		}
+
+		if (msg.ip == null) {
+			if (msg instanceof Socks5Message) {
+				msg.ip = InetAddress.getByName(msg.host);
+			} else {
+				throw new SocksException(SocksProxyBase.SOCKS_FAILURE);
+			}
+		}
+		log(msg);
+
+		switch (msg.command) {
+		case SocksProxyBase.SOCKS_CMD_CONNECT:
+			onConnect(msg);
+			break;
+		case SocksProxyBase.SOCKS_CMD_BIND:
+			onBind(msg);
+			break;
+		case SocksProxyBase.SOCKS_CMD_UDP_ASSOCIATE:
+			onUDP(msg);
+			break;
+		default:
+			throw new SocksException(SocksProxyBase.SOCKS_CMD_NOT_SUPPORTED);
+		}
+	}
+
+	private void handleException(final IOException ioe) {
+		// If we couldn't read the request, return;
+		if (msg == null) {
+			return;
+		}
+		// If have been aborted by other thread
+		if (mode == ABORT_MODE) {
+			return;
+		}
+		// If the request was successfully completed, but exception happened
+		// later
+		if (mode == PIPE_MODE) {
+			return;
+		}
+
+		int error_code = SocksProxyBase.SOCKS_FAILURE;
+
+		if (ioe instanceof SocksException) {
+			error_code = ((SocksException) ioe).errCode;
+		} else if (ioe instanceof NoRouteToHostException) {
+			error_code = SocksProxyBase.SOCKS_HOST_UNREACHABLE;
+		} else if (ioe instanceof ConnectException) {
+			error_code = SocksProxyBase.SOCKS_CONNECTION_REFUSED;
+		} else if (ioe instanceof InterruptedIOException) {
+			error_code = SocksProxyBase.SOCKS_TTL_EXPIRE;
+		}
+
+		if ((error_code > SocksProxyBase.SOCKS_ADDR_NOT_SUPPORTED)
+				|| (error_code < 0)) {
+			error_code = SocksProxyBase.SOCKS_FAILURE;
+		}
+
+		sendErrorMessage(error_code);
+	}
+
+	@SuppressLint("NewApi")
+	private void onConnect(final ProxyMessage msg) throws IOException {
+		Socket s;
+
+		if (proxy == null) {
+			
+			s = SocketChannel.open().socket();
+			if ((null != s) && (null != vpnService)) {
+			    vpnService.protect(s);
+			}
+			
+			s.connect(new InetSocketAddress(msg.ip,msg.port));
+			
+		} else {
+			s = new SocksSocket(proxy, msg.ip, msg.port);
+
+			if (vpnService != null)
+				vpnService.protect(s);
+		}
+
+			
+		debug("Connected to " + s.getInetAddress() + ":" + s.getPort());
+
+		ProxyMessage response = null;
+		final InetAddress localAddress = s.getLocalAddress();
+		final int localPort = s.getLocalPort();
+
+		if (msg instanceof Socks5Message) {
+			final int cmd = SocksProxyBase.SOCKS_SUCCESS;
+			response = new Socks5Message(cmd, localAddress, localPort);
+		} else {
+			final int cmd = Socks4Message.REPLY_OK;
+			response = new Socks4Message(cmd, localAddress, localPort);
+
+		}
+		response.write(out);
+		startPipe(s);
+	}
+
+	private void onBind(final ProxyMessage msg) throws IOException {
+		ProxyMessage response = null;
+
+		if (proxy == null) {
+			ss = new ServerSocket(0);
+		} else {
+			ss = new SocksServerSocket(proxy, msg.ip, msg.port);
+		}
+
+		ss.setSoTimeout(acceptTimeout);
+
+		final InetAddress inetAddress = ss.getInetAddress();
+		final int localPort = ss.getLocalPort();
+		debug("Trying accept on {}:{}", inetAddress, localPort);
+
+		if (msg.version == 5) {
+			final int cmd = SocksProxyBase.SOCKS_SUCCESS;
+			response = new Socks5Message(cmd, inetAddress, localPort);
+		} else {
+			final int cmd = Socks4Message.REPLY_OK;
+			response = new Socks4Message(cmd, inetAddress, localPort);
+		}
+		response.write(out);
+
+		mode = ACCEPT_MODE;
+
+		pipe_thread1 = Thread.currentThread();
+		pipe_thread2 = new Thread(this);
+		pipe_thread2.start();
+
+		// Make timeout infinit.
+		sock.setSoTimeout(0);
+		int eof = 0;
+
+		try {
+			while ((eof = in.read()) >= 0) {
+				if (mode != ACCEPT_MODE) {
+					if (mode != PIPE_MODE) {
+						return;// Accept failed
+					}
+
+					remote_out.write(eof);
+					break;
+				}
+			}
+		} catch (final EOFException e) {
+			debug("Connection closed while we were trying to accept", e);
+			return;
+		} catch (final InterruptedIOException e) {
+			debug("Interrupted by unsucessful accept thread", e);
+			if (mode != PIPE_MODE) {
+				return;
+			}
+		} finally {
+			// System.out.println("Finnaly!");
+		}
+
+		if (eof < 0) {
+			return;
+		}
+
+		// Do not restore timeout, instead timeout is set on the
+		// remote socket. It does not make any difference.
+
+		pipe(in, remote_out);
+	}
+
+	private void onUDP(final ProxyMessage msg) throws IOException {
+		if (msg.ip.getHostAddress().equals("0.0.0.0")) {
+			msg.ip = sock.getInetAddress();
+		}
+		debug("Creating UDP relay server for {}:{}", msg.ip, msg.port);
+
+		relayServer = new UDPRelayServer(msg.ip, msg.port,
+				Thread.currentThread(), sock, auth);
+
+		ProxyMessage response;
+
+		response = new Socks5Message(SocksProxyBase.SOCKS_SUCCESS,
+				relayServer.relayIP, relayServer.relayPort);
+
+		response.write(out);
+
+		relayServer.start();
+
+		// Make timeout infinit.
+		sock.setSoTimeout(0);
+		try {
+			while (in.read() >= 0) {
+				/* do nothing */;
+				// FIXME: Consider a slight delay here?
+			}
+		} catch (final EOFException eofe) {
+		}
+	}
+
+	// Private methods
+	// ////////////////
+
+	private void doAccept() throws IOException {
+		Socket s = null;
+		final long startTime = System.currentTimeMillis();
+
+		while (true) {
+			s = ss.accept();
+			if (s.getInetAddress().equals(msg.ip)) {
+				// got the connection from the right host
+				// Close listenning socket.
+				ss.close();
+				break;
+			} else if (ss instanceof SocksServerSocket) {
+				// We can't accept more then one connection
+				s.close();
+				ss.close();
+				throw new SocksException(SocksProxyBase.SOCKS_FAILURE);
+			} else {
+				if (acceptTimeout != 0) { // If timeout is not infinit
+					final long passed = System.currentTimeMillis() - startTime;
+					final int newTimeout = acceptTimeout - (int) passed;
+
+					if (newTimeout <= 0) {
+						throw new InterruptedIOException("newTimeout <= 0");
+					}
+					ss.setSoTimeout(newTimeout);
+				}
+				s.close(); // Drop all connections from other hosts
+			}
+		}
+
+		// Accepted connection
+		remote_sock = s;
+		remote_in = s.getInputStream();
+		remote_out = s.getOutputStream();
+
+		// Set timeout
+		remote_sock.setSoTimeout(iddleTimeout);
+
+		final InetAddress inetAddress = s.getInetAddress();
+		final int port = s.getPort();
+		debug("Accepted from {}:{}", s.getInetAddress(), port);
+
+		ProxyMessage response;
+
+		if (msg.version == 5) {
+			final int cmd = SocksProxyBase.SOCKS_SUCCESS;
+			response = new Socks5Message(cmd, inetAddress, port);
+		} else {
+			final int cmd = Socks4Message.REPLY_OK;
+			response = new Socks4Message(cmd, inetAddress, port);
+		}
+		response.write(out);
+	}
+
+	private ProxyMessage readMsg(final InputStream in) throws IOException {
+		PushbackInputStream push_in;
+		if (in instanceof PushbackInputStream) {
+			push_in = (PushbackInputStream) in;
+		} else {
+			push_in = new PushbackInputStream(in);
+		}
+
+		final int version = push_in.read();
+		push_in.unread(version);
+
+		ProxyMessage msg;
+
+		if (version == 5) {
+			msg = new Socks5Message(push_in, false);
+		} else if (version == 4) {
+			msg = new Socks4Message(push_in, false);
+		} else {
+			throw new SocksException(SocksProxyBase.SOCKS_FAILURE);
+		}
+		return msg;
+	}
+
+	private void startPipe(final Socket s) {
+		mode = PIPE_MODE;
+		remote_sock = s;
+		try {
+			remote_in = s.getInputStream();
+			remote_out = s.getOutputStream();
+			pipe_thread1 = Thread.currentThread();
+			pipe_thread2 = new Thread(this);
+			pipe_thread2.start();
+			pipe(in, remote_out);
+		} catch (final IOException ioe) {
+		}
+	}
+
+	private void sendErrorMessage(final int error_code) {
+		ProxyMessage err_msg;
+		if (msg instanceof Socks4Message) {
+			err_msg = new Socks4Message(Socks4Message.REPLY_REJECTED);
+		} else {
+			err_msg = new Socks5Message(error_code);
+		}
+		try {
+			err_msg.write(out);
+		} catch (final IOException ioe) {
+		}
+	}
+
+	private synchronized void abort() {
+		if (mode == ABORT_MODE) {
+			return;
+		}
+		mode = ABORT_MODE;
+		try {
+			debug("Aborting operation");
+			if (remote_sock != null) {
+				remote_sock.close();
+			}
+			if (sock != null) {
+				sock.close();
+			}
+			if (relayServer != null) {
+				relayServer.stop();
+			}
+			if (ss != null) {
+				ss.close();
+			}
+			if (pipe_thread1 != null) {
+				pipe_thread1.interrupt();
+			}
+			if (pipe_thread2 != null) {
+				pipe_thread2.interrupt();
+			}
+		} catch (final IOException ioe) {
+		}
+	}
+
+	static final void log(final ProxyMessage msg) {
+		debug("Request version: {}, Command: ", msg.version,
+				command2String(msg.command));
+
+		final String user = msg.version == 4 ? ", User:" + msg.user : "";
+		debug("IP:" + msg.ip + ", Port:" + msg.port + user);
+	}
+
+	private void pipe(final InputStream in, final OutputStream out)
+			throws IOException {
+		lastReadTime = System.currentTimeMillis();
+		final byte[] buf = new byte[BUF_SIZE];
+		int len = 0;
+		while (len >= 0) {
+			try {
+				if (len != 0) {
+					out.write(buf, 0, len);
+					out.flush();
+				}
+				len = in.read(buf);
+				lastReadTime = System.currentTimeMillis();
+			} catch (final InterruptedIOException iioe) {
+				if (iddleTimeout == 0) {
+					return;// Other thread interrupted us.
+				}
+				final long timeSinceRead = System.currentTimeMillis()
+						- lastReadTime;
+
+				if (timeSinceRead >= iddleTimeout - 1000) {
+					return;
+				}
+				len = 0;
+
+			}
+		}
+	}
+
+	static final String command_names[] = { "CONNECT", "BIND", "UDP_ASSOCIATE" };
+
+	static final String command2String(int cmd) {
+		if ((cmd > 0) && (cmd < 4)) {
+			return command_names[cmd - 1];
+		} else {
+			return "Unknown Command " + cmd;
+		}
+	}
+	
+	public static void debug (String msg)
+	{
+		if (DEBUG)
+			Log.d("Proxy",msg);
+	}
+	
+	public static void debug (String msg, String host, int port)
+	{
+		if (DEBUG)
+			debug (msg + ": " + host + ":" + port);
+	}
+	
+	public static void debug (String msg, Exception e)
+	{
+		if (DEBUG)
+			Log.e("Proxy",msg,e);
+	}
+	
+	public static void debug (String msg, InetAddress addr, int port)
+	{
+		if (DEBUG)
+			debug (msg + ": " + addr.getHostAddress() + ": " + port);
+	}
+	
+	public static void debug (String msg, int type, String log)
+	{
+		if (DEBUG)
+			debug (msg + " type:" + type + "=" + log);
+	}
+}
\ No newline at end of file
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/Socks4Message.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/Socks4Message.java
new file mode 100644
index 0000000..484ad96
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/Socks4Message.java
@@ -0,0 +1,167 @@
+package com.runjva.sourceforge.jsocks.protocol;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * SOCKS4 Reply/Request message.
+ */
+
+class Socks4Message extends ProxyMessage {
+
+	private byte[] msgBytes;
+	private int msgLength;
+
+	/**
+	 * Server failed reply, cmd command for failed request
+	 */
+	public Socks4Message(final int cmd) {
+		super(cmd, null, 0);
+		this.user = null;
+
+		msgLength = 2;
+		msgBytes = new byte[2];
+
+		msgBytes[0] = (byte) 0;
+		msgBytes[1] = (byte) command;
+	}
+
+	/**
+	 * Server successfull reply
+	 */
+	public Socks4Message(final int cmd, final InetAddress ip, final int port) {
+		this(0, cmd, ip, port, null);
+	}
+
+	/**
+	 * Client request
+	 */
+	public Socks4Message(final int cmd, final InetAddress ip, final int port,
+			final String user) {
+		this(SOCKS_VERSION, cmd, ip, port, user);
+	}
+
+	/**
+	 * Most general constructor
+	 */
+	public Socks4Message(final int version, final int cmd,
+			final InetAddress ip, final int port, final String user) {
+
+		super(cmd, ip, port);
+		this.user = user;
+		this.version = version;
+
+		msgLength = user == null ? 8 : 9 + user.length();
+		msgBytes = new byte[msgLength];
+
+		msgBytes[0] = (byte) version;
+		msgBytes[1] = (byte) command;
+		msgBytes[2] = (byte) (port >> 8);
+		msgBytes[3] = (byte) port;
+
+		byte[] addr;
+
+		if (ip != null) {
+			addr = ip.getAddress();
+		} else {
+			addr = new byte[4];
+			addr[0] = addr[1] = addr[2] = addr[3] = 0;
+		}
+		System.arraycopy(addr, 0, msgBytes, 4, 4);
+
+		if (user != null) {
+			final byte[] buf = user.getBytes();
+			System.arraycopy(buf, 0, msgBytes, 8, buf.length);
+			msgBytes[msgBytes.length - 1] = 0;
+		}
+	}
+
+	/**
+	 * Initialise from the stream If clientMode is true attempts to read a
+	 * server response otherwise reads a client request see read for more detail
+	 */
+	public Socks4Message(final InputStream in, final boolean clientMode)
+			throws IOException {
+		msgBytes = null;
+		read(in, clientMode);
+	}
+
+	public void read(final InputStream in) throws IOException {
+		read(in, true);
+	}
+
+	public void read(final InputStream in, final boolean clientMode)
+			throws IOException {
+		final DataInputStream d_in = new DataInputStream(in);
+		version = d_in.readUnsignedByte();
+		command = d_in.readUnsignedByte();
+		if (clientMode && (command != REPLY_OK)) {
+			String errMsg;
+			// FIXME: Range should be replaced with cases.
+			if ((command > REPLY_OK) && (command < REPLY_BAD_IDENTD)) {
+				errMsg = replyMessage[command - REPLY_OK];
+			} else {
+				errMsg = "Unknown Reply Code";
+			}
+			throw new SocksException(command, errMsg);
+		}
+		port = d_in.readUnsignedShort();
+		final byte[] addr = new byte[4];
+		d_in.readFully(addr);
+		ip = bytes2IP(addr);
+		host = ip.getHostName();
+		if (!clientMode) {
+			int b = in.read();
+			// FIXME: Hope there are no idiots with user name bigger than this
+			final byte[] userBytes = new byte[256];
+			int i = 0;
+			for (i = 0; (i < userBytes.length) && (b > 0); ++i) {
+				userBytes[i] = (byte) b;
+				b = in.read();
+			}
+			user = new String(userBytes, 0, i);
+		}
+	}
+
+	public void write(final OutputStream out) throws IOException {
+		if (msgBytes == null) {
+			final Socks4Message msg;
+			msg = new Socks4Message(version, command, ip, port, user);
+			msgBytes = msg.msgBytes;
+			msgLength = msg.msgLength;
+		}
+		out.write(msgBytes);
+	}
+
+	// Class methods
+	static InetAddress bytes2IP(final byte[] addr) {
+		final String s = bytes2IPV4(addr, 0);
+		try {
+			return InetAddress.getByName(s);
+		} catch (final UnknownHostException uh_ex) {
+			return null;
+		}
+	}
+
+	// Constants
+
+	static final String[] replyMessage = { "Request Granted",
+			"Request Rejected or Failed",
+			"Failed request, can't connect to Identd",
+			"Failed request, bad user name" };
+
+	static final int SOCKS_VERSION = 4;
+
+	public final static int REQUEST_CONNECT = 1;
+	public final static int REQUEST_BIND = 2;
+
+	public final static int REPLY_OK = 90;
+	public final static int REPLY_REJECTED = 91;
+	public final static int REPLY_NO_CONNECT = 92;
+	public final static int REPLY_BAD_IDENTD = 93;
+
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/Socks4Proxy.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/Socks4Proxy.java
new file mode 100644
index 0000000..5850b5e
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/Socks4Proxy.java
@@ -0,0 +1,144 @@
+package com.runjva.sourceforge.jsocks.protocol;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * Proxy which describes SOCKS4 proxy.
+ */
+
+public class Socks4Proxy extends SocksProxyBase implements Cloneable {
+
+	// Data members
+	String user;
+
+	// Public Constructors
+	// ====================
+
+	/**
+	 * Creates the SOCKS4 proxy
+	 * 
+	 * @param p
+	 *            Proxy to use to connect to this proxy, allows proxy chaining.
+	 * @param proxyHost
+	 *            Address of the proxy server.
+	 * @param proxyPort
+	 *            Port of the proxy server
+	 * @param user
+	 *            User name to use for identification purposes.
+	 * @throws UnknownHostException
+	 *             If proxyHost can't be resolved.
+	 */
+	public Socks4Proxy(SocksProxyBase p, String proxyHost, int proxyPort,
+			String user) throws UnknownHostException {
+		super(p, proxyHost, proxyPort);
+		this.user = new String(user);
+		version = 4;
+	}
+
+	/**
+	 * Creates the SOCKS4 proxy
+	 * 
+	 * @param proxyHost
+	 *            Address of the proxy server.
+	 * @param proxyPort
+	 *            Port of the proxy server
+	 * @param user
+	 *            User name to use for identification purposes.
+	 * @throws UnknownHostException
+	 *             If proxyHost can't be resolved.
+	 */
+	public Socks4Proxy(String proxyHost, int proxyPort, String user)
+			throws UnknownHostException {
+		this(null, proxyHost, proxyPort, user);
+	}
+
+	/**
+	 * Creates the SOCKS4 proxy
+	 * 
+	 * @param p
+	 *            Proxy to use to connect to this proxy, allows proxy chaining.
+	 * @param proxyIP
+	 *            Address of the proxy server.
+	 * @param proxyPort
+	 *            Port of the proxy server
+	 * @param user
+	 *            User name to use for identification purposes.
+	 */
+	public Socks4Proxy(SocksProxyBase p, InetAddress proxyIP, int proxyPort,
+			String user) {
+		super(p, proxyIP, proxyPort);
+		this.user = new String(user);
+		version = 4;
+	}
+
+	/**
+	 * Creates the SOCKS4 proxy
+	 * 
+	 * @param proxyIP
+	 *            Address of the proxy server.
+	 * @param proxyPort
+	 *            Port of the proxy server
+	 * @param user
+	 *            User name to use for identification purposes.
+	 */
+	public Socks4Proxy(InetAddress proxyIP, int proxyPort, String user) {
+		this(null, proxyIP, proxyPort, user);
+	}
+
+	// Public instance methods
+	// ========================
+
+	/**
+	 * Creates a clone of this proxy. Changes made to the clone should not
+	 * affect this object.
+	 */
+	public Object clone() {
+		final Socks4Proxy newProxy = new Socks4Proxy(proxyIP, proxyPort, user);
+		newProxy.directHosts = (InetRange) directHosts.clone();
+		newProxy.chainProxy = chainProxy;
+		return newProxy;
+	}
+
+	// Public Static(Class) Methods
+	// ==============================
+
+	// Protected Methods
+	// =================
+
+	protected SocksProxyBase copy() {
+		final Socks4Proxy copy = new Socks4Proxy(proxyIP, proxyPort, user);
+		copy.directHosts = this.directHosts;
+		copy.chainProxy = chainProxy;
+		return copy;
+	}
+
+	protected ProxyMessage formMessage(int cmd, InetAddress ip, int port) {
+		switch (cmd) {
+		case SOCKS_CMD_CONNECT:
+			cmd = Socks4Message.REQUEST_CONNECT;
+			break;
+		case SOCKS_CMD_BIND:
+			cmd = Socks4Message.REQUEST_BIND;
+			break;
+		default:
+			return null;
+		}
+		return new Socks4Message(cmd, ip, port, user);
+	}
+
+	protected ProxyMessage formMessage(int cmd, String host, int port)
+			throws UnknownHostException {
+
+		return formMessage(cmd, InetAddress.getByName(host), port);
+	}
+
+	protected ProxyMessage formMessage(InputStream in) throws SocksException,
+			IOException {
+
+		return new Socks4Message(in, true);
+	}
+
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/Socks5DatagramSocket.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/Socks5DatagramSocket.java
new file mode 100644
index 0000000..114d590
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/Socks5DatagramSocket.java
@@ -0,0 +1,480 @@
+package com.runjva.sourceforge.jsocks.protocol;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+
+/**
+ * Datagram socket to interract through the firewall.<BR>
+ * Can be used same way as the normal DatagramSocket. One should be carefull
+ * though with the datagram sizes used, as additional data is present in both
+ * incomming and outgoing datagrams.
+ * <p>
+ * SOCKS5 protocol allows to send host address as either:
+ * <ul>
+ * <li>IPV4, normal 4 byte address. (10 bytes header size)
+ * <li>IPV6, version 6 ip address (not supported by Java as for now). 22 bytes
+ * header size.
+ * <li>Host name,(7+length of the host name bytes header size).
+ * </ul>
+ * As with other Socks equivalents, direct addresses are handled transparently,
+ * that is data will be send directly when required by the proxy settings.
+ * <p>
+ * <b>NOTE:</b><br>
+ * Unlike other SOCKS Sockets, it <b>does not</b> support proxy chaining, and
+ * will throw an exception if proxy has a chain proxy attached. The reason for
+ * that is not my laziness, but rather the restrictions of the SOCKSv5 protocol.
+ * Basicaly SOCKSv5 proxy server, needs to know from which host:port datagrams
+ * will be send for association, and returns address to which datagrams should
+ * be send by the client, but it does not inform client from which host:port it
+ * is going to send datagrams, in fact there is even no guarantee they will be
+ * send at all and from the same address each time.
+ */
+public class Socks5DatagramSocket extends DatagramSocket {
+
+	InetAddress relayIP;
+	int relayPort;
+	Socks5Proxy proxy;
+	private boolean server_mode = false;
+	UDPEncapsulation encapsulation;
+	
+	/**
+	 * Construct Datagram socket for communication over SOCKS5 proxy server.
+	 * This constructor uses default proxy, the one set with
+	 * Proxy.setDefaultProxy() method. If default proxy is not set or it is set
+	 * to version4 proxy, which does not support datagram forwarding, throws
+	 * SocksException.
+	 */
+	public Socks5DatagramSocket() throws SocksException, IOException {
+		this(SocksProxyBase.defaultProxy, 0, null);
+	}
+
+	/**
+	 * Construct Datagram socket for communication over SOCKS5 proxy server. And
+	 * binds it to the specified local port. This constructor uses default
+	 * proxy, the one set with Proxy.setDefaultProxy() method. If default proxy
+	 * is not set or it is set to version4 proxy, which does not support
+	 * datagram forwarding, throws SocksException.
+	 */
+	public Socks5DatagramSocket(int port) throws SocksException, IOException {
+		this(SocksProxyBase.defaultProxy, port, null);
+	}
+
+	/**
+	 * Construct Datagram socket for communication over SOCKS5 proxy server. And
+	 * binds it to the specified local port and address. This constructor uses
+	 * default proxy, the one set with Proxy.setDefaultProxy() method. If
+	 * default proxy is not set or it is set to version4 proxy, which does not
+	 * support datagram forwarding, throws SocksException.
+	 */
+	public Socks5DatagramSocket(int port, InetAddress ip)
+			throws SocksException, IOException {
+		this(SocksProxyBase.defaultProxy, port, ip);
+	}
+
+	/**
+	 * Constructs datagram socket for communication over specified proxy. And
+	 * binds it to the given local address and port. Address of null and port of
+	 * 0, signify any availabale port/address. Might throw SocksException, if:
+	 * <ol>
+	 * <li>Given version of proxy does not support UDP_ASSOCIATE.
+	 * <li>Proxy can't be reached.
+	 * <li>Authorization fails.
+	 * <li>Proxy does not want to perform udp forwarding, for any reason.
+	 * </ol>
+	 * Might throw IOException if binding datagram socket to given address/port
+	 * fails. See java.net.DatagramSocket for more details.
+	 */
+	public Socks5DatagramSocket(SocksProxyBase p, int port, InetAddress ip)
+			throws SocksException, IOException {
+
+		super(port, ip);
+
+		if (p == null) {
+			throw new SocksException(SocksProxyBase.SOCKS_NO_PROXY);
+		}
+
+		if (!(p instanceof Socks5Proxy)) {
+			final String s = "Datagram Socket needs Proxy version 5";
+			throw new SocksException(-1, s);
+		}
+
+		if (p.chainProxy != null) {
+			final String s = "Datagram Sockets do not support proxy chaining.";
+			throw new SocksException(SocksProxyBase.SOCKS_JUST_ERROR, s);
+		}
+
+		proxy = (Socks5Proxy) p.copy();
+
+		final ProxyMessage msg = proxy.udpAssociate(super.getLocalAddress(),
+				super.getLocalPort());
+
+		relayIP = msg.ip;
+		if (relayIP.getHostAddress().equals("0.0.0.0")) {
+			// FIXME: What happens here?
+			relayIP = proxy.proxyIP;
+		}
+		relayPort = msg.port;
+
+		encapsulation = proxy.udp_encapsulation;
+
+		//log.debug("Datagram Socket:{}:{}", getLocalAddress(), getLocalPort());
+		//log.debug("Socks5Datagram: {}:{}", relayIP, relayPort);
+	}
+
+	/**
+	 * Used by UDPRelayServer.
+	 */
+	Socks5DatagramSocket(boolean server_mode, UDPEncapsulation encapsulation,
+			InetAddress relayIP, int relayPort) throws IOException {
+		super();
+		this.server_mode = server_mode;
+		this.relayIP = relayIP;
+		this.relayPort = relayPort;
+		this.encapsulation = encapsulation;
+		this.proxy = null;
+	}
+
+	/**
+	 * Sends the Datagram either through the proxy or directly depending on
+	 * current proxy settings and destination address. <BR>
+	 * 
+	 * <B> NOTE: </B> DatagramPacket size should be at least 10 bytes less than
+	 * the systems limit.
+	 * 
+	 * <P>
+	 * See documentation on java.net.DatagramSocket for full details on how to
+	 * use this method.
+	 * 
+	 * @param dp
+	 *            Datagram to send.
+	 * @throws IOException
+	 *             If error happens with I/O.
+	 */
+	public void send(DatagramPacket dp) throws IOException {
+		// If the host should be accessed directly, send it as is.
+		if (!server_mode && proxy.isDirect(dp.getAddress())) {
+			super.send(dp);
+			//log.debug("Sending datagram packet directly:");
+			return;
+		}
+
+		final byte[] head = formHeader(dp.getAddress(), dp.getPort());
+		byte[] buf = new byte[head.length + dp.getLength()];
+		final byte[] data = dp.getData();
+
+		// Merge head and data
+		System.arraycopy(head, 0, buf, 0, head.length);
+		// System.arraycopy(data,dp.getOffset(),buf,head.length,dp.getLength());
+		System.arraycopy(data, 0, buf, head.length, dp.getLength());
+
+		if (encapsulation != null) {
+			buf = encapsulation.udpEncapsulate(buf, true);
+		}
+
+		super.send(new DatagramPacket(buf, buf.length, relayIP, relayPort));
+	}
+
+	/**
+	 * This method allows to send datagram packets with address type DOMAINNAME.
+	 * SOCKS5 allows to specify host as names rather than ip addresses.Using
+	 * this method one can send udp datagrams through the proxy, without having
+	 * to know the ip address of the destination host.
+	 * <p>
+	 * If proxy specified for that socket has an option resolveAddrLocally set
+	 * to true host will be resolved, and the datagram will be send with address
+	 * type IPV4, if resolve fails, UnknownHostException is thrown.
+	 * 
+	 * @param dp
+	 *            Datagram to send, it should contain valid port and data
+	 * @param host
+	 *            Host name to which datagram should be send.
+	 * @throws IOException
+	 *             If error happens with I/O, or the host can't be resolved when
+	 *             proxy settings say that hosts should be resolved locally.
+	 * @see Socks5Proxy#resolveAddrLocally(boolean)
+	 */
+	public void send(DatagramPacket dp, String host) throws IOException {
+		if (proxy.isDirect(host)) {
+			dp.setAddress(InetAddress.getByName(host));
+			super.send(dp);
+			return;
+		}
+
+		if ((proxy).resolveAddrLocally) {
+			dp.setAddress(InetAddress.getByName(host));
+		}
+
+		final byte[] head = formHeader(host, dp.getPort());
+		byte[] buf = new byte[head.length + dp.getLength()];
+		final byte[] data = dp.getData();
+		// Merge head and data
+		System.arraycopy(head, 0, buf, 0, head.length);
+		// System.arraycopy(data,dp.getOffset(),buf,head.length,dp.getLength());
+		System.arraycopy(data, 0, buf, head.length, dp.getLength());
+
+		if (encapsulation != null) {
+			buf = encapsulation.udpEncapsulate(buf, true);
+		}
+
+		super.send(new DatagramPacket(buf, buf.length, relayIP, relayPort));
+	}
+
+	/**
+	 * Receives udp packet. If packet have arrived from the proxy relay server,
+	 * it is processed and address and port of the packet are set to the address
+	 * and port of sending host.<BR>
+	 * If the packet arrived from anywhere else it is not changed.<br>
+	 * <B> NOTE: </B> DatagramPacket size should be at least 10 bytes bigger
+	 * than the largest packet you expect (this is for IPV4 addresses). For
+	 * hostnames and IPV6 it is even more.
+	 * 
+	 * @param dp
+	 *            Datagram in which all relevent information will be copied.
+	 */
+	public void receive(DatagramPacket dp) throws IOException {
+		super.receive(dp);
+
+		if (server_mode) {
+			// Drop all datagrams not from relayIP/relayPort
+			final int init_length = dp.getLength();
+			final int initTimeout = getSoTimeout();
+			final long startTime = System.currentTimeMillis();
+
+			while (!relayIP.equals(dp.getAddress())
+					|| (relayPort != dp.getPort())) {
+
+				// Restore datagram size
+				dp.setLength(init_length);
+
+				// If there is a non-infinit timeout on this socket
+				// Make sure that it happens no matter how often unexpected
+				// packets arrive.
+				if (initTimeout != 0) {
+					final long passed = System.currentTimeMillis() - startTime;
+					final int newTimeout = initTimeout - (int) passed;
+
+					if (newTimeout <= 0) {
+						throw new InterruptedIOException(
+								"In Socks5DatagramSocket->receive()");
+					}
+					setSoTimeout(newTimeout);
+				}
+
+				super.receive(dp);
+			}
+
+			// Restore timeout settings
+			if (initTimeout != 0) {
+				setSoTimeout(initTimeout);
+			}
+
+		} else if (!relayIP.equals(dp.getAddress())
+				|| (relayPort != dp.getPort())) {
+			return; // Recieved direct packet
+			// If the datagram is not from the relay server, return it it as is.
+		}
+
+		byte[] data;
+		data = dp.getData();
+
+		if (encapsulation != null) {
+			data = encapsulation.udpEncapsulate(data, false);
+		}
+
+		// FIXME: What is this?
+		final int offset = 0; // Java 1.1
+		// int offset = dp.getOffset(); //Java 1.2
+
+		final ByteArrayInputStream bIn = new ByteArrayInputStream(data, offset,
+				dp.getLength());
+
+		final ProxyMessage msg = new Socks5Message(bIn);
+		dp.setPort(msg.port);
+		dp.setAddress(msg.getInetAddress());
+
+		// what wasn't read by the Message is the data
+		final int data_length = bIn.available();
+		// Shift data to the left
+		System.arraycopy(data, offset + dp.getLength() - data_length, data,
+				offset, data_length);
+
+		dp.setLength(data_length);
+	}
+
+	/**
+	 * Returns port assigned by the proxy, to which datagrams are relayed. It is
+	 * not the same port to which other party should send datagrams.
+	 * 
+	 * @return Port assigned by socks server to which datagrams are send for
+	 *         association.
+	 */
+	public int getLocalPort() {
+		if (server_mode) {
+			return super.getLocalPort();
+		}
+		return relayPort;
+	}
+
+	/**
+	 * Address assigned by the proxy, to which datagrams are send for relay. It
+	 * is not necesseraly the same address, to which other party should send
+	 * datagrams.
+	 * 
+	 * @return Address to which datagrams are send for association.
+	 */
+	public InetAddress getLocalAddress() {
+		if (server_mode) {
+			return super.getLocalAddress();
+		}
+		return relayIP;
+	}
+
+	/**
+	 * Closes datagram socket, and proxy connection.
+	 */
+	public void close() {
+		if (!server_mode) {
+			proxy.endSession();
+		}
+		super.close();
+	}
+
+	/**
+	 * This method checks wether proxy still runs udp forwarding service for
+	 * this socket.
+	 * <p>
+	 * This methods checks wether the primary connection to proxy server is
+	 * active. If it is, chances are that proxy continues to forward datagrams
+	 * being send from this socket. If it was closed, most likely datagrams are
+	 * no longer being forwarded by the server.
+	 * <p>
+	 * Proxy might decide to stop forwarding datagrams, in which case it should
+	 * close primary connection. This method allows to check, wether this have
+	 * been done.
+	 * <p>
+	 * You can specify timeout for which we should be checking EOF condition on
+	 * the primary connection. Timeout is in milliseconds. Specifying 0 as
+	 * timeout implies infinity, in which case method will block, until
+	 * connection to proxy is closed or an error happens, and then return false.
+	 * <p>
+	 * One possible scenario is to call isProxyactive(0) in separate thread, and
+	 * once it returned notify other threads about this event.
+	 * 
+	 * @param timeout
+	 *            For how long this method should block, before returning.
+	 * @return true if connection to proxy is active, false if eof or error
+	 *         condition have been encountered on the connection.
+	 */
+	public boolean isProxyAlive(int timeout) {
+		if (server_mode) {
+			return false;
+		}
+		if (proxy != null) {
+			try {
+				proxy.proxySocket.setSoTimeout(timeout);
+
+				final int eof = proxy.in.read();
+				if (eof < 0) {
+					return false; // EOF encountered.
+				} else {
+					//log.warn("This really should not happen");
+					return true; // This really should not happen
+				}
+
+			} catch (final InterruptedIOException iioe) {
+				return true; // read timed out.
+			} catch (final IOException ioe) {
+				return false;
+			}
+		}
+		return false;
+	}
+
+	// PRIVATE METHODS
+	// ////////////////
+
+	private byte[] formHeader(InetAddress ip, int port) {
+		final Socks5Message request = new Socks5Message(0, ip, port);
+		request.data[0] = 0;
+		return request.data;
+	}
+
+	private byte[] formHeader(String host, int port) {
+		final Socks5Message request = new Socks5Message(0, host, port);
+		request.data[0] = 0;
+		return request.data;
+	}
+
+	/*
+	 * ======================================================================
+	 * 
+	 * //Mainly Test functions //////////////////////
+	 * 
+	 * private String bytes2String(byte[] b){ String s=""; char[] hex_digit = {
+	 * '0','1','2','3','4','5','6','7','8','9', 'A','B','C','D','E','F'};
+	 * for(int i=0;i<b.length;++i){ int i1 = (b[i] & 0xF0) >> 4; int i2 = b[i] &
+	 * 0xF; s+=hex_digit[i1]; s+=hex_digit[i2]; s+=" "; } return s; } private
+	 * static final void debug(String s){ if(DEBUG) System.out.print(s); }
+	 * 
+	 * private static final boolean DEBUG = true;
+	 * 
+	 * 
+	 * public static void usage(){ System.err.print(
+	 * "Usage: java Socks.SocksDatagramSocket host port [socksHost socksPort]\n"
+	 * ); }
+	 * 
+	 * static final int defaultProxyPort = 1080; //Default Port static final
+	 * String defaultProxyHost = "www-proxy"; //Default proxy
+	 * 
+	 * public static void main(String args[]){ int port; String host; int
+	 * proxyPort; String proxyHost; InetAddress ip;
+	 * 
+	 * if(args.length > 1 && args.length < 5){ try{
+	 * 
+	 * host = args[0]; port = Integer.parseInt(args[1]);
+	 * 
+	 * proxyPort =(args.length > 3)? Integer.parseInt(args[3]) :
+	 * defaultProxyPort;
+	 * 
+	 * host = args[0]; ip = InetAddress.getByName(host);
+	 * 
+	 * proxyHost =(args.length > 2)? args[2] : defaultProxyHost;
+	 * 
+	 * Proxy.setDefaultProxy(proxyHost,proxyPort); Proxy p =
+	 * Proxy.getDefaultProxy(); p.addDirect("lux");
+	 * 
+	 * 
+	 * DatagramSocket ds = new Socks5DatagramSocket();
+	 * 
+	 * 
+	 * BufferedReader in = new BufferedReader( new
+	 * InputStreamReader(System.in)); String s;
+	 * 
+	 * System.out.print("Enter line:"); s = in.readLine();
+	 * 
+	 * while(s != null){ byte[] data = (s+"\r\n").getBytes(); DatagramPacket dp
+	 * = new DatagramPacket(data,0,data.length, ip,port);
+	 * System.out.println("Sending to: "+ip+":"+port); ds.send(dp); dp = new
+	 * DatagramPacket(new byte[1024],1024);
+	 * 
+	 * System.out.println("Trying to recieve on port:"+ ds.getLocalPort());
+	 * ds.receive(dp); System.out.print("Recieved:\n"+
+	 * "From:"+dp.getAddress()+":"+dp.getPort()+ "\n\n"+ new
+	 * String(dp.getData(),dp.getOffset(),dp.getLength())+"\n" );
+	 * System.out.print("Enter line:"); s = in.readLine();
+	 * 
+	 * } ds.close(); System.exit(1);
+	 * 
+	 * }catch(SocksException s_ex){ System.err.println("SocksException:"+s_ex);
+	 * s_ex.printStackTrace(); System.exit(1); }catch(IOException io_ex){
+	 * io_ex.printStackTrace(); System.exit(1); }catch(NumberFormatException
+	 * num_ex){ usage(); num_ex.printStackTrace(); System.exit(1); }
+	 * 
+	 * }else{ usage(); } }
+	 */
+
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/Socks5Message.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/Socks5Message.java
new file mode 100644
index 0000000..4d4b06d
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/Socks5Message.java
@@ -0,0 +1,325 @@
+package com.runjva.sourceforge.jsocks.protocol;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * SOCKS5 request/response message.
+ */
+
+class Socks5Message extends ProxyMessage {
+	/** Address type of given message */
+	public int addrType;
+
+	byte[] data;
+
+	/**
+	 * Server error response.
+	 * 
+	 * @param cmd
+	 *            Error code.
+	 */
+	public Socks5Message(int cmd) {
+		super(cmd, null, 0);
+		data = new byte[3];
+		data[0] = SOCKS_VERSION; // Version.
+		data[1] = (byte) cmd; // Reply code for some kind of failure.
+		data[2] = 0; // Reserved byte.
+	}
+
+	/**
+	 * Construct client request or server response.
+	 * 
+	 * @param cmd
+	 *            - Request/Response code.
+	 * @param ip
+	 *            - IP field.
+	 * @paarm port - port field.
+	 */
+	public Socks5Message(int cmd, InetAddress ip, int port) {
+		super(cmd, ip, port);
+
+		if (ip == null) {
+			this.host = "0.0.0.0";
+		} else {
+			this.host = ip.getHostName();
+		}
+
+		this.version = SOCKS_VERSION;
+
+		byte[] addr;
+
+		if (ip == null) {
+			addr = new byte[4];
+			addr[0] = addr[1] = addr[2] = addr[3] = 0;
+		} else {
+			addr = ip.getAddress();
+		}
+
+		if (addr.length == 4) {
+			addrType = SOCKS_ATYP_IPV4;
+		} else {
+			addrType = SOCKS_ATYP_IPV6;
+		}
+
+		data = new byte[6 + addr.length];
+		data[0] = (byte) SOCKS_VERSION; // Version
+		data[1] = (byte) command; // Command
+		data[2] = (byte) 0; // Reserved byte
+		data[3] = (byte) addrType; // Address type
+
+		// Put Address
+		System.arraycopy(addr, 0, data, 4, addr.length);
+		// Put port
+		data[data.length - 2] = (byte) (port >> 8);
+		data[data.length - 1] = (byte) (port);
+	}
+
+	/**
+	 * Construct client request or server response.
+	 * 
+	 * @param cmd
+	 *            - Request/Response code.
+	 * @param hostName
+	 *            - IP field as hostName, uses ADDR_TYPE of HOSTNAME.
+	 * @paarm port - port field.
+	 */
+	public Socks5Message(int cmd, String hostName, int port) {
+		super(cmd, null, port);
+		this.host = hostName;
+		this.version = SOCKS_VERSION;
+
+		//log.debug("Doing ATYP_DOMAINNAME");
+
+		addrType = SOCKS_ATYP_DOMAINNAME;
+		final byte addr[] = hostName.getBytes();
+
+		data = new byte[7 + addr.length];
+		data[0] = (byte) SOCKS_VERSION; // Version
+		data[1] = (byte) command; // Command
+		data[2] = (byte) 0; // Reserved byte
+		data[3] = (byte) SOCKS_ATYP_DOMAINNAME; // Address type
+		data[4] = (byte) addr.length; // Length of the address
+
+		// Put Address
+		System.arraycopy(addr, 0, data, 5, addr.length);
+		// Put port
+		data[data.length - 2] = (byte) (port >> 8);
+		data[data.length - 1] = (byte) (port);
+	}
+
+	/**
+	 * Initialises Message from the stream. Reads server response from given
+	 * stream.
+	 * 
+	 * @param in
+	 *            Input stream to read response from.
+	 * @throws SocksException
+	 *             If server response code is not SOCKS_SUCCESS(0), or if any
+	 *             error with protocol occurs.
+	 * @throws IOException
+	 *             If any error happens with I/O.
+	 */
+	public Socks5Message(InputStream in) throws SocksException, IOException {
+		this(in, true);
+	}
+
+	/**
+	 * Initialises Message from the stream. Reads server response or client
+	 * request from given stream.
+	 * 
+	 * @param in
+	 *            Input stream to read response from.
+	 * @param clinetMode
+	 *            If true read server response, else read client request.
+	 * @throws SocksException
+	 *             If server response code is not SOCKS_SUCCESS(0) and reading
+	 *             in client mode, or if any error with protocol occurs.
+	 * @throws IOException
+	 *             If any error happens with I/O.
+	 */
+	public Socks5Message(InputStream in, boolean clientMode)
+			throws SocksException, IOException {
+
+		read(in, clientMode);
+	}
+
+	/**
+	 * Initialises Message from the stream. Reads server response from given
+	 * stream.
+	 * 
+	 * @param in
+	 *            Input stream to read response from.
+	 * @throws SocksException
+	 *             If server response code is not SOCKS_SUCCESS(0), or if any
+	 *             error with protocol occurs.
+	 * @throws IOException
+	 *             If any error happens with I/O.
+	 */
+	public void read(InputStream in) throws SocksException, IOException {
+		read(in, true);
+	}
+
+	/**
+	 * Initialises Message from the stream. Reads server response or client
+	 * request from given stream.
+	 * 
+	 * @param in
+	 *            Input stream to read response from.
+	 * @param clinetMode
+	 *            If true read server response, else read client request.
+	 * @throws SocksException
+	 *             If server response code is not SOCKS_SUCCESS(0) and reading
+	 *             in client mode, or if any error with protocol occurs.
+	 * @throws IOException
+	 *             If any error happens with I/O.
+	 */
+	public void read(InputStream in, boolean clientMode) throws SocksException,
+			IOException {
+
+		data = null;
+		ip = null;
+
+		final DataInputStream di = new DataInputStream(in);
+
+		version = di.readUnsignedByte();
+		command = di.readUnsignedByte();
+
+		if (clientMode && (command != 0)) {
+			throw new SocksException(command);
+		}
+
+		di.readUnsignedByte();
+		addrType = di.readUnsignedByte();
+
+		byte addr[];
+
+		switch (addrType) {
+		case SOCKS_ATYP_IPV4:
+			addr = new byte[4];
+			di.readFully(addr);
+			host = bytes2IPV4(addr, 0);
+			break;
+		case SOCKS_ATYP_IPV6:
+			addr = new byte[SOCKS_IPV6_LENGTH];// I believe it is 16 bytes,huge!
+			di.readFully(addr);
+			host = bytes2IPV6(addr, 0);
+			break;
+		case SOCKS_ATYP_DOMAINNAME:
+			//log.debug("Reading ATYP_DOMAINNAME");
+			addr = new byte[di.readUnsignedByte()];// Next byte shows the length
+			di.readFully(addr);
+			host = new String(addr);
+			break;
+		default:
+			throw (new SocksException(SocksProxyBase.SOCKS_JUST_ERROR));
+		}
+
+		port = di.readUnsignedShort();
+
+		if ((addrType != SOCKS_ATYP_DOMAINNAME) && doResolveIP) {
+			try {
+				ip = InetAddress.getByName(host);
+			} catch (final UnknownHostException uh_ex) {
+			}
+		}
+	}
+
+	/**
+	 * Writes the message to the stream.
+	 * 
+	 * @param out
+	 *            Output stream to which message should be written.
+	 */
+	public void write(OutputStream out) throws SocksException, IOException {
+		if (data == null) {
+			Socks5Message msg;
+
+			if (addrType == SOCKS_ATYP_DOMAINNAME) {
+				msg = new Socks5Message(command, host, port);
+			} else {
+				if (ip == null) {
+					try {
+						ip = InetAddress.getByName(host);
+					} catch (final UnknownHostException uh_ex) {
+						throw new SocksException(
+								SocksProxyBase.SOCKS_JUST_ERROR);
+					}
+				}
+				msg = new Socks5Message(command, ip, port);
+			}
+			data = msg.data;
+		}
+		out.write(data);
+	}
+
+	/**
+	 * Returns IP field of the message as IP, if the message was created with
+	 * ATYP of HOSTNAME, it will attempt to resolve the hostname, which might
+	 * fail.
+	 * 
+	 * @throws UnknownHostException
+	 *             if host can't be resolved.
+	 */
+	public InetAddress getInetAddress() throws UnknownHostException {
+		if (ip != null) {
+			return ip;
+		}
+
+		return (ip = InetAddress.getByName(host));
+	}
+
+	/**
+	 * Returns string representation of the message.
+	 */
+	public String toString() {
+		// FIXME: Single line version, please.
+		final String s = "Socks5Message:" + "\n" + "VN   " + version + "\n"
+				+ "CMD  " + command + "\n" + "ATYP " + addrType + "\n"
+				+ "ADDR " + host + "\n" + "PORT " + port + "\n";
+		return s;
+	}
+
+	/**
+	 *Wether to resolve hostIP returned from SOCKS server that is wether to
+	 * create InetAddress object from the hostName string
+	 */
+	static public boolean resolveIP() {
+		return doResolveIP;
+	}
+
+	/**
+	 *Wether to resolve hostIP returned from SOCKS server that is wether to
+	 * create InetAddress object from the hostName string
+	 * 
+	 * @param doResolve
+	 *            Wether to resolve hostIP from SOCKS server.
+	 *@return Previous value.
+	 */
+	static public boolean resolveIP(boolean doResolve) {
+		final boolean old = doResolveIP;
+		doResolveIP = doResolve;
+		return old;
+	}
+
+	/*
+	 * private static final void debug(String s){ if(DEBUG) System.out.print(s);
+	 * } private static final boolean DEBUG = false;
+	 */
+
+	// SOCKS5 constants
+	public static final int SOCKS_VERSION = 5;
+
+	public static final int SOCKS_ATYP_IPV4 = 0x1; // Where is 2??
+	public static final int SOCKS_ATYP_DOMAINNAME = 0x3; // !!!!rfc1928
+	public static final int SOCKS_ATYP_IPV6 = 0x4;
+
+	public static final int SOCKS_IPV6_LENGTH = 16;
+
+	static boolean doResolveIP = true;
+
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/Socks5Proxy.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/Socks5Proxy.java
new file mode 100644
index 0000000..7400aa6
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/Socks5Proxy.java
@@ -0,0 +1,295 @@
+package com.runjva.sourceforge.jsocks.protocol;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+/**
+ * SOCKS5 Proxy.
+ */
+
+public class Socks5Proxy extends SocksProxyBase implements Cloneable {
+
+	// Data members
+	private Hashtable<Integer, Authentication> authMethods = new Hashtable<Integer, Authentication>();
+	private int selectedMethod;
+
+	boolean resolveAddrLocally = true;
+	UDPEncapsulation udp_encapsulation = null;
+
+	// Public Constructors
+	// ====================
+
+	/**
+	 * Creates SOCKS5 proxy.
+	 * 
+	 * @param p
+	 *            Proxy to use to connect to this proxy, allows proxy chaining.
+	 * @param proxyHost
+	 *            Host on which a Proxy server runs.
+	 * @param proxyPort
+	 *            Port on which a Proxy server listens for connections.
+	 * @throws UnknownHostException
+	 *             If proxyHost can't be resolved.
+	 */
+	public Socks5Proxy(SocksProxyBase p, String proxyHost, int proxyPort)
+			throws UnknownHostException {
+
+		super(p, proxyHost, proxyPort);
+		version = 5;
+		setAuthenticationMethod(0, new AuthenticationNone());
+	}
+
+	/**
+	 * Creates SOCKS5 proxy.
+	 * 
+	 * @param proxyHost
+	 *            Host on which a Proxy server runs.
+	 * @param proxyPort
+	 *            Port on which a Proxy server listens for connections.
+	 * @throws UnknownHostException
+	 *             If proxyHost can't be resolved.
+	 */
+	public Socks5Proxy(String proxyHost, int proxyPort)
+			throws UnknownHostException {
+		this(null, proxyHost, proxyPort);
+	}
+
+	/**
+	 * Creates SOCKS5 proxy.
+	 * 
+	 * @param p
+	 *            Proxy to use to connect to this proxy, allows proxy chaining.
+	 * @param proxyIP
+	 *            Host on which a Proxy server runs.
+	 * @param proxyPort
+	 *            Port on which a Proxy server listens for connections.
+	 */
+	public Socks5Proxy(SocksProxyBase p, InetAddress proxyIP, int proxyPort) {
+		super(p, proxyIP, proxyPort);
+		version = 5;
+		setAuthenticationMethod(0, new AuthenticationNone());
+	}
+
+	/**
+	 * Creates SOCKS5 proxy.
+	 * 
+	 * @param proxyIP
+	 *            Host on which a Proxy server runs.
+	 * @param proxyPort
+	 *            Port on which a Proxy server listens for connections.
+	 */
+	public Socks5Proxy(InetAddress proxyIP, int proxyPort) {
+		this(null, proxyIP, proxyPort);
+	}
+
+	// Public instance methods
+	// ========================
+
+	/**
+	 * Wether to resolve address locally or to let proxy do so.
+	 * <p>
+	 * SOCKS5 protocol allows to send host names rather then IPs in the
+	 * requests, this option controls wether the hostnames should be send to the
+	 * proxy server as names, or should they be resolved locally.
+	 * 
+	 * @param doResolve
+	 *            Wether to perform resolution locally.
+	 * @return Previous settings.
+	 */
+	public boolean resolveAddrLocally(boolean doResolve) {
+		final boolean old = resolveAddrLocally;
+		resolveAddrLocally = doResolve;
+		return old;
+	}
+
+	/**
+	 * Get current setting on how the addresses should be handled.
+	 * 
+	 * @return Current setting for address resolution.
+	 * @see Socks5Proxy#resolveAddrLocally(boolean doResolve)
+	 */
+	public boolean resolveAddrLocally() {
+		return resolveAddrLocally;
+	}
+
+	/**
+	 * Adds another authentication method.
+	 * 
+	 * @param methodId
+	 *            Authentication method id, see rfc1928
+	 * @param method
+	 *            Implementation of Authentication
+	 * @see Authentication
+	 */
+	public boolean setAuthenticationMethod(int methodId, Authentication method) {
+		if ((methodId < 0) || (methodId > 255)) {
+			return false;
+		}
+		if (method == null) {
+			// Want to remove a particular method
+			return (authMethods.remove(new Integer(methodId)) != null);
+		} else {// Add the method, or rewrite old one
+			authMethods.put(new Integer(methodId), method);
+		}
+		return true;
+	}
+
+	/**
+	 * Get authentication method, which corresponds to given method id
+	 * 
+	 * @param methodId
+	 *            Authentication method id.
+	 * @return Implementation for given method or null, if one was not set.
+	 */
+	public Authentication getAuthenticationMethod(int methodId) {
+		final Object method = authMethods.get(new Integer(methodId));
+		if (method == null) {
+			return null;
+		}
+		return (Authentication) method;
+	}
+
+	/**
+	 * Creates a clone of this Proxy. clone() returns an
+	 */
+	@SuppressWarnings("unchecked")
+	public Object clone() {
+		final Socks5Proxy newProxy = new Socks5Proxy(proxyIP, proxyPort);
+
+		final Object o = this.authMethods.clone();
+		newProxy.authMethods = (Hashtable<Integer, Authentication>) o;
+
+		newProxy.directHosts = (InetRange) directHosts.clone();
+		newProxy.resolveAddrLocally = resolveAddrLocally;
+		newProxy.chainProxy = chainProxy;
+		return newProxy;
+	}
+
+	// Public Static(Class) Methods
+	// ==============================
+
+	// Protected Methods
+	// =================
+
+	protected SocksProxyBase copy() {
+		final Socks5Proxy copy = new Socks5Proxy(proxyIP, proxyPort);
+
+		copy.authMethods = this.authMethods; // same Hash, no copy
+		copy.directHosts = this.directHosts;
+		copy.chainProxy = this.chainProxy;
+		copy.resolveAddrLocally = this.resolveAddrLocally;
+		return copy;
+	}
+
+	/**
+    *
+    *
+    */
+	protected void startSession() throws SocksException {
+		super.startSession();
+		Authentication auth;
+		final Socket ps = proxySocket; // The name is too long
+
+		try {
+
+			final byte nMethods = (byte) authMethods.size(); // Number of
+			// methods
+
+			final byte[] buf = new byte[2 + nMethods]; // 2 is for VER,NMETHODS
+			buf[0] = (byte) version;
+			buf[1] = nMethods; // Number of methods
+			int i = 2;
+
+			final Enumeration<Integer> ids = authMethods.keys();
+			while (ids.hasMoreElements()) {
+				buf[i++] = (byte) ids.nextElement().intValue();
+			}
+
+			out.write(buf);
+			out.flush();
+
+			final int versionNumber = in.read();
+			selectedMethod = in.read();
+
+			if ((versionNumber < 0) || (selectedMethod < 0)) {
+				// EOF condition was reached
+				endSession();
+				final String s = "Connection to proxy lost.";
+				throw new SocksException(SOCKS_PROXY_IO_ERROR, s);
+			}
+
+			if (versionNumber < version) {
+				// What should we do??
+			}
+
+			if (selectedMethod == 0xFF) { // No method selected
+				ps.close();
+				throw (new SocksException(SOCKS_AUTH_NOT_SUPPORTED));
+			}
+
+			auth = getAuthenticationMethod(selectedMethod);
+			if (auth == null) {
+				// This shouldn't happen, unless method was removed by other
+				// thread, or the server stuffed up
+				final String s = "Specified Authentication not found!";
+				throw new SocksException(SOCKS_JUST_ERROR, s);
+			}
+
+			final Object[] in_out;
+			in_out = auth.doSocksAuthentication(selectedMethod, ps);
+
+			if (in_out == null) {
+				// Authentication failed by some reason
+				throw (new SocksException(SOCKS_AUTH_FAILURE));
+			}
+
+			/*
+			 * Most authentication methods are expected to return simply the
+			 * input/output streams associated with the socket. However if the
+			 * auth. method requires some kind of encryption/decryption being
+			 * done on the connection it should provide classes to handle I/O.
+			 */
+
+			in = (InputStream) in_out[0];
+			out = (OutputStream) in_out[1];
+			if (in_out.length > 2) {
+				udp_encapsulation = (UDPEncapsulation) in_out[2];
+			}
+
+		} catch (final SocksException s_ex) {
+			throw s_ex;
+		} catch (final UnknownHostException uh_ex) {
+			throw new SocksException(SOCKS_PROXY_NO_CONNECT, uh_ex);
+		} catch (final SocketException so_ex) {
+			throw new SocksException(SOCKS_PROXY_NO_CONNECT, so_ex);
+		} catch (final IOException io_ex) {
+			throw new SocksException(SOCKS_PROXY_IO_ERROR, io_ex);
+		}
+	}
+
+	protected ProxyMessage formMessage(int cmd, InetAddress ip, int port) {
+		return new Socks5Message(cmd, ip, port);
+	}
+
+	protected ProxyMessage formMessage(int cmd, String host, int port)
+			throws UnknownHostException {
+		if (resolveAddrLocally) {
+			return formMessage(cmd, InetAddress.getByName(host), port);
+		} else {
+			return new Socks5Message(cmd, host, port);
+		}
+	}
+
+	protected ProxyMessage formMessage(InputStream in) throws SocksException,
+			IOException {
+		return new Socks5Message(in);
+	}
+
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/SocksException.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/SocksException.java
new file mode 100644
index 0000000..a651597
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/SocksException.java
@@ -0,0 +1,111 @@
+package com.runjva.sourceforge.jsocks.protocol;
+
+/**
+ * Exception thrown by various socks classes to indicate errors with protocol or
+ * unsuccessfull server responses.
+ */
+public class SocksException extends java.io.IOException {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * Construct a SocksException with given errorcode.
+	 * <p>
+	 * Tries to look up message which corresponds to this error code.
+	 * 
+	 * @param errCode
+	 *            Error code for this exception.
+	 */
+	public SocksException(int errCode) {
+		this.errCode = errCode;
+		lookupErrorString(errCode);
+	}
+
+	private void lookupErrorString(int errCode) {
+		if ((errCode >> 16) == 0) {
+			if (errCode <= serverReplyMessage.length) {
+				errString = serverReplyMessage[errCode];
+			} else {
+				errString = UNASSIGNED_ERROR_MESSAGE;
+			}
+		} else {
+			// Local error
+			errCode = (errCode >> 16) - 1;
+			if (errCode <= localErrorMessage.length) {
+				errString = localErrorMessage[errCode];
+			} else {
+				errString = UNASSIGNED_ERROR_MESSAGE;
+			}
+		}
+	}
+
+	/**
+	 * Construct a SocksException with given error code, and a Throwable cause
+	 * 
+	 * @param errCode
+	 * @param t
+	 *            Nested exception for debugging purposes.
+	 */
+	public SocksException(int errCode, Throwable t) {
+		super(t);  // Java 1.6+
+		this.errCode = errCode;
+		lookupErrorString(errCode);
+	}
+
+	/**
+	 * Constructs a SocksException with given error code and message.
+	 * 
+	 * @param errCode
+	 *            Error code.
+	 * @param errString
+	 *            Error Message.
+	 */
+	public SocksException(int errCode, String errString) {
+		this.errCode = errCode;
+		this.errString = errString;
+	}
+
+	public SocksException(int errCode, String string, Throwable t) {
+		super(string, t);  // Java 1.6+
+		this.errCode = errCode;
+		this.errString = string;
+	}
+
+	/**
+	 * Get the error code associated with this exception.
+	 * 
+	 * @return Error code associated with this exception.
+	 */
+	public int getErrorCode() {
+		return errCode;
+	}
+
+	/**
+	 * Get human readable representation of this exception.
+	 * 
+	 * @return String represntation of this exception.
+	 */
+	public String toString() {
+		return errString;
+	}
+
+	static final String UNASSIGNED_ERROR_MESSAGE = "Unknown error message";
+
+	static final String serverReplyMessage[] = { "Succeeded",
+			"General SOCKS server failure",
+			"Connection not allowed by ruleset", "Network unreachable",
+			"Host unreachable", "Connection refused", "TTL expired",
+			"Command not supported", "Address type not supported" };
+
+	static final String localErrorMessage[] = { "SOCKS server not specified",
+			"Unable to contact SOCKS server", "IO error",
+			"None of Authentication methods are supported",
+			"Authentication failed", "General SOCKS fault" };
+
+	String errString;
+	int errCode;
+
+}// End of SocksException class
+
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/SocksProxyBase.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/SocksProxyBase.java
new file mode 100644
index 0000000..ebf4fdb
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/SocksProxyBase.java
@@ -0,0 +1,543 @@
+package com.runjva.sourceforge.jsocks.protocol;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InterruptedIOException;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+
+/**
+ * Abstract class Proxy, base for classes Socks4Proxy and Socks5Proxy. Defines
+ * methods for specifying default proxy, to be used by all classes of this
+ * package.
+ */
+
+public abstract class SocksProxyBase {
+
+	// Data members
+	protected InetRange directHosts = new InetRange();
+
+	protected InetAddress proxyIP = null;
+	protected String proxyHost = null;
+	protected int proxyPort;
+	protected Socket proxySocket = null;
+
+	protected InputStream in;
+	protected OutputStream out;
+
+	protected int version;
+
+	protected SocksProxyBase chainProxy = null;
+
+	// Protected static/class variables
+	protected static SocksProxyBase defaultProxy = null;
+
+	// Constructors
+	// ====================
+	SocksProxyBase(SocksProxyBase chainProxy, String proxyHost, int proxyPort)
+			throws UnknownHostException {
+		this.chainProxy = chainProxy;
+		this.proxyHost = proxyHost;
+
+		if (chainProxy == null) {
+			this.proxyIP = InetAddress.getByName(proxyHost);
+		}
+
+		this.proxyPort = proxyPort;
+	}
+
+	SocksProxyBase(String proxyHost, int proxyPort) throws UnknownHostException {
+		this(null, proxyHost, proxyPort);
+	}
+
+	SocksProxyBase(SocksProxyBase chainProxy, InetAddress proxyIP, int proxyPort) {
+		this.chainProxy = chainProxy;
+		this.proxyIP = proxyIP;
+		this.proxyPort = proxyPort;
+	}
+
+	SocksProxyBase(InetAddress proxyIP, int proxyPort) {
+		this(null, proxyIP, proxyPort);
+	}
+
+	SocksProxyBase(SocksProxyBase p) {
+		this.proxyIP = p.proxyIP;
+		this.proxyPort = p.proxyPort;
+		this.version = p.version;
+		this.directHosts = p.directHosts;
+	}
+
+	// Public instance methods
+	// ========================
+
+	/**
+	 * Get the port on which proxy server is running.
+	 * 
+	 * @return Proxy port.
+	 */
+	public int getPort() {
+		return proxyPort;
+	}
+
+	/**
+	 * Get the ip address of the proxy server host.
+	 * 
+	 * @return Proxy InetAddress.
+	 */
+	public InetAddress getInetAddress() {
+		return proxyIP;
+	}
+
+	/**
+	 * Adds given ip to the list of direct addresses. This machine will be
+	 * accessed without using proxy.
+	 */
+	public void addDirect(InetAddress ip) {
+		directHosts.add(ip);
+	}
+
+	/**
+	 * Adds host to the list of direct addresses. This machine will be accessed
+	 * without using proxy.
+	 */
+	public boolean addDirect(String host) {
+		return directHosts.add(host);
+	}
+
+	/**
+	 * Adds given range of addresses to the lsit of direct addresses, machines
+	 * within this range will be accessed without using proxy.
+	 */
+	public void addDirect(InetAddress from, InetAddress to) {
+		directHosts.add(from, to);
+	}
+
+	/**
+	 * Sets given InetRange as the list of direct address, previous list will be
+	 * discarded, any changes done previously with addDirect(Inetaddress) will
+	 * be lost. The machines in this range will be accessed without using proxy.
+	 * 
+	 * @param ir
+	 *            InetRange which should be used to look up direct addresses.
+	 * @see InetRange
+	 */
+	public void setDirect(InetRange ir) {
+		directHosts = ir;
+	}
+
+	/**
+	 * Get the list of direct hosts.
+	 * 
+	 * @return Current range of direct address as InetRange object.
+	 * @see InetRange
+	 */
+	public InetRange getDirect() {
+		return directHosts;
+	}
+
+	/**
+	 * Check wether the given host is on the list of direct address.
+	 * 
+	 * @param host
+	 *            Host name to check.
+	 * @return true if the given host is specified as the direct addresses.
+	 */
+	public boolean isDirect(String host) {
+		return directHosts.contains(host);
+	}
+
+	/**
+	 * Check wether the given host is on the list of direct addresses.
+	 * 
+	 * @param host
+	 *            Host address to check.
+	 * @return true if the given host is specified as the direct address.
+	 */
+	public boolean isDirect(InetAddress host) {
+		return directHosts.contains(host);
+	}
+
+	/**
+	 * Set the proxy which should be used to connect to given proxy.
+	 * 
+	 * @param chainProxy
+	 *            Proxy to use to connect to this proxy.
+	 */
+	public void setChainProxy(SocksProxyBase chainProxy) {
+		this.chainProxy = chainProxy;
+	}
+
+	/**
+	 * Get proxy which is used to connect to this proxy.
+	 * 
+	 * @return Proxy which is used to connect to this proxy, or null if proxy is
+	 *         to be contacted directly.
+	 */
+	public SocksProxyBase getChainProxy() {
+		return chainProxy;
+	}
+
+	/**
+	 * Get string representation of this proxy.
+	 * 
+	 * @returns string in the form:proxyHost:proxyPort \t Version versionNumber
+	 */
+	public String toString() {
+		return ("" + proxyIP.getHostName() + ":" + proxyPort + "\tVersion " + version);
+	}
+
+	// Public Static(Class) Methods
+	// ==============================
+
+	/**
+	 * Sets SOCKS4 proxy as default.
+	 * 
+	 * @param hostName
+	 *            Host name on which SOCKS4 server is running.
+	 * @param port
+	 *            Port on which SOCKS4 server is running.
+	 * @param user
+	 *            Username to use for communications with proxy.
+	 */
+	public static void setDefaultProxy(String hostName, int port, String user)
+			throws UnknownHostException {
+		defaultProxy = new Socks4Proxy(hostName, port, user);
+	}
+
+	/**
+	 * Sets SOCKS4 proxy as default.
+	 * 
+	 * @param ipAddress
+	 *            Host address on which SOCKS4 server is running.
+	 * @param port
+	 *            Port on which SOCKS4 server is running.
+	 * @param user
+	 *            Username to use for communications with proxy.
+	 */
+	public static void setDefaultProxy(InetAddress ipAddress, int port,
+			String user) {
+		defaultProxy = new Socks4Proxy(ipAddress, port, user);
+	}
+
+	/**
+	 * Sets SOCKS5 proxy as default. Default proxy only supports
+	 * no-authentication.
+	 * 
+	 * @param hostName
+	 *            Host name on which SOCKS5 server is running.
+	 * @param port
+	 *            Port on which SOCKS5 server is running.
+	 */
+	public static void setDefaultProxy(String hostName, int port)
+			throws UnknownHostException {
+		defaultProxy = new Socks5Proxy(hostName, port);
+	}
+
+	/**
+	 * Sets SOCKS5 proxy as default. Default proxy only supports
+	 * no-authentication.
+	 * 
+	 * @param ipAddress
+	 *            Host address on which SOCKS5 server is running.
+	 * @param port
+	 *            Port on which SOCKS5 server is running.
+	 */
+	public static void setDefaultProxy(InetAddress ipAddress, int port) {
+		defaultProxy = new Socks5Proxy(ipAddress, port);
+	}
+
+	/**
+	 * Sets default proxy.
+	 * 
+	 * @param p
+	 *            Proxy to use as default proxy.
+	 */
+	public static void setDefaultProxy(SocksProxyBase p) {
+		defaultProxy = p;
+	}
+
+	/**
+	 * Get current default proxy.
+	 * 
+	 * @return Current default proxy, or null if none is set.
+	 */
+	public static SocksProxyBase getDefaultProxy() {
+		return defaultProxy;
+	}
+
+	/**
+	 * Parses strings in the form: host[:port:user:password], and creates proxy
+	 * from information obtained from parsing.
+	 * <p>
+	 * Defaults: port = 1080.<br>
+	 * If user specified but not password, creates Socks4Proxy, if user not
+	 * specified creates Socks5Proxy, if both user and password are speciefied
+	 * creates Socks5Proxy with user/password authentication.
+	 * 
+	 * @param proxy_entry
+	 *            String in the form host[:port:user:password]
+	 * @return Proxy created from the string, null if entry was somehow
+	 *         invalid(host unknown for example, or empty string)
+	 */
+	public static SocksProxyBase parseProxy(String proxy_entry) {
+
+		String proxy_host;
+		int proxy_port = 1080;
+		String proxy_user = null;
+		String proxy_password = null;
+		SocksProxyBase proxy;
+
+		final java.util.StringTokenizer st = new java.util.StringTokenizer(
+				proxy_entry, ":");
+		if (st.countTokens() < 1) {
+			return null;
+		}
+
+		proxy_host = st.nextToken();
+		if (st.hasMoreTokens()) {
+			try {
+				proxy_port = Integer.parseInt(st.nextToken().trim());
+			} catch (final NumberFormatException nfe) {
+			}
+		}
+
+		if (st.hasMoreTokens()) {
+			proxy_user = st.nextToken();
+		}
+
+		if (st.hasMoreTokens()) {
+			proxy_password = st.nextToken();
+		}
+
+		try {
+			if (proxy_user == null) {
+				proxy = new Socks5Proxy(proxy_host, proxy_port);
+			} else if (proxy_password == null) {
+				proxy = new Socks4Proxy(proxy_host, proxy_port, proxy_user);
+			} else {
+				proxy = new Socks5Proxy(proxy_host, proxy_port);
+				final UserPasswordAuthentication upa = new UserPasswordAuthentication(
+						proxy_user, proxy_password);
+
+				((Socks5Proxy) proxy).setAuthenticationMethod(
+						UserPasswordAuthentication.METHOD_ID, upa);
+			}
+		} catch (final UnknownHostException uhe) {
+			return null;
+		}
+
+		return proxy;
+	}
+
+	// Protected Methods
+	// =================
+
+	protected void startSession() throws SocksException {
+		try {
+			if (chainProxy == null) {
+				proxySocket = new Socket(proxyIP, proxyPort);
+			} else if (proxyIP != null) {
+				proxySocket = new SocksSocket(chainProxy, proxyIP, proxyPort);
+			} else {
+				proxySocket = new SocksSocket(chainProxy, proxyHost, proxyPort);
+			}
+
+			in = proxySocket.getInputStream();
+			out = proxySocket.getOutputStream();
+		} catch (final SocksException se) {
+			throw se;
+		} catch (final IOException io_ex) {
+			throw new SocksException(SOCKS_PROXY_IO_ERROR, "" + io_ex);
+		}
+	}
+
+	/**
+	 * Create a copy of this proxy for use by individual threads.
+	 * 
+	 * @return proxy
+	 */
+	protected abstract SocksProxyBase copy();
+
+	protected abstract ProxyMessage formMessage(int cmd, InetAddress ip,
+			int port);
+
+	protected abstract ProxyMessage formMessage(int cmd, String host, int port)
+			throws UnknownHostException;
+
+	protected abstract ProxyMessage formMessage(InputStream in)
+			throws SocksException, IOException;
+
+	protected ProxyMessage connect(InetAddress ip, int port)
+			throws SocksException {
+		try {
+			startSession();
+			final ProxyMessage request = formMessage(SOCKS_CMD_CONNECT, ip,
+					port);
+			return exchange(request);
+		} catch (final SocksException se) {
+			endSession();
+			throw se;
+		}
+	}
+
+	protected ProxyMessage connect(String host, int port)
+			throws UnknownHostException, SocksException {
+		try {
+			startSession();
+			final ProxyMessage request = formMessage(SOCKS_CMD_CONNECT, host,
+					port);
+			return exchange(request);
+		} catch (final SocksException se) {
+			endSession();
+			throw se;
+		}
+	}
+
+	protected ProxyMessage bind(InetAddress ip, int port) throws SocksException {
+		try {
+			startSession();
+			final ProxyMessage request = formMessage(SOCKS_CMD_BIND, ip, port);
+			return exchange(request);
+		} catch (final SocksException se) {
+			endSession();
+			throw se;
+		}
+	}
+
+	protected ProxyMessage bind(String host, int port)
+			throws UnknownHostException, SocksException {
+		try {
+			startSession();
+			final ProxyMessage request = formMessage(SOCKS_CMD_BIND, host, port);
+			return exchange(request);
+		} catch (final SocksException se) {
+			endSession();
+			throw se;
+		}
+	}
+
+	protected ProxyMessage accept() throws IOException, SocksException {
+		ProxyMessage msg;
+		try {
+			msg = formMessage(in);
+		} catch (final InterruptedIOException iioe) {
+			throw iioe;
+		} catch (final IOException io_ex) {
+			endSession();
+			throw new SocksException(SOCKS_PROXY_IO_ERROR,
+					"While Trying accept:" + io_ex);
+		}
+		return msg;
+	}
+
+	protected ProxyMessage udpAssociate(InetAddress ip, int port)
+			throws SocksException {
+		try {
+			startSession();
+			final ProxyMessage request = formMessage(SOCKS_CMD_UDP_ASSOCIATE,
+					ip, port);
+			if (request != null) {
+				return exchange(request);
+			}
+		} catch (final SocksException se) {
+			endSession();
+			throw se;
+		}
+		// Only get here if request was null
+		endSession();
+		throw new SocksException(SOCKS_METHOD_NOTSUPPORTED,
+				"This version of proxy does not support UDP associate, use version 5");
+	}
+
+	protected ProxyMessage udpAssociate(String host, int port)
+			throws UnknownHostException, SocksException {
+		try {
+			startSession();
+			final ProxyMessage request = formMessage(SOCKS_CMD_UDP_ASSOCIATE,
+					host, port);
+			if (request != null) {
+				return exchange(request);
+			}
+		} catch (final SocksException se) {
+			endSession();
+			throw se;
+		}
+		// Only get here if request was null
+		endSession();
+		throw new SocksException(SOCKS_METHOD_NOTSUPPORTED,
+				"This version of proxy does not support UDP associate, use version 5");
+	}
+
+	protected void endSession() {
+		try {
+			if (proxySocket != null) {
+				proxySocket.close();
+			}
+			proxySocket = null;
+		} catch (final IOException io_ex) {
+		}
+	}
+
+	/**
+	 *Sends the request to SOCKS server
+	 */
+	protected void sendMsg(ProxyMessage msg) throws SocksException, IOException {
+		msg.write(out);
+	}
+
+	/**
+	 * Reads the reply from the SOCKS server
+	 */
+	protected ProxyMessage readMsg() throws SocksException, IOException {
+		return formMessage(in);
+	}
+
+	/**
+	 *Sends the request reads reply and returns it throws exception if
+	 * something wrong with IO or the reply code is not zero
+	 */
+	protected ProxyMessage exchange(ProxyMessage request) throws SocksException {
+		ProxyMessage reply;
+		try {
+			request.write(out);
+			reply = formMessage(in);
+		} catch (final SocksException s_ex) {
+			throw s_ex;
+		} catch (final IOException ioe) {
+			throw (new SocksException(SOCKS_PROXY_IO_ERROR, "" + ioe));
+		}
+		return reply;
+	}
+
+	// Private methods
+	// ===============
+
+	// Constants
+
+	public static final int SOCKS_SUCCESS = 0;
+	public static final int SOCKS_FAILURE = 1;
+	public static final int SOCKS_BADCONNECT = 2;
+	public static final int SOCKS_BADNETWORK = 3;
+	public static final int SOCKS_HOST_UNREACHABLE = 4;
+	public static final int SOCKS_CONNECTION_REFUSED = 5;
+	public static final int SOCKS_TTL_EXPIRE = 6;
+	public static final int SOCKS_CMD_NOT_SUPPORTED = 7;
+	public static final int SOCKS_ADDR_NOT_SUPPORTED = 8;
+
+	public static final int SOCKS_NO_PROXY = 1 << 16;
+	public static final int SOCKS_PROXY_NO_CONNECT = 2 << 16;
+	public static final int SOCKS_PROXY_IO_ERROR = 3 << 16;
+	public static final int SOCKS_AUTH_NOT_SUPPORTED = 4 << 16;
+	public static final int SOCKS_AUTH_FAILURE = 5 << 16;
+	public static final int SOCKS_JUST_ERROR = 6 << 16;
+
+	public static final int SOCKS_DIRECT_FAILED = 7 << 16;
+	public static final int SOCKS_METHOD_NOTSUPPORTED = 8 << 16;
+
+	static final int SOCKS_CMD_CONNECT = 0x1;
+	static final int SOCKS_CMD_BIND = 0x2;
+	static final int SOCKS_CMD_UDP_ASSOCIATE = 0x3;
+
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/SocksServerSocket.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/SocksServerSocket.java
new file mode 100644
index 0000000..8d009cb
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/SocksServerSocket.java
@@ -0,0 +1,235 @@
+package com.runjva.sourceforge.jsocks.protocol;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+
+/**
+ * SocksServerSocket allows to accept connections from one particular host
+ * through the SOCKS4 or SOCKS5 proxy.
+ */
+public class SocksServerSocket extends ServerSocket {
+	// Data members
+	protected SocksProxyBase proxy;
+	protected String localHost;
+	protected InetAddress localIP;
+	protected int localPort;
+
+	boolean doing_direct = false;
+	InetAddress remoteAddr;
+
+	/**
+	 * Creates ServerSocket capable of accepting one connection through the
+	 * firewall, uses default Proxy.
+	 * 
+	 * @param host
+	 *            Host from which the connection should be recieved.
+	 *@param port
+	 *            Port number of the primary connection.
+	 */
+	public SocksServerSocket(String host, int port) throws SocksException,
+			UnknownHostException, IOException {
+		this(SocksProxyBase.defaultProxy, host, port);
+	}
+
+	/**
+	 *Creates ServerSocket capable of accepting one connection through the
+	 * firewall, uses given proxy.
+	 * 
+	 * @param p
+	 *            Proxy object to use.
+	 *@param host
+	 *            Host from which the connection should be recieved.
+	 *@param port
+	 *            Port number of the primary connection.
+	 */
+	public SocksServerSocket(SocksProxyBase p, String host, int port)
+			throws SocksException, UnknownHostException, IOException {
+
+		super(0);
+		if (p == null) {
+			throw new SocksException(SocksProxyBase.SOCKS_NO_PROXY);
+		}
+		// proxy=p;
+		proxy = p.copy();
+		if (proxy.isDirect(host)) {
+			remoteAddr = InetAddress.getByName(host);
+			proxy = null;
+			doDirect();
+		} else {
+			processReply(proxy.bind(host, port));
+		}
+	}
+
+	/**
+	 * Creates ServerSocket capable of accepting one connection through the
+	 * firewall, uses default Proxy.
+	 * 
+	 * @param ip
+	 *            Host from which the connection should be recieved.
+	 *@param port
+	 *            Port number of the primary connection.
+	 */
+	public SocksServerSocket(InetAddress ip, int port) throws SocksException,
+			IOException {
+		this(SocksProxyBase.defaultProxy, ip, port);
+	}
+
+	/**
+	 *Creates ServerSocket capable of accepting one connection through the
+	 * firewall, uses given proxy.
+	 * 
+	 * @param p
+	 *            Proxy object to use.
+	 *@param ip
+	 *            Host from which the connection should be recieved.
+	 *@param port
+	 *            Port number of the primary connection.
+	 */
+	public SocksServerSocket(SocksProxyBase p, InetAddress ip, int port)
+			throws SocksException, IOException {
+		super(0);
+
+		if (p == null) {
+			throw new SocksException(SocksProxyBase.SOCKS_NO_PROXY);
+		}
+		this.proxy = p.copy();
+
+		if (proxy.isDirect(ip)) {
+			remoteAddr = ip;
+			doDirect();
+		} else {
+			processReply(proxy.bind(ip, port));
+		}
+	}
+
+	/**
+	 * Accepts the incoming connection.
+	 */
+	public Socket accept() throws IOException {
+		Socket s;
+
+		if (!doing_direct) {
+			if (proxy == null) {
+				return null;
+			}
+
+			final ProxyMessage msg = proxy.accept();
+			s = msg.ip == null ? new SocksSocket(msg.host, msg.port, proxy)
+					: new SocksSocket(msg.ip, msg.port, proxy);
+			// Set timeout back to 0
+			proxy.proxySocket.setSoTimeout(0);
+		} else { // Direct Connection
+
+			// Mimic the proxy behaviour,
+			// only accept connections from the speciefed host.
+			while (true) {
+				s = super.accept();
+				if (s.getInetAddress().equals(remoteAddr)) {
+					// got the connection from the right host
+					// Close listenning socket.
+					break;
+				} else {
+					s.close(); // Drop all connections from other hosts
+				}
+			}
+
+		}
+		proxy = null;
+		// Return accepted socket
+		return s;
+	}
+
+	/**
+	 * Closes the connection to proxy if socket have not been accepted, if the
+	 * direct connection is used, closes direct ServerSocket. If the client
+	 * socket have been allready accepted, does nothing.
+	 */
+	public void close() throws IOException {
+		super.close();
+		if (proxy != null) {
+			proxy.endSession();
+		}
+		proxy = null;
+	}
+
+	/**
+	 * Get the name of the host proxy is using to listen for incoming
+	 * connection.
+	 * <P>
+	 * Usefull when address is returned by proxy as the hostname.
+	 * 
+	 * @return the hostname of the address proxy is using to listen for incoming
+	 *         connection.
+	 */
+	public String getHost() {
+		return localHost;
+	}
+
+	/**
+	 * Get address assigned by proxy to listen for incomming connections, or the
+	 * local machine address if doing direct connection.
+	 */
+	public InetAddress getInetAddress() {
+		if (localIP == null) {
+			try {
+				localIP = InetAddress.getByName(localHost);
+			} catch (final UnknownHostException e) {
+				return null;
+			}
+		}
+		return localIP;
+	}
+
+	/**
+	 * Get port assigned by proxy to listen for incoming connections, or the
+	 * port chosen by local system, if accepting directly.
+	 */
+	public int getLocalPort() {
+		return localPort;
+	}
+
+	/**
+	 * Set Timeout.
+	 * 
+	 * @param timeout
+	 *            Amount of time in milliseconds, accept should wait for
+	 *            incoming connection before failing with exception. Zero
+	 *            timeout implies infinity.
+	 */
+	public void setSoTimeout(int timeout) throws SocketException {
+		super.setSoTimeout(timeout);
+		if (!doing_direct) {
+			proxy.proxySocket.setSoTimeout(timeout);
+		}
+	}
+
+	// Private Methods
+	// ////////////////
+
+	private void processReply(ProxyMessage reply) throws SocksException {
+		localPort = reply.port;
+		/*
+		 * If the server have assigned same host as it was contacted on it might
+		 * return an address of all zeros
+		 */
+		if (reply.host.equals("0.0.0.0")) {
+			localIP = proxy.proxyIP;
+			localHost = localIP.getHostName();
+		} else {
+			localHost = reply.host;
+			localIP = reply.ip;
+		}
+	}
+
+	private void doDirect() {
+		doing_direct = true;
+		localPort = super.getLocalPort();
+		localIP = super.getInetAddress();
+		localHost = localIP.getHostName();
+	}
+
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/SocksSocket.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/SocksSocket.java
new file mode 100644
index 0000000..0e70c7a
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/SocksSocket.java
@@ -0,0 +1,385 @@
+package com.runjva.sourceforge.jsocks.protocol;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+
+/**
+ * SocksSocket tryies to look very similar to normal Socket, while allowing
+ * connections through the SOCKS4 or 5 proxy. To use this class you will have to
+ * identify proxy you need to use, Proxy class allows you to set default proxy,
+ * which will be used by all Socks aware sockets. You can also create either
+ * Socks4Proxy or Socks5Proxy, and use them by passing to the appropriate
+ * constructors.
+ * <P>
+ * Using Socks package can be as easy as that:
+ * 
+ * <pre>
+ * <tt>
+ * 
+ *     import Socks.*;
+ *     ....
+ * 
+ *     try{
+ *        //Specify SOCKS5 proxy
+ *        Proxy.setDefaultProxy("socks-proxy",1080);
+ * 
+ *        //OR you still use SOCKS4
+ *        //Code below uses SOCKS4 proxy
+ *        //Proxy.setDefaultProxy("socks-proxy",1080,userName);
+ * 
+ *        Socket s = SocksSocket("some.host.of.mine",13);
+ *        readTimeFromSock(s);
+ *     }catch(SocksException sock_ex){
+ *        //Usually it will turn in more or less meaningfull message
+ *        System.err.println("SocksException:"+sock_ex);
+ *     }
+ * 
+ * </tt>
+ * </pre>
+ *<P>
+ * However if the need exist for more control, like resolving addresses
+ * remotely, or using some non-trivial authentication schemes, it can be done.
+ */
+
+public class SocksSocket extends Socket {
+	// Data members
+	protected SocksProxyBase proxy;
+	protected String localHost, remoteHost;
+	protected InetAddress localIP, remoteIP;
+	protected int localPort, remotePort;
+
+	private Socket directSock = null;
+
+	/**
+	 * Tryies to connect to given host and port using default proxy. If no
+	 * default proxy speciefied it throws SocksException with error code
+	 * SOCKS_NO_PROXY.
+	 * 
+	 * @param host
+	 *            Machine to connect to.
+	 * @param port
+	 *            Port to which to connect.
+	 * @see SocksSocket#SocksSocket(SocksProxyBase,String,int)
+	 * @see Socks5Proxy#resolveAddrLocally
+	 */
+	public SocksSocket(String host, int port) throws SocksException,
+			UnknownHostException {
+		this(SocksProxyBase.defaultProxy, host, port);
+	}
+
+	/**
+	 * Connects to host port using given proxy server.
+	 * 
+	 * @param p
+	 *            Proxy to use.
+	 * @param host
+	 *            Machine to connect to.
+	 * @param port
+	 *            Port to which to connect.
+	 * @throws UnknownHostException
+	 *             If one of the following happens:
+	 *             <ol>
+	 * 
+	 *             <li>Proxy settings say that address should be resolved
+	 *             locally, but this fails.
+	 *             <li>Proxy settings say that the host should be contacted
+	 *             directly but host name can't be resolved.
+	 *             </ol>
+	 * @throws SocksException
+	 *             If one of the following happens:
+	 *             <ul>
+	 *             <li>Proxy is is null.
+	 *             <li>Proxy settings say that the host should be contacted
+	 *             directly but this fails.
+	 *             <li>Socks Server can't be contacted.
+	 *             <li>Authentication fails.
+	 *             <li>Connection is not allowed by the SOCKS proxy.
+	 *             <li>SOCKS proxy can't establish the connection.
+	 *             <li>Any IO error occured.
+	 *             <li>Any protocol error occured.
+	 *             </ul>
+	 * @throws IOexception
+	 *             if anything is wrong with I/O.
+	 * @see Socks5Proxy#resolveAddrLocally
+	 */
+	public SocksSocket(SocksProxyBase p, String host, int port)
+			throws SocksException, UnknownHostException {
+
+		if (p == null) {
+			throw new SocksException(SocksProxyBase.SOCKS_NO_PROXY);
+		}
+		// proxy=p;
+		proxy = p.copy();
+		remoteHost = host;
+		remotePort = port;
+		if (proxy.isDirect(host)) {
+			remoteIP = InetAddress.getByName(host);
+			doDirect();
+		} else {
+			processReply(proxy.connect(host, port));
+		}
+	}
+
+	/**
+	 * Tryies to connect to given ip and port using default proxy. If no default
+	 * proxy speciefied it throws SocksException with error code SOCKS_NO_PROXY.
+	 * 
+	 * @param ip
+	 *            Machine to connect to.
+	 * @param port
+	 *            Port to which to connect.
+	 * @see SocksSocket#SocksSocket(SocksProxyBase,String,int)
+	 */
+	public SocksSocket(InetAddress ip, int port) throws SocksException {
+		this(SocksProxyBase.defaultProxy, ip, port);
+	}
+
+	/**
+	 * Connects to given ip and port using given Proxy server.
+	 * 
+	 * @param p
+	 *            Proxy to use.
+	 * @param ip
+	 *            Machine to connect to.
+	 * @param port
+	 *            Port to which to connect.
+	 */
+	public SocksSocket(SocksProxyBase p, InetAddress ip, int port)
+			throws SocksException {
+		if (p == null) {
+			throw new SocksException(SocksProxyBase.SOCKS_NO_PROXY);
+		}
+		this.proxy = p.copy();
+		this.remoteIP = ip;
+		this.remotePort = port;
+		this.remoteHost = ip.getHostName();
+		if (proxy.isDirect(remoteIP)) {
+			doDirect();
+		} else {
+			processReply(proxy.connect(ip, port));
+		}
+	}
+
+	/**
+	 * These 2 constructors are used by the SocksServerSocket. This socket
+	 * simply overrides remoteHost, remotePort
+	 */
+	protected SocksSocket(String host, int port, SocksProxyBase proxy) {
+		this.remotePort = port;
+		this.proxy = proxy;
+		this.localIP = proxy.proxySocket.getLocalAddress();
+		this.localPort = proxy.proxySocket.getLocalPort();
+		this.remoteHost = host;
+	}
+
+	protected SocksSocket(InetAddress ip, int port, SocksProxyBase proxy) {
+		remoteIP = ip;
+		remotePort = port;
+		this.proxy = proxy;
+		this.localIP = proxy.proxySocket.getLocalAddress();
+		this.localPort = proxy.proxySocket.getLocalPort();
+		remoteHost = remoteIP.getHostName();
+	}
+
+	/**
+	 * Same as Socket
+	 */
+	public void close() throws IOException {
+		if (proxy != null) {
+			proxy.endSession();
+		}
+		proxy = null;
+	}
+
+	/**
+	 * Same as Socket
+	 */
+	public InputStream getInputStream() {
+		return proxy.in;
+	}
+
+	/**
+	 * Same as Socket
+	 */
+	public OutputStream getOutputStream() {
+		return proxy.out;
+	}
+
+	/**
+	 * Same as Socket
+	 */
+	public int getPort() {
+		return remotePort;
+	}
+
+	/**
+	 * Returns remote host name, it is usefull in cases when addresses are
+	 * resolved by proxy, and we can't create InetAddress object.
+	 * 
+	 * @return The name of the host this socket is connected to.
+	 */
+	public String getHost() {
+		return remoteHost;
+	}
+
+	/**
+	 * Get remote host as InetAddress object, might return null if addresses are
+	 * resolved by proxy, and it is not possible to resolve it locally
+	 * 
+	 * @return Ip address of the host this socket is connected to, or null if
+	 *         address was returned by the proxy as DOMAINNAME and can't be
+	 *         resolved locally.
+	 */
+	public InetAddress getInetAddress() {
+		if (remoteIP == null) {
+			try {
+				remoteIP = InetAddress.getByName(remoteHost);
+			} catch (final UnknownHostException e) {
+				return null;
+			}
+		}
+		return remoteIP;
+	}
+
+	/**
+	 * Get the port assigned by the proxy for the socket, not the port on locall
+	 * machine as in Socket.
+	 * 
+	 * @return Port of the socket used on the proxy server.
+	 */
+	public int getLocalPort() {
+		return localPort;
+	}
+
+	/**
+	 * Get address assigned by proxy to make a remote connection, it might be
+	 * different from the host specified for the proxy. Can return null if socks
+	 * server returned this address as hostname and it can't be resolved
+	 * locally, use getLocalHost() then.
+	 * 
+	 * @return Address proxy is using to make a connection.
+	 */
+	public InetAddress getLocalAddress() {
+		if (localIP == null) {
+			try {
+				localIP = InetAddress.getByName(localHost);
+			} catch (final UnknownHostException e) {
+				return null;
+			}
+		}
+		return localIP;
+	}
+
+	/**
+	 * Get name of the host, proxy has assigned to make a remote connection for
+	 * this socket. This method is usefull when proxy have returned address as
+	 * hostname, and we can't resolve it on this machine.
+	 * 
+	 * @return The name of the host proxy is using to make a connection.
+	 */
+	public String getLocalHost() {
+		return localHost;
+	}
+
+	/**
+	 * Same as socket.
+	 */
+	public void setSoLinger(boolean on, int val) throws SocketException {
+		proxy.proxySocket.setSoLinger(on, val);
+	}
+
+	/**
+	 * Same as socket.
+	 */
+	public int getSoLinger(int timeout) throws SocketException {
+		return proxy.proxySocket.getSoLinger();
+	}
+
+	/**
+	 * Same as socket.
+	 */
+	public void setSoTimeout(int timeout) throws SocketException {
+		proxy.proxySocket.setSoTimeout(timeout);
+	}
+
+	/**
+	 * Same as socket.
+	 */
+	public int getSoTimeout(int timeout) throws SocketException {
+		return proxy.proxySocket.getSoTimeout();
+	}
+
+	/**
+	 * Same as socket.
+	 */
+	public void setTcpNoDelay(boolean on) throws SocketException {
+		proxy.proxySocket.setTcpNoDelay(on);
+	}
+
+	/**
+	 * Same as socket.
+	 */
+	public boolean getTcpNoDelay() throws SocketException {
+		return proxy.proxySocket.getTcpNoDelay();
+	}
+
+	/**
+	 * Get string representation of the socket.
+	 */
+	public String toString() {
+		if (directSock != null) {
+			return "Direct connection:" + directSock;
+		}
+		StringBuffer sb = new StringBuffer();
+		sb.append("Proxy:");
+		sb.append(proxy);
+		sb.append(";");
+		sb.append("addr:");
+		sb.append(remoteHost);
+		sb.append(",port:");
+		sb.append(remotePort);
+		sb.append(",localport:");
+		sb.append(localPort);
+		return sb.toString();
+
+	}
+
+	// Private Methods
+	// ////////////////
+
+	private void processReply(ProxyMessage reply) throws SocksException {
+		localPort = reply.port;
+		/*
+		 * If the server have assigned same host as it was contacted on it might
+		 * return an address of all zeros
+		 */
+		if (reply.host.equals("0.0.0.0")) {
+			localIP = proxy.proxyIP;
+			localHost = localIP.getHostName();
+		} else {
+			localHost = reply.host;
+			localIP = reply.ip;
+		}
+	}
+
+	private void doDirect() throws SocksException {
+		try {
+			//log.debug("IP: {}_{}", remoteIP, remotePort);
+			directSock = new Socket(remoteIP, remotePort);
+			proxy.out = directSock.getOutputStream();
+			proxy.in = directSock.getInputStream();
+			proxy.proxySocket = directSock;
+			localIP = directSock.getLocalAddress();
+			localPort = directSock.getLocalPort();
+		} catch (final IOException io_ex) {
+			final int errCode = SocksProxyBase.SOCKS_DIRECT_FAILED;
+			throw new SocksException(errCode, "Direct connect failed:", io_ex);
+		}
+	}
+
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/UDPEncapsulation.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/UDPEncapsulation.java
new file mode 100644
index 0000000..eaa4614
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/UDPEncapsulation.java
@@ -0,0 +1,33 @@
+package com.runjva.sourceforge.jsocks.protocol;
+
+/**
+ * This interface provides for datagram encapsulation for SOCKSv5 protocol.
+ * <p>
+ * SOCKSv5 allows for datagrams to be encapsulated for purposes of integrity
+ * and/or authenticity. How it should be done is aggreed during the
+ * authentication stage, and is authentication dependent. This interface is
+ * provided to allow this encapsulation.
+ * 
+ * @see Authentication
+ */
+public interface UDPEncapsulation {
+
+	/**
+	 * This method should provide any authentication depended transformation on
+	 * datagrams being send from/to the client.
+	 * 
+	 * @param data
+	 *            Datagram data (including any SOCKS related bytes), to be
+	 *            encapsulated/decapsulated.
+	 * @param out
+	 *            Wether the data is being send out. If true method should
+	 *            encapsulate/encrypt data, otherwise it should decapsulate/
+	 *            decrypt data.
+	 * @throw IOException if for some reason data can be transformed correctly.
+	 * @return Should return byte array containing data after transformation. It
+	 *         is possible to return same array as input, if transformation only
+	 *         involves bit mangling, and no additional data is being added or
+	 *         removed.
+	 */
+	byte[] udpEncapsulate(byte[] data, boolean out) throws java.io.IOException;
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/UDPRelayServer.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/UDPRelayServer.java
new file mode 100644
index 0000000..33ec4ed
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/UDPRelayServer.java
@@ -0,0 +1,227 @@
+package com.runjva.sourceforge.jsocks.protocol;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+
+import com.runjva.sourceforge.jsocks.server.ServerAuthenticator;
+
+/**
+ * UDP Relay server, used by ProxyServer to perform udp forwarding.
+ */
+class UDPRelayServer implements Runnable {
+
+	DatagramSocket client_sock;
+	DatagramSocket remote_sock;
+
+	Socket controlConnection;
+
+	int relayPort;
+	InetAddress relayIP;
+
+	Thread pipe_thread1, pipe_thread2;
+	Thread master_thread;
+
+	ServerAuthenticator auth;
+
+	long lastReadTime;
+	
+	static SocksProxyBase proxy = null;
+	static int datagramSize = 0xFFFF;// 64K, a bit more than max udp size
+	static int iddleTimeout = 180000;// 3 minutes
+
+	/**
+	 * Constructs UDP relay server to communicate with client on given ip and
+	 * port.
+	 * 
+	 * @param clientIP
+	 *            Address of the client from whom datagrams will be recieved and
+	 *            to whom they will be forwarded.
+	 * @param clientPort
+	 *            Clients port.
+	 * @param master_thread
+	 *            Thread which will be interrupted, when UDP relay server
+	 *            stoppes for some reason.
+	 * @param controlConnection
+	 *            Socket which will be closed, before interrupting the master
+	 *            thread, it is introduced due to a bug in windows JVM which
+	 *            does not throw InterruptedIOException in threads which block
+	 *            in I/O operation.
+	 */
+	public UDPRelayServer(InetAddress clientIP, int clientPort,
+			Thread master_thread, Socket controlConnection,
+			ServerAuthenticator auth) throws IOException {
+
+		this.master_thread = master_thread;
+		this.controlConnection = controlConnection;
+		this.auth = auth;
+
+		client_sock = new Socks5DatagramSocket(true,
+				auth.getUdpEncapsulation(), clientIP, clientPort);
+
+		relayPort = client_sock.getLocalPort();
+		relayIP = client_sock.getLocalAddress();
+
+		if (relayIP.getHostAddress().equals("0.0.0.0")) {
+			relayIP = InetAddress.getLocalHost();
+		}
+
+		if (proxy == null) {
+			remote_sock = new DatagramSocket();
+		} else {
+			remote_sock = new Socks5DatagramSocket(proxy, 0, null);
+		}
+	}
+
+	// Public methods
+	// ///////////////
+
+	/**
+	 * Sets the timeout for UDPRelay server.<br>
+	 * Zero timeout implies infinity.<br>
+	 * Default timeout is 3 minutes.
+	 */
+
+	static public void setTimeout(int timeout) {
+		iddleTimeout = timeout;
+	}
+
+	/**
+	 * Sets the size of the datagrams used in the UDPRelayServer.<br>
+	 * Default size is 64K, a bit more than maximum possible size of the
+	 * datagram.
+	 */
+	static public void setDatagramSize(int size) {
+		datagramSize = size;
+	}
+
+	/**
+	 * Port to which client should send datagram for association.
+	 */
+	public int getRelayPort() {
+		return relayPort;
+	}
+
+	/**
+	 * IP address to which client should send datagrams for association.
+	 */
+	public InetAddress getRelayIP() {
+		return relayIP;
+	}
+
+	/**
+	 * Starts udp relay server. Spawns two threads of execution and returns.
+	 */
+	public void start() throws IOException {
+		remote_sock.setSoTimeout(iddleTimeout);
+		client_sock.setSoTimeout(iddleTimeout);
+
+		//log.info("Starting UDP relay server on {}:{}", relayIP, relayPort);
+		//log.info("Remote socket {}:{}", remote_sock.getLocalAddress(),
+			//	remote_sock.getLocalPort());
+
+		pipe_thread1 = new Thread(this, "pipe1");
+		pipe_thread2 = new Thread(this, "pipe2");
+
+		lastReadTime = System.currentTimeMillis();
+
+		pipe_thread1.start();
+		pipe_thread2.start();
+	}
+
+	/**
+	 * Stops Relay server.
+	 * <p>
+	 * Does not close control connection, does not interrupt master_thread.
+	 */
+	public synchronized void stop() {
+		master_thread = null;
+		controlConnection = null;
+		abort();
+	}
+
+	// Runnable interface
+	// //////////////////
+	public void run() {
+		try {
+			if (Thread.currentThread().getName().equals("pipe1")) {
+				pipe(remote_sock, client_sock, false);
+			} else {
+				pipe(client_sock, remote_sock, true);
+			}
+		} catch (final IOException ioe) {
+		} finally {
+			abort();
+			//log.info("UDP Pipe thread " + Thread.currentThread().getName()
+				//	+ " stopped.");
+		}
+
+	}
+
+	// Private methods
+	// ///////////////
+	private synchronized void abort() {
+		if (pipe_thread1 == null) {
+			return;
+		}
+
+		//log.info("Aborting UDP Relay Server");
+
+		remote_sock.close();
+		client_sock.close();
+
+		if (controlConnection != null) {
+			try {
+				controlConnection.close();
+			} catch (final IOException ioe) {
+			}
+		}
+
+		if (master_thread != null) {
+			master_thread.interrupt();
+		}
+
+		pipe_thread1.interrupt();
+		pipe_thread2.interrupt();
+
+		pipe_thread1 = null;
+	}
+
+	private void pipe(DatagramSocket from, DatagramSocket to, boolean out)
+			throws IOException {
+		final byte[] data = new byte[datagramSize];
+		final DatagramPacket dp = new DatagramPacket(data, data.length);
+
+		while (true) {
+			try {
+				from.receive(dp);
+				lastReadTime = System.currentTimeMillis();
+
+				if (auth.checkRequest(dp, out)) {
+					to.send(dp);
+				}
+
+			} catch (final UnknownHostException uhe) {
+				//log.info("Dropping datagram for unknown host");
+			} catch (final InterruptedIOException iioe) {
+				// log("Interrupted: "+iioe);
+				// If we were interrupted by other thread.
+				if (iddleTimeout == 0) {
+					return;
+				}
+
+				// If last datagram was received, long time ago, return.
+				final long timeSinceRead = System.currentTimeMillis()
+						- lastReadTime;
+				if (timeSinceRead >= iddleTimeout - 100) {
+					return;
+				}
+			}
+			dp.setLength(data.length);
+		}
+	}
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/UserPasswordAuthentication.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/UserPasswordAuthentication.java
new file mode 100644
index 0000000..2d5e600
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/protocol/UserPasswordAuthentication.java
@@ -0,0 +1,91 @@
+package com.runjva.sourceforge.jsocks.protocol;
+
+/**
+ * SOCKS5 User Password authentication scheme.
+ */
+public class UserPasswordAuthentication implements Authentication {
+
+	/** SOCKS ID for User/Password authentication method */
+	public final static int METHOD_ID = 2;
+
+	String userName, password;
+	byte[] request;
+
+	/**
+	 * Create an instance of UserPasswordAuthentication.
+	 * 
+	 * @param userName
+	 *            User Name to send to SOCKS server.
+	 * @param password
+	 *            Password to send to SOCKS server.
+	 */
+	public UserPasswordAuthentication(String userName, String password) {
+		this.userName = userName;
+		this.password = password;
+		formRequest();
+	}
+
+	/**
+	 * Get the user name.
+	 * 
+	 * @return User name.
+	 */
+	public String getUser() {
+		return userName;
+	}
+
+	/**
+	 * Get password
+	 * 
+	 * @return Password
+	 */
+	public String getPassword() {
+		return password;
+	}
+
+	/**
+	 * Does User/Password authentication as defined in rfc1929.
+	 * 
+	 * @return An array containnig in, out streams, or null if authentication
+	 *         fails.
+	 */
+	public Object[] doSocksAuthentication(int methodId,
+			java.net.Socket proxySocket) throws java.io.IOException {
+
+		if (methodId != METHOD_ID) {
+			return null;
+		}
+
+		final java.io.InputStream in = proxySocket.getInputStream();
+		final java.io.OutputStream out = proxySocket.getOutputStream();
+
+		out.write(request);
+		final int version = in.read();
+		if (version < 0) {
+			return null; // Server closed connection
+		}
+		final int status = in.read();
+		if (status != 0) {
+			return null; // Server closed connection, or auth failed.
+		}
+
+		return new Object[] { in, out };
+	}
+
+	// Private methods
+	// ////////////////
+
+	/** Convert UserName password in to binary form, ready to be send to server */
+	private void formRequest() {
+		final byte[] user_bytes = userName.getBytes();
+		final byte[] password_bytes = password.getBytes();
+
+		request = new byte[3 + user_bytes.length + password_bytes.length];
+		request[0] = (byte) 1;
+		request[1] = (byte) user_bytes.length;
+		System.arraycopy(user_bytes, 0, request, 2, user_bytes.length);
+		request[2 + user_bytes.length] = (byte) password_bytes.length;
+		System.arraycopy(password_bytes, 0, request, 3 + user_bytes.length,
+				password_bytes.length);
+	}
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/server/Ident.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/server/Ident.java
new file mode 100644
index 0000000..f2b1682
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/server/Ident.java
@@ -0,0 +1,171 @@
+package com.runjva.sourceforge.jsocks.server;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.InterruptedIOException;
+import java.net.ConnectException;
+import java.net.Socket;
+import java.util.StringTokenizer;
+
+/**
+ * Class Ident provides means to obtain user name of the owner of the socket on
+ * remote machine, providing remote machine runs identd daemon.
+ * <p>
+ * To use it: <tt><pre>
+   Socket s = ss.accept();
+   Ident id = new Ident(s);
+   if(id.successful) goUseUser(id.userName);
+   else handleIdentError(id.errorCode,id.errorMessage)
+   </pre></tt>
+ */
+public class Ident {
+
+	/** Error Message can be null. */
+	public String errorMessage;
+
+	/** Host type as returned by daemon, can be null, if error happened */
+	public String hostType;
+
+	/** User name as returned by the identd daemon, or null, if it failed */
+	public String userName;
+
+	/**
+	 * If this is true then userName and hostType contain valid values. Else
+	 * errorCode contain the error code, and errorMessage contains the
+	 * corresponding message.
+	 */
+	public boolean successful;
+
+	/** Error code */
+	public int errorCode;
+
+	/** Identd on port 113 can't be contacted */
+	public static final int ERR_NO_CONNECT = 1;
+
+	/** Connection timed out */
+	public static final int ERR_TIMEOUT = 2;
+
+	/**
+	 * Identd daemon responded with ERROR, in this case errorMessage contains
+	 * the string explanation, as send by the daemon.
+	 */
+	public static final int ERR_PROTOCOL = 3;
+
+	/**
+	 * When parsing server response protocol error happened.
+	 */
+	public static final int ERR_PROTOCOL_INCORRECT = 4;
+
+	/**
+	 * Maximum amount of time we should wait before dropping the connection to
+	 * identd server.Setting it to 0 implies infinit timeout.
+	 */
+	public static final int connectionTimeout = 10000;
+
+	/**
+	 * Constructor tries to connect to Identd daemon on the host of the given
+	 * socket, and retrieve user name of the owner of given socket connection on
+	 * remote machine. After constructor returns public fields are initialised
+	 * to whatever the server returned.
+	 * <p>
+	 * If user name was successfully retrieved successful is set to true, and
+	 * userName and hostType are set to whatever server returned. If however for
+	 * some reason user name was not obtained, successful is set to false and
+	 * errorCode contains the code explaining the reason of failure, and
+	 * errorMessage contains human readable explanation.
+	 * <p>
+	 * Constructor may block, for a while.
+	 * 
+	 * @param s
+	 *            Socket whose ownership on remote end should be obtained.
+	 */
+	public Ident(Socket s) {
+		Socket sock = null;
+		successful = false; // We are pessimistic
+
+		try {
+			sock = new Socket(s.getInetAddress(), 113);
+			sock.setSoTimeout(connectionTimeout);
+			final byte[] request = ("" + s.getPort() + " , " + s.getLocalPort() + "\r\n")
+					.getBytes();
+
+			sock.getOutputStream().write(request);
+
+			final BufferedReader in = new BufferedReader(new InputStreamReader(
+					sock.getInputStream()));
+
+			parseResponse(in.readLine());
+
+		} catch (final InterruptedIOException iioe) {
+			errorCode = ERR_TIMEOUT;
+			errorMessage = "Connection to identd timed out.";
+		} catch (final ConnectException ce) {
+			errorCode = ERR_NO_CONNECT;
+			errorMessage = "Connection to identd server failed.";
+
+		} catch (final IOException ioe) {
+			errorCode = ERR_NO_CONNECT;
+			errorMessage = "" + ioe;
+		} finally {
+			try {
+				if (sock != null) {
+					sock.close();
+				}
+			} catch (final IOException ioe) {
+				//log.warn("Could not close socket", ioe);
+			}
+		}
+	}
+
+	private void parseResponse(String response) {
+		if (response == null) {
+			errorCode = ERR_PROTOCOL_INCORRECT;
+			errorMessage = "Identd server closed connection.";
+			return;
+		}
+
+		final StringTokenizer st = new StringTokenizer(response, ":");
+		if (st.countTokens() < 3) {
+			errorCode = ERR_PROTOCOL_INCORRECT;
+			errorMessage = "Can't parse server response.";
+			return;
+		}
+
+		st.nextToken(); // Discard first token, it's basically what we have send
+		final String command = st.nextToken().trim().toUpperCase();
+
+		if (command.equals("USERID") && (st.countTokens() >= 2)) {
+			successful = true;
+			hostType = st.nextToken().trim();
+			userName = st.nextToken("").substring(1);// Get all that is left
+		} else if (command.equals("ERROR")) {
+			errorCode = ERR_PROTOCOL;
+			errorMessage = st.nextToken();
+		} else {
+			errorCode = ERR_PROTOCOL_INCORRECT;
+			System.out.println("Opa!");
+			errorMessage = "Can't parse server response.";
+		}
+
+	}
+
+	// /////////////////////////////////////////////
+	// USED for Testing
+	/*
+	 * public static void main(String[] args) throws IOException{
+	 * 
+	 * Socket s = null; s = new Socket("gp101-16", 1391);
+	 * 
+	 * Ident id = new Ident(s); if(id.successful){
+	 * System.out.println("User: "+id.userName);
+	 * System.out.println("HostType: "+id.hostType); }else{
+	 * System.out.println("ErrorCode: "+id.errorCode);
+	 * System.out.println("ErrorMessage: "+id.errorMessage);
+	 * 
+	 * }
+	 * 
+	 * if(s!= null) s.close(); } //
+	 */
+
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/server/IdentAuthenticator.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/server/IdentAuthenticator.java
new file mode 100644
index 0000000..70e2593
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/server/IdentAuthenticator.java
@@ -0,0 +1,182 @@
+package com.runjva.sourceforge.jsocks.server;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
+
+import com.runjva.sourceforge.jsocks.protocol.InetRange;
+import com.runjva.sourceforge.jsocks.protocol.ProxyMessage;
+
+/**
+ * An implementation of socks.ServerAuthentication which provides simple
+ * authentication based on the host from which the connection is made and the
+ * name of the user on the remote machine, as reported by identd daemon on the
+ * remote machine.
+ * <p>
+ * It can also be used to provide authentication based only on the contacting
+ * host address.
+ */
+
+public class IdentAuthenticator extends ServerAuthenticatorBase {
+	/** Vector of InetRanges */
+	Vector<InetRange> hosts;
+
+	/** Vector of user hashes */
+	Vector<Hashtable<?, ?>> users;
+
+	String user;
+
+	/**
+	 * Constructs empty IdentAuthenticator.
+	 */
+	public IdentAuthenticator() {
+		hosts = new Vector<InetRange>();
+		users = new Vector<Hashtable<?, ?>>();
+	}
+
+	/**
+	 * Used to create instances returned from startSession.
+	 * 
+	 * @param in
+	 *            Input stream.
+	 * @param out
+	 *            OutputStream.
+	 * @param user
+	 *            Username associated with this connection,could be null if name
+	 *            was not required.
+	 */
+	IdentAuthenticator(InputStream in, OutputStream out, String user) {
+		super(in, out);
+		this.user = user;
+	}
+
+	/**
+	 * Adds range of addresses from which connection is allowed. Hashtable users
+	 * should contain user names as keys and anything as values (value is not
+	 * used and will be ignored).
+	 * 
+	 * @param hostRange
+	 *            Range of ip addresses from which connection is allowed.
+	 * @param users
+	 *            Hashtable of users for whom connection is allowed, or null to
+	 *            indicate that anybody is allowed to connect from the hosts
+	 *            within given range.
+	 */
+	public synchronized void add(InetRange hostRange, Hashtable<?, ?> users) {
+		this.hosts.addElement(hostRange);
+		this.users.addElement(users);
+	}
+
+	/**
+	 * Grants permission only to those users, who connect from one of the hosts
+	 * registered with add(InetRange,Hashtable) and whose names, as reported by
+	 * identd daemon, are listed for the host the connection came from.
+	 */
+	public ServerAuthenticator startSession(Socket s) throws IOException {
+
+		final int ind = getRangeIndex(s.getInetAddress());
+		String user = null;
+
+		// System.out.println("getRangeReturned:"+ind);
+
+		if (ind < 0) {
+			return null; // Host is not on the list.
+		}
+
+		final ServerAuthenticator serverAuthenticator = super.startSession(s);
+		final ServerAuthenticatorBase auth = (ServerAuthenticatorBase) serverAuthenticator;
+
+		// System.out.println("super.startSession() returned:"+auth);
+		if (auth == null) {
+			return null;
+		}
+
+		// do the authentication
+
+		final Hashtable<?, ?> user_names = users.elementAt(ind);
+
+		if (user_names != null) { // If need to do authentication
+			Ident ident;
+			ident = new Ident(s);
+			// If can't obtain user name, fail
+			if (!ident.successful) {
+				return null;
+			}
+			// If user name is not listed for this address, fail
+			if (!user_names.containsKey(ident.userName)) {
+				return null;
+			}
+			user = ident.userName;
+		}
+		return new IdentAuthenticator(auth.in, auth.out, user);
+
+	}
+
+	/**
+	 * For SOCKS5 requests allways returns true. For SOCKS4 requests checks
+	 * wether the user name supplied in the request corresponds to the name
+	 * obtained from the ident daemon.
+	 */
+	public boolean checkRequest(ProxyMessage msg, java.net.Socket s) {
+		// If it's version 5 request, or if anybody is permitted, return true;
+		if ((msg.version == 5) || (user == null)) {
+			return true;
+		}
+
+		if (msg.version != 4) {
+			return false; // Who knows?
+		}
+
+		return user.equals(msg.user);
+	}
+
+	/** Get String representaion of the IdentAuthenticator. */
+	public String toString() {
+		String s = "";
+
+		for (int i = 0; i < hosts.size(); ++i) {
+			s += "(Range:" + hosts.elementAt(i) + "," + //
+					" Users:" + userNames(i) + ") ";
+		}
+		return s;
+	}
+
+	// Private Methods
+	// ////////////////
+	private int getRangeIndex(InetAddress ip) {
+		int index = 0;
+		final Enumeration<InetRange> enumx = hosts.elements();
+		while (enumx.hasMoreElements()) {
+			final InetRange ir = enumx.nextElement();
+			if (ir.contains(ip)) {
+				return index;
+			}
+			index++;
+		}
+		return -1; // Not found
+	}
+
+	private String userNames(int i) {
+		if (users.elementAt(i) == null) {
+			return "Everybody is permitted.";
+		}
+
+		final Enumeration<?> enumx = ((Hashtable<?, ?>) users.elementAt(i))
+				.keys();
+		if (!enumx.hasMoreElements()) {
+			return "";
+		}
+		String s = enumx.nextElement().toString();
+		while (enumx.hasMoreElements()) {
+			s += "; " + enumx.nextElement();
+		}
+
+		return s;
+	}
+
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/server/ServerAuthenticator.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/server/ServerAuthenticator.java
new file mode 100644
index 0000000..3014a92
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/server/ServerAuthenticator.java
@@ -0,0 +1,126 @@
+package com.runjva.sourceforge.jsocks.server;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.DatagramPacket;
+import java.net.Socket;
+
+import com.runjva.sourceforge.jsocks.protocol.ProxyMessage;
+import com.runjva.sourceforge.jsocks.protocol.UDPEncapsulation;
+
+/**
+ * Classes implementing this interface should provide socks server with
+ * authentication and authorization of users.
+ **/
+public interface ServerAuthenticator {
+
+	/**
+	 * This method is called when a new connection accepted by the server.
+	 * <p>
+	 * At this point no data have been extracted from the connection. It is
+	 * responsibility of this method to ensure that the next byte in the stream
+	 * after this method have been called is the first byte of the socks request
+	 * message. For SOCKSv4 there is no authentication data and the first byte
+	 * in the stream is part of the request. With SOCKSv5 however there is an
+	 * authentication data first. It is expected that implementaions will
+	 * process this authentication data.
+	 * <p>
+	 * If authentication was successful an instance of ServerAuthentication
+	 * should be returned, it later will be used by the server to perform
+	 * authorization and some other things. If authentication fails null should
+	 * be returned, or an exception may be thrown.
+	 * 
+	 * @param s
+	 *            Accepted Socket.
+	 * @return An instance of ServerAuthenticator to be used for this connection
+	 *         or null
+	 */
+	ServerAuthenticator startSession(Socket s) throws IOException;
+
+	/**
+	 * This method should return input stream which should be used on the
+	 * accepted socket.
+	 * <p>
+	 * SOCKSv5 allows to have multiple authentication methods, and these methods
+	 * might require some kind of transformations being made on the data.
+	 * <p>
+	 * This method is called on the object returned from the startSession
+	 * function.
+	 */
+	InputStream getInputStream();
+
+	/**
+	 * This method should return output stream to use to write to the accepted
+	 * socket.
+	 * <p>
+	 * SOCKSv5 allows to have multiple authentication methods, and these methods
+	 * might require some kind of transformations being made on the data.
+	 * <p>
+	 * This method is called on the object returned from the startSession
+	 * function.
+	 */
+	OutputStream getOutputStream();
+
+	/**
+	 * This method should return UDPEncapsulation, which should be used on the
+	 * datagrams being send in/out.
+	 * <p>
+	 * If no transformation should be done on the datagrams, this method should
+	 * return null.
+	 * <p>
+	 * This method is called on the object returned from the startSession
+	 * function.
+	 */
+
+	UDPEncapsulation getUdpEncapsulation();
+
+	/**
+	 * This method is called when a request have been read.
+	 * <p>
+	 * Implementation should decide wether to grant request or not. Returning
+	 * true implies granting the request, false means request should be
+	 * rejected.
+	 * <p>
+	 * This method is called on the object returned from the startSession
+	 * function.
+	 * 
+	 * @param msg
+	 *            Request message.
+	 * @return true to grant request, false to reject it.
+	 */
+	boolean checkRequest(ProxyMessage msg);
+
+	/**
+	 * This method is called when datagram is received by the server.
+	 * <p>
+	 * Implementaions should decide wether it should be forwarded or dropped. It
+	 * is expecteed that implementation will use datagram address and port
+	 * information to make a decision, as well as anything else. Address and
+	 * port of the datagram are always correspond to remote machine. It is
+	 * either destination or source address. If out is true address is
+	 * destination address, else it is a source address, address of the machine
+	 * from which datagram have been received for the client.
+	 * <p>
+	 * Implementaions should return true if the datagram is to be forwarded, and
+	 * false if the datagram should be dropped.
+	 * <p>
+	 * This method is called on the object returned from the startSession
+	 * function.
+	 * 
+	 * @param out
+	 *            If true the datagram is being send out(from the client),
+	 *            otherwise it is an incoming datagram.
+	 * @return True to forward datagram false drop it silently.
+	 */
+	boolean checkRequest(DatagramPacket dp, boolean out);
+
+	/**
+	 * This method is called when session is completed. Either due to normal
+	 * termination or due to any error condition.
+	 * <p>
+	 * This method is called on the object returned from the startSession
+	 * function.
+	 */
+	void endSession();
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/server/ServerAuthenticatorBase.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/server/ServerAuthenticatorBase.java
new file mode 100644
index 0000000..79acd58
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/server/ServerAuthenticatorBase.java
@@ -0,0 +1,187 @@
+package com.runjva.sourceforge.jsocks.server;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PushbackInputStream;
+import java.net.Socket;
+
+import com.runjva.sourceforge.jsocks.protocol.ProxyMessage;
+import com.runjva.sourceforge.jsocks.protocol.UDPEncapsulation;
+
+/**
+ * An implementation of ServerAuthenticator, which does <b>not</b> do any
+ * authentication.
+ * <P>
+ * <FONT size="+3" color ="FF0000"> Warning!!</font><br>
+ * Should not be used on machines which are not behind the firewall.
+ * <p>
+ * It is only provided to make implementing other authentication schemes easier.
+ * <br>
+ * For Example: <tt><pre>
+   class MyAuth extends socks.server.ServerAuthenticator{
+    ...
+    public ServerAuthenticator startSession(java.net.Socket s){
+      if(!checkHost(s.getInetAddress()) return null;
+      return super.startSession(s);
+    }
+
+    boolean checkHost(java.net.Inetaddress addr){
+      boolean allow;
+      //Do it somehow
+      return allow;
+    }
+   }
+</pre></tt>
+ */
+public abstract class ServerAuthenticatorBase implements ServerAuthenticator {
+
+	static final byte[] socks5response = { 5, 0 };
+
+	InputStream in;
+	OutputStream out;
+
+	/**
+	 * Creates new instance of the ServerAuthenticatorNone.
+	 */
+	public ServerAuthenticatorBase() {
+		this.in = null;
+		this.out = null;
+	}
+
+	/**
+	 * Constructs new ServerAuthenticatorNone object suitable for returning from
+	 * the startSession function.
+	 * 
+	 * @param in
+	 *            Input stream to return from getInputStream method.
+	 * @param out
+	 *            Output stream to return from getOutputStream method.
+	 */
+	public ServerAuthenticatorBase(InputStream in, OutputStream out) {
+		this.in = in;
+		this.out = out;
+	}
+
+	/**
+	 * Grants access to everyone.Removes authentication related bytes from the
+	 * stream, when a SOCKS5 connection is being made, selects an authentication
+	 * NONE.
+	 */
+	public ServerAuthenticator startSession(Socket s) throws IOException {
+
+		final PushbackInputStream in = new PushbackInputStream(s
+				.getInputStream());
+		final OutputStream out = s.getOutputStream();
+
+		final int version = in.read();
+		if (version == 5) {
+			if (!selectSocks5Authentication(in, out, 0)) {
+				return null;
+			}
+		} else if (version == 4) {
+			// Else it is the request message already, version 4
+			in.unread(version);
+		} else {
+			return null;
+		}
+
+		return new ServerAuthenticatorNone(in, out);
+	}
+
+	/**
+	 * Get input stream.
+	 * 
+	 * @return Input stream speciefied in the constructor.
+	 */
+	public InputStream getInputStream() {
+		return in;
+	}
+
+	/**
+	 * Get output stream.
+	 * 
+	 * @return Output stream speciefied in the constructor.
+	 */
+	public OutputStream getOutputStream() {
+		return out;
+	}
+
+	/**
+	 * Allways returns null.
+	 * 
+	 * @return null
+	 */
+	public UDPEncapsulation getUdpEncapsulation() {
+		return null;
+	}
+
+	/**
+	 * Allways returns true.
+	 */
+	public boolean checkRequest(ProxyMessage msg) {
+		return true;
+	}
+
+	/**
+	 * Allways returns true.
+	 */
+	public boolean checkRequest(java.net.DatagramPacket dp, boolean out) {
+		return true;
+	}
+
+	/**
+	 * Does nothing.
+	 */
+	public void endSession() {
+	}
+
+	/**
+	 * Convinience routine for selecting SOCKSv5 authentication.
+	 * <p>
+	 * This method reads in authentication methods that client supports, checks
+	 * wether it supports given method. If it does, the notification method is
+	 * written back to client, that this method have been chosen for
+	 * authentication. If given method was not found, authentication failure
+	 * message is send to client ([5,FF]).
+	 * 
+	 * @param in
+	 *            Input stream, version byte should be removed from the stream
+	 *            before calling this method.
+	 * @param out
+	 *            Output stream.
+	 * @param methodId
+	 *            Method which should be selected.
+	 * @return true if methodId was found, false otherwise.
+	 */
+	static public boolean selectSocks5Authentication(InputStream in,
+			OutputStream out, int methodId) throws IOException {
+
+		final int num_methods = in.read();
+		if (num_methods <= 0) {
+			return false;
+		}
+		final byte method_ids[] = new byte[num_methods];
+		final byte response[] = new byte[2];
+		boolean found = false;
+
+		response[0] = (byte) 5; // SOCKS version
+		response[1] = (byte) 0xFF; // Not found, we are pessimistic
+
+		int bread = 0; // bytes read so far
+		while (bread < num_methods) {
+			bread += in.read(method_ids, bread, num_methods - bread);
+		}
+
+		for (int i = 0; i < num_methods; ++i) {
+			if (method_ids[i] == methodId) {
+				found = true;
+				response[1] = (byte) methodId;
+				break;
+			}
+		}
+
+		out.write(response);
+		return found;
+	}
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/server/ServerAuthenticatorNone.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/server/ServerAuthenticatorNone.java
new file mode 100644
index 0000000..0e97677
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/server/ServerAuthenticatorNone.java
@@ -0,0 +1,16 @@
+package com.runjva.sourceforge.jsocks.server;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * Simplest possible ServerAuthenticator implementation. Extends common base.
+ * 
+ */
+public class ServerAuthenticatorNone extends ServerAuthenticatorBase {
+
+	public ServerAuthenticatorNone(InputStream in, OutputStream out) {
+		super(in, out);
+	}
+
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/server/UserPasswordAuthenticator.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/server/UserPasswordAuthenticator.java
new file mode 100644
index 0000000..82980f2
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/server/UserPasswordAuthenticator.java
@@ -0,0 +1,82 @@
+package com.runjva.sourceforge.jsocks.server;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+
+/**
+ * This class implements SOCKS5 User/Password authentication scheme as defined
+ * in rfc1929,the server side of it. (see docs/rfc1929.txt)
+ */
+public class UserPasswordAuthenticator extends ServerAuthenticatorBase {
+
+	static final int METHOD_ID = 2;
+
+	UserValidation validator;
+
+	/**
+	 * Construct a new UserPasswordAuthentication object, with given
+	 * UserVlaidation scheme.
+	 * 
+	 * @param v
+	 *            UserValidation to use for validating users.
+	 */
+	public UserPasswordAuthenticator(UserValidation validator) {
+		this.validator = validator;
+	}
+
+	public ServerAuthenticator startSession(Socket s) throws IOException {
+		final InputStream in = s.getInputStream();
+		final OutputStream out = s.getOutputStream();
+
+		if (in.read() != 5) {
+			return null; // Drop non version 5 messages.
+		}
+
+		if (!selectSocks5Authentication(in, out, METHOD_ID)) {
+			return null;
+		}
+		if (!doUserPasswordAuthentication(s, in, out)) {
+			return null;
+		}
+
+		return new ServerAuthenticatorNone(in, out);
+	}
+
+	// Private Methods
+	// ////////////////
+
+	private boolean doUserPasswordAuthentication(Socket s, InputStream in,
+			OutputStream out) throws IOException {
+		final int version = in.read();
+		if (version != 1) {
+			return false;
+		}
+
+		final int ulen = in.read();
+		if (ulen < 0) {
+			return false;
+		}
+
+		final byte[] user = new byte[ulen];
+		in.read(user);
+		final int plen = in.read();
+		if (plen < 0) {
+			return false;
+		}
+		final byte[] password = new byte[plen];
+		in.read(password);
+
+		if (validator.isUserValid(new String(user), new String(password), s)) {
+			// System.out.println("user valid");
+			out.write(new byte[] { 1, 0 });
+		} else {
+			// System.out.println("user invalid");
+			out.write(new byte[] { 1, 1 });
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/server/UserValidation.java b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/server/UserValidation.java
new file mode 100644
index 0000000..c4f7770
--- /dev/null
+++ b/jsocksAndroid/src/main/java/com/runjva/sourceforge/jsocks/server/UserValidation.java
@@ -0,0 +1,24 @@
+package com.runjva.sourceforge.jsocks.server;
+
+/**
+ * Interface which provides for user validation, based on user name password and
+ * where it connects from.
+ */
+public interface UserValidation {
+	/**
+	 * Implementations of this interface are expected to use some or all of the
+	 * information provided plus any information they can extract from other
+	 * sources to decide wether given user should be allowed access to SOCKS
+	 * server, or whatever you use it for.
+	 * 
+	 * @return true to indicate user is valid, false otherwise.
+	 * @param username
+	 *            User whom implementation should validate.
+	 * @param password
+	 *            Password this user provided.
+	 * @param connection
+	 *            Socket which user used to connect to the server.
+	 */
+	boolean isUserValid(String username, String password,
+			java.net.Socket connection);
+}
diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
new file mode 100644
index 0000000..34ddd60
--- /dev/null
+++ b/orbotservice/build.gradle
@@ -0,0 +1,25 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 23
+    buildToolsVersion "23.0.3"
+
+    defaultConfig {
+        minSdkVersion 9
+        targetSdkVersion 23
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile 'com.android.support:appcompat-v7:23.+'
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    testCompile 'junit:junit:4.12'
+}
diff --git a/orbotservice/src/androidTest/java/org/torproject/android/service/ApplicationTest.java b/orbotservice/src/androidTest/java/org/torproject/android/service/ApplicationTest.java
new file mode 100644
index 0000000..70ee563
--- /dev/null
+++ b/orbotservice/src/androidTest/java/org/torproject/android/service/ApplicationTest.java
@@ -0,0 +1,13 @@
+package org.torproject.android.service;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}
\ No newline at end of file
diff --git a/orbotservice/src/main/AndroidManifest.xml b/orbotservice/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..4b550d9
--- /dev/null
+++ b/orbotservice/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.torproject.android.service">
+
+
+</manifest>
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/.cvsignore b/orbotservice/src/main/java/net/freehaven/tor/control/.cvsignore
new file mode 100644
index 0000000..6b468b6
--- /dev/null
+++ b/orbotservice/src/main/java/net/freehaven/tor/control/.cvsignore
@@ -0,0 +1 @@
+*.class
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/Bytes.java b/orbotservice/src/main/java/net/freehaven/tor/control/Bytes.java
new file mode 100644
index 0000000..e754d90
--- /dev/null
+++ b/orbotservice/src/main/java/net/freehaven/tor/control/Bytes.java
@@ -0,0 +1,114 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Static class to do bytewise structure manipulation in Java.
+ */
+/* XXXX There must be a better way to do most of this.
+ * XXXX The string logic here uses default encoding, which is stupid.
+ */
+final class Bytes {
+
+    /** Write the two-byte value in 's' into the byte array 'ba', starting at
+     * the index 'pos'. */
+    public static void setU16(byte[] ba, int pos, short s) {
+        ba[pos]   = (byte)((s >> 8) & 0xff);
+        ba[pos+1] = (byte)((s     ) & 0xff);
+    }
+
+    /** Write the four-byte value in 'i' into the byte array 'ba', starting at
+     * the index 'pos'. */
+    public static void setU32(byte[] ba, int pos, int i) {
+        ba[pos]   = (byte)((i >> 24) & 0xff);
+        ba[pos+1] = (byte)((i >> 16) & 0xff);
+        ba[pos+2] = (byte)((i >>  8) & 0xff);
+        ba[pos+3] = (byte)((i      ) & 0xff);
+    }
+
+    /** Return the four-byte value starting at index 'pos' within 'ba' */
+    public static int getU32(byte[] ba, int pos) {
+        return
+            ((ba[pos  ]&0xff)<<24) |
+            ((ba[pos+1]&0xff)<<16) |
+            ((ba[pos+2]&0xff)<< 8)  |
+            ((ba[pos+3]&0xff));
+    }
+
+    public static String getU32S(byte[] ba, int pos) {
+        return String.valueOf( (getU32(ba,pos))&0xffffffffL );
+    }
+
+    /** Return the two-byte value starting at index 'pos' within 'ba' */
+    public static int getU16(byte[] ba, int pos) {
+        return
+            ((ba[pos  ]&0xff)<<8) |
+            ((ba[pos+1]&0xff));
+    }
+
+    /** Return the string starting at position 'pos' of ba and extending
+     * until a zero byte or the end of the string. */
+    public static String getNulTerminatedStr(byte[] ba, int pos) {
+        int len, maxlen = ba.length-pos;
+        for (len=0; len<maxlen; ++len) {
+            if (ba[pos+len] == 0)
+                break;
+        }
+        return new String(ba, pos, len);
+    }
+
+    /**
+     * Read bytes from 'ba' starting at 'pos', dividing them into strings
+     * along the character in 'split' and writing them into 'lst'
+     */
+    public static void splitStr(List<String> lst, byte[] ba, int pos, byte split) {
+        while (pos < ba.length && ba[pos] != 0) {
+            int len;
+            for (len=0; pos+len < ba.length; ++len) {
+                if (ba[pos+len] == 0 || ba[pos+len] == split)
+                    break;
+            }
+            if (len>0)
+                lst.add(new String(ba, pos, len));
+            pos += len;
+            if (ba[pos] == split)
+                ++pos;
+        }
+    }
+
+    /**
+     * Read bytes from 'ba' starting at 'pos', dividing them into strings
+     * along the character in 'split' and writing them into 'lst'
+     */
+    public static List<String> splitStr(List<String> lst, String str) {
+        // split string on spaces, include trailing/leading
+        String[] tokenArray = str.split(" ", -1);
+        if (lst == null) {
+            lst = Arrays.asList( tokenArray );
+        } else {
+            lst.addAll( Arrays.asList( tokenArray ) );
+        }
+        return lst;
+    }
+
+    private static final char[] NYBBLES = {
+        '0', '1', '2', '3', '4', '5', '6', '7',
+        '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
+    };
+
+    public static final String hex(byte[] ba) {
+        StringBuffer buf = new StringBuffer();
+        for (int i = 0; i < ba.length; ++i) {
+            int b = (ba[i]) & 0xff;
+            buf.append(NYBBLES[b >> 4]);
+            buf.append(NYBBLES[b&0x0f]);
+        }
+        return buf.toString();
+    }
+
+    private Bytes() {};
+}
+
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/ConfigEntry.java b/orbotservice/src/main/java/net/freehaven/tor/control/ConfigEntry.java
new file mode 100644
index 0000000..31eb4b8
--- /dev/null
+++ b/orbotservice/src/main/java/net/freehaven/tor/control/ConfigEntry.java
@@ -0,0 +1,20 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control;
+
+/** A single key-value pair from Tor's configuration. */
+public class ConfigEntry {
+    public ConfigEntry(String k, String v) {
+        key = k;
+        value = v;
+        is_default = false;
+    }
+    public ConfigEntry(String k) {
+        key = k;
+        value = "";
+        is_default = true;
+    }
+    public final String key;
+    public final String value;
+    public final boolean is_default;
+}
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/EventHandler.java b/orbotservice/src/main/java/net/freehaven/tor/control/EventHandler.java
new file mode 100644
index 0000000..5a4e2b5
--- /dev/null
+++ b/orbotservice/src/main/java/net/freehaven/tor/control/EventHandler.java
@@ -0,0 +1,75 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control;
+
+/**
+ * Abstract interface whose methods are invoked when Tor sends us an event.
+ *
+ * @see TorControlConnection#setEventHandler
+ * @see TorControlConnection#setEvents
+ */
+public interface EventHandler {
+    /**
+     * Invoked when a circuit's status has changed.
+     * Possible values for <b>status</b> are:
+     * <ul>
+     *   <li>"LAUNCHED" :  circuit ID assigned to new circuit</li>
+     *   <li>"BUILT"    :  all hops finished, can now accept streams</li>
+     *   <li>"EXTENDED" :  one more hop has been completed</li>
+     *   <li>"FAILED"   :  circuit closed (was not built)</li>
+     *   <li>"CLOSED"   :  circuit closed (was built)</li>
+     *	</ul>
+     * 
+     * <b>circID</b> is the alphanumeric identifier of the affected circuit,
+     * and <b>path</b> is a comma-separated list of alphanumeric ServerIDs.
+     */
+    public void circuitStatus(String status, String circID, String path);
+    /**
+     * Invoked when a stream's status has changed.
+     * Possible values for <b>status</b> are:
+     * <ul>
+     *   <li>"NEW"         :  New request to connect</li>
+     *   <li>"NEWRESOLVE"  :  New request to resolve an address</li>
+     *   <li>"SENTCONNECT" :  Sent a connect cell along a circuit</li>
+     *   <li>"SENTRESOLVE" :  Sent a resolve cell along a circuit</li>
+     *   <li>"SUCCEEDED"   :  Received a reply; stream established</li>
+     *   <li>"FAILED"      :  Stream failed and not retriable.</li>
+     *   <li>"CLOSED"      :  Stream closed</li>
+     *   <li>"DETACHED"    :  Detached from circuit; still retriable.</li>
+     *	</ul>
+     *
+     * <b>streamID</b> is the alphanumeric identifier of the affected stream,
+     * and its <b>target</b> is specified as address:port.
+     */
+    public void streamStatus(String status, String streamID, String target);
+    /**
+     * Invoked when the status of a connection to an OR has changed.
+     * Possible values for <b>status</b> are ["LAUNCHED" | "CONNECTED" | "FAILED" | "CLOSED"].
+     * <b>orName</b> is the alphanumeric identifier of the OR affected.
+     */
+    public void orConnStatus(String status, String orName);
+    /**
+     * Invoked once per second. <b>read</b> and <b>written</b> are
+     * the number of bytes read and written, respectively, in
+     * the last second.
+     */
+    public void bandwidthUsed(long read, long written);
+    /**
+     * Invoked whenever Tor learns about new ORs.  The <b>orList</b> object
+     * contains the alphanumeric ServerIDs associated with the new ORs.
+     */
+    public void newDescriptors(java.util.List<String> orList);
+    /**
+     * Invoked when Tor logs a message.
+     * <b>severity</b> is one of ["DEBUG" | "INFO" | "NOTICE" | "WARN" | "ERR"],
+     * and <b>msg</b> is the message string.
+     */
+    public void message(String severity, String msg);
+    /**
+     * Invoked when an unspecified message is received.
+     * <type> is the message type, and <msg> is the message string.
+     */
+    public void unrecognized(String type, String msg);
+
+}
+
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/NullEventHandler.java b/orbotservice/src/main/java/net/freehaven/tor/control/NullEventHandler.java
new file mode 100644
index 0000000..a2390e6
--- /dev/null
+++ b/orbotservice/src/main/java/net/freehaven/tor/control/NullEventHandler.java
@@ -0,0 +1,18 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control;
+
+/**
+ * Implementation of EventHandler that ignores all events.  Useful
+ * when you only want to override one method.
+ */
+public class NullEventHandler implements EventHandler {
+    public void circuitStatus(String status, String circID, String path) {}
+    public void streamStatus(String status, String streamID, String target) {}
+    public void orConnStatus(String status, String orName) {}
+    public void bandwidthUsed(long read, long written) {}
+    public void newDescriptors(java.util.List<String> orList) {}
+    public void message(String severity, String msg) {}
+    public void unrecognized(String type, String msg) {}
+}
+
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/PasswordDigest.java b/orbotservice/src/main/java/net/freehaven/tor/control/PasswordDigest.java
new file mode 100644
index 0000000..03d0a98
--- /dev/null
+++ b/orbotservice/src/main/java/net/freehaven/tor/control/PasswordDigest.java
@@ -0,0 +1,98 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+
+/**
+ * A hashed digest of a secret password (used to set control connection
+ * security.)
+ *
+ * For the actual hashing algorithm, see RFC2440's secret-to-key conversion.
+ */
+public class PasswordDigest {
+
+    private final byte[] secret;
+    private final String hashedKey;
+
+    /** Return a new password digest with a random secret and salt. */
+    public static PasswordDigest generateDigest() {
+        byte[] secret = new byte[20];
+        SecureRandom rng = new SecureRandom();
+        rng.nextBytes(secret);
+        return new PasswordDigest(secret);
+    }
+
+    /** Construct a new password digest with a given secret and random salt */
+    public PasswordDigest(byte[] secret) {
+        this(secret, null);
+    }
+
+    /** Construct a new password digest with a given secret and random salt.
+     * Note that the 9th byte of the specifier determines the number of hash
+     * iterations as in RFC2440.
+     */
+    public PasswordDigest(byte[] secret, byte[] specifier) {
+        this.secret = secret.clone();
+        if (specifier == null) {
+            specifier = new byte[9];
+            SecureRandom rng = new SecureRandom();
+            rng.nextBytes(specifier);
+            specifier[8] = 96;
+        }
+        hashedKey = "16:"+encodeBytes(secretToKey(secret, specifier));
+    }
+
+    /** Return the secret used to generate this password hash.
+     */
+    public byte[] getSecret() {
+        return secret.clone();
+    }
+
+    /** Return the hashed password in the format used by Tor. */
+    public String getHashedPassword() {
+        return hashedKey;
+    }
+
+    /** Parameter used by RFC2440's s2k algorithm. */
+    private static final int EXPBIAS = 6;
+
+    /** Implement rfc2440 s2k */
+    public static byte[] secretToKey(byte[] secret, byte[] specifier) {
+        MessageDigest d;
+        try {
+            d = MessageDigest.getInstance("SHA-1");
+        } catch (NoSuchAlgorithmException ex) {
+            throw new RuntimeException("Can't run without sha-1.");
+        }
+        int c = (specifier[8])&0xff;
+        int count = (16 + (c&15)) << ((c>>4) + EXPBIAS);
+
+        byte[] tmp = new byte[8+secret.length];
+        System.arraycopy(specifier, 0, tmp, 0, 8);
+        System.arraycopy(secret, 0, tmp, 8, secret.length);
+        while (count > 0) {
+            if (count >= tmp.length) {
+                d.update(tmp);
+                count -= tmp.length;
+            } else {
+                d.update(tmp, 0, count);
+                count = 0;
+            }
+        }
+        byte[] key = new byte[20+9];
+        System.arraycopy(d.digest(), 0, key, 9, 20);
+        System.arraycopy(specifier, 0, key, 0, 9);
+        return key;
+    }
+
+    /** Return a hexadecimal encoding of a byte array. */
+    // XXX There must be a better way to do this in Java.
+    private static final String encodeBytes(byte[] ba) {
+        return Bytes.hex(ba);
+    }
+
+}
+
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/README b/orbotservice/src/main/java/net/freehaven/tor/control/README
new file mode 100644
index 0000000..b310c7d
--- /dev/null
+++ b/orbotservice/src/main/java/net/freehaven/tor/control/README
@@ -0,0 +1,4 @@
+We broke the version detection stuff in Tor 0.1.2.16 / 0.2.0.4-alpha.
+Somebody should rip out the v0 control protocol stuff from here, and
+it should start working again. -RD
+
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/TorControlCommands.java b/orbotservice/src/main/java/net/freehaven/tor/control/TorControlCommands.java
new file mode 100644
index 0000000..c98a1c4
--- /dev/null
+++ b/orbotservice/src/main/java/net/freehaven/tor/control/TorControlCommands.java
@@ -0,0 +1,148 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control;
+
+/** Interface defining constants used by the Tor controller protocol.
+ */
+// XXXX Take documentation for these from control-spec.txt
+public interface TorControlCommands {
+
+    public static final short CMD_ERROR = 0x0000;
+    public static final short CMD_DONE = 0x0001;
+    public static final short CMD_SETCONF = 0x0002;
+    public static final short CMD_GETCONF = 0x0003;
+    public static final short CMD_CONFVALUE = 0x0004;
+    public static final short CMD_SETEVENTS = 0x0005;
+    public static final short CMD_EVENT = 0x0006;
+    public static final short CMD_AUTH = 0x0007;
+    public static final short CMD_SAVECONF = 0x0008;
+    public static final short CMD_SIGNAL = 0x0009;
+    public static final short CMD_MAPADDRESS = 0x000A;
+    public static final short CMD_GETINFO = 0x000B;
+    public static final short CMD_INFOVALUE = 0x000C;
+    public static final short CMD_EXTENDCIRCUIT = 0x000D;
+    public static final short CMD_ATTACHSTREAM = 0x000E;
+    public static final short CMD_POSTDESCRIPTOR = 0x000F;
+    public static final short CMD_FRAGMENTHEADER = 0x0010;
+    public static final short CMD_FRAGMENT = 0x0011;
+    public static final short CMD_REDIRECTSTREAM = 0x0012;
+    public static final short CMD_CLOSESTREAM = 0x0013;
+    public static final short CMD_CLOSECIRCUIT = 0x0014;
+
+    public static final String[] CMD_NAMES = {
+        "ERROR",
+        "DONE",
+        "SETCONF",
+        "GETCONF",
+        "CONFVALUE",
+        "SETEVENTS",
+        "EVENT",
+        "AUTH",
+        "SAVECONF",
+        "SIGNAL",
+        "MAPADDRESS",
+        "GETINFO",
+        "INFOVALUE",
+        "EXTENDCIRCUIT",
+        "ATTACHSTREAM",
+        "POSTDESCRIPTOR",
+        "FRAGMENTHEADER",
+        "FRAGMENT",
+        "REDIRECTSTREAM",
+        "CLOSESTREAM",
+        "CLOSECIRCUIT",
+    };
+
+    public static final short EVENT_CIRCSTATUS = 0x0001;
+    public static final short EVENT_STREAMSTATUS = 0x0002;
+    public static final short EVENT_ORCONNSTATUS = 0x0003;
+    public static final short EVENT_BANDWIDTH = 0x0004;
+    public static final short EVENT_NEWDESCRIPTOR = 0x0006;
+    public static final short EVENT_MSG_DEBUG = 0x0007;
+    public static final short EVENT_MSG_INFO = 0x0008;
+    public static final short EVENT_MSG_NOTICE = 0x0009;
+    public static final short EVENT_MSG_WARN = 0x000A;
+    public static final short EVENT_MSG_ERROR = 0x000B;
+
+    public static final String[] EVENT_NAMES = {
+        "(0)",
+        "CIRC",
+        "STREAM",
+        "ORCONN",
+        "BW",
+        "OLDLOG",
+        "NEWDESC",
+        "DEBUG",
+        "INFO",
+        "NOTICE",
+        "WARN",
+        "ERR",
+    };
+
+    public static final byte CIRC_STATUS_LAUNCHED = 0x01;
+    public static final byte CIRC_STATUS_BUILT = 0x02;
+    public static final byte CIRC_STATUS_EXTENDED = 0x03;
+    public static final byte CIRC_STATUS_FAILED = 0x04;
+    public static final byte CIRC_STATUS_CLOSED = 0x05;
+
+    public static final String[] CIRC_STATUS_NAMES = {
+        "LAUNCHED",
+        "BUILT",
+        "EXTENDED",
+        "FAILED",
+        "CLOSED",
+    };
+
+    public static final byte STREAM_STATUS_SENT_CONNECT = 0x00;
+    public static final byte STREAM_STATUS_SENT_RESOLVE = 0x01;
+    public static final byte STREAM_STATUS_SUCCEEDED = 0x02;
+    public static final byte STREAM_STATUS_FAILED = 0x03;
+    public static final byte STREAM_STATUS_CLOSED = 0x04;
+    public static final byte STREAM_STATUS_NEW_CONNECT = 0x05;
+    public static final byte STREAM_STATUS_NEW_RESOLVE = 0x06;
+    public static final byte STREAM_STATUS_DETACHED = 0x07;
+
+    public static final String[] STREAM_STATUS_NAMES = {
+        "SENT_CONNECT",
+        "SENT_RESOLVE",
+        "SUCCEEDED",
+        "FAILED",
+        "CLOSED",
+        "NEW_CONNECT",
+        "NEW_RESOLVE",
+        "DETACHED"
+    };
+
+    public static final byte OR_CONN_STATUS_LAUNCHED = 0x00;
+    public static final byte OR_CONN_STATUS_CONNECTED = 0x01;
+    public static final byte OR_CONN_STATUS_FAILED = 0x02;
+    public static final byte OR_CONN_STATUS_CLOSED = 0x03;
+
+    public static final String[] OR_CONN_STATUS_NAMES = {
+        "LAUNCHED","CONNECTED","FAILED","CLOSED"
+    };
+
+    public static final byte SIGNAL_HUP = 0x01;
+    public static final byte SIGNAL_INT = 0x02;
+    public static final byte SIGNAL_USR1 = 0x0A;
+    public static final byte SIGNAL_USR2 = 0x0C;
+    public static final byte SIGNAL_TERM = 0x0F;
+
+    public static final String ERROR_MSGS[] = {
+        "Unspecified error",
+        "Internal error",
+        "Unrecognized message type",
+        "Syntax error",
+        "Unrecognized configuration key",
+        "Invalid configuration value",
+        "Unrecognized byte code",
+        "Unauthorized",
+        "Failed authentication attempt",
+        "Resource exhausted",
+        "No such stream",
+        "No such circuit",
+        "No such OR",
+    };
+
+}
+
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/TorControlConnection.java b/orbotservice/src/main/java/net/freehaven/tor/control/TorControlConnection.java
new file mode 100644
index 0000000..05ed8c3
--- /dev/null
+++ b/orbotservice/src/main/java/net/freehaven/tor/control/TorControlConnection.java
@@ -0,0 +1,732 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.Writer;
+import java.net.Socket;
+import java.net.SocketException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.concurrent.CancellationException;
+
+/** A connection to a running Tor process as specified in control-spec.txt. */
+public class TorControlConnection implements TorControlCommands {
+
+    private final LinkedList<Waiter> waiters;
+    private final BufferedReader input;
+    private final Writer output;
+
+    private ControlParseThread thread; // Locking: this
+
+    private volatile EventHandler handler;
+    private volatile PrintWriter debugOutput;
+    private volatile IOException parseThreadException;
+    
+    static class Waiter {
+    
+        List<ReplyLine> response; // Locking: this
+    
+        synchronized List<ReplyLine> getResponse() throws InterruptedException {
+                while (response == null) {
+                    wait();
+                }
+            return response;
+        }
+
+        synchronized void setResponse(List<ReplyLine> response) {
+            this.response = response;
+            notifyAll();
+        }
+    }
+
+    static class ReplyLine {
+
+        final String status;
+        final String msg;
+        final String rest;
+
+        ReplyLine(String status, String msg, String rest) {
+            this.status = status; this.msg = msg; this.rest = rest;
+        }
+    }
+    
+    /** Create a new TorControlConnection to communicate with Tor over
+     * a given socket.  After calling this constructor, it is typical to
+     * call launchThread and authenticate. */
+    public TorControlConnection(Socket connection) throws IOException {
+        this(connection.getInputStream(), connection.getOutputStream());
+    }
+
+    /** Create a new TorControlConnection to communicate with Tor over
+     * an arbitrary pair of data streams.
+     */
+    public TorControlConnection(InputStream i, OutputStream o) {
+        this(new InputStreamReader(i), new OutputStreamWriter(o));
+    }
+
+    public TorControlConnection(Reader i, Writer o) {
+        this.output = o;
+        if (i instanceof BufferedReader)
+            this.input = (BufferedReader) i;
+        else
+            this.input = new BufferedReader(i);
+        this.waiters = new LinkedList<Waiter>();
+    }
+
+    protected final void writeEscaped(String s) throws IOException {
+        StringTokenizer st = new StringTokenizer(s, "\n");
+        while (st.hasMoreTokens()) {
+            String line = st.nextToken();
+            if (line.startsWith("."))
+                line = "."+line;
+            if (line.endsWith("\r"))
+                line += "\n";
+            else
+                line += "\r\n";
+            if (debugOutput != null)
+                debugOutput.print(">> "+line);
+            output.write(line);
+        }
+        output.write(".\r\n");
+        if (debugOutput != null)
+            debugOutput.print(">> .\n");
+    }
+
+    protected static final String quote(String s) {
+        StringBuffer sb = new StringBuffer("\"");
+        for (int i = 0; i < s.length(); ++i) {
+            char c = s.charAt(i);
+            switch (c)
+                {
+                case '\r':
+                case '\n':
+                case '\\':
+                case '\"':
+                    sb.append('\\');
+                }
+            sb.append(c);
+        }
+        sb.append('\"');
+        return sb.toString();
+    }
+
+    protected final ArrayList<ReplyLine> readReply() throws IOException {
+        ArrayList<ReplyLine> reply = new ArrayList<ReplyLine>();
+        char c;
+        do {
+            String line = input.readLine();
+            if (line == null) {
+                // if line is null, the end of the stream has been reached, i.e.
+                // the connection to Tor has been closed!
+                if (reply.isEmpty()) {
+                        // nothing received so far, can exit cleanly
+                        return reply;
+                } 
+                // received half of a reply before the connection broke down
+                throw new TorControlSyntaxError("Connection to Tor " +
+                     " broke down while receiving reply!");
+            }
+            if (debugOutput != null)
+                debugOutput.println("<< "+line);
+            if (line.length() < 4)
+                throw new TorControlSyntaxError("Line (\""+line+"\") too short");
+            String status = line.substring(0,3);
+            c = line.charAt(3);
+            String msg = line.substring(4);
+            String rest = null;
+            if (c == '+') {
+                StringBuffer data = new StringBuffer();
+                while (true) {
+                    line = input.readLine();
+                    if (debugOutput != null)
+                        debugOutput.print("<< "+line);
+                    if (line.equals("."))
+                        break;
+                    else if (line.startsWith("."))
+                        line = line.substring(1);
+                    data.append(line).append('\n');
+                }
+                rest = data.toString();
+            }
+            reply.add(new ReplyLine(status, msg, rest));
+        } while (c != ' ');
+
+        return reply;
+    }
+
+    protected synchronized List<ReplyLine> sendAndWaitForResponse(String s,
+        String rest) throws IOException {
+        if(parseThreadException != null) throw parseThreadException;
+        checkThread();
+        Waiter w = new Waiter();
+        if (debugOutput != null)
+            debugOutput.print(">> "+s);
+        synchronized (waiters) {
+            output.write(s);
+            if (rest != null)
+                writeEscaped(rest);
+            output.flush();
+            waiters.addLast(w);
+        }
+        List<ReplyLine> lst;
+        try {
+            lst = w.getResponse();
+        } catch (InterruptedException ex) {
+            throw new IOException("Interrupted");
+        }
+        for (Iterator<ReplyLine> i = lst.iterator(); i.hasNext(); ) {
+            ReplyLine c = i.next();
+            if (! c.status.startsWith("2"))
+                throw new TorControlError("Error reply: "+c.msg);
+        }
+        return lst;
+    }
+
+    /** Helper: decode a CMD_EVENT command and dispatch it to our
+     * EventHandler (if any). */
+    protected void handleEvent(ArrayList<ReplyLine> events) {
+        if (handler == null)
+            return;
+
+        for (Iterator<ReplyLine> i = events.iterator(); i.hasNext(); ) {
+            ReplyLine line = i.next();
+            int idx = line.msg.indexOf(' ');
+            String tp = line.msg.substring(0, idx).toUpperCase();
+            String rest = line.msg.substring(idx+1);
+            if (tp.equals("CIRC")) {
+                List<String> lst = Bytes.splitStr(null, rest);
+                handler.circuitStatus(lst.get(1),
+                                      lst.get(0),
+                                      lst.get(1).equals("LAUNCHED")
+                                          || lst.size() < 3 ? ""
+                                          : lst.get(2));
+            } else if (tp.equals("STREAM")) {
+                List<String> lst = Bytes.splitStr(null, rest);
+                handler.streamStatus(lst.get(1),
+                                     lst.get(0),
+                                     lst.get(3));
+                // XXXX circID.
+            } else if (tp.equals("ORCONN")) {
+                List<String> lst = Bytes.splitStr(null, rest);
+                handler.orConnStatus(lst.get(1), lst.get(0));
+            } else if (tp.equals("BW")) {
+                List<String> lst = Bytes.splitStr(null, rest);
+                handler.bandwidthUsed(Integer.parseInt(lst.get(0)),
+                                      Integer.parseInt(lst.get(1)));
+            } else if (tp.equals("NEWDESC")) {
+                List<String> lst = Bytes.splitStr(null, rest);
+                handler.newDescriptors(lst);
+            } else if (tp.equals("DEBUG") ||
+                       tp.equals("INFO") ||
+                       tp.equals("NOTICE") ||
+                       tp.equals("WARN") ||
+                       tp.equals("ERR")) {
+                handler.message(tp, rest);
+            } else {
+                handler.unrecognized(tp, rest);
+            }
+        }
+    }
+
+
+    /** Sets <b>w</b> as the PrintWriter for debugging output, 
+    * which writes out all messages passed between Tor and the controller.  
+    * Outgoing messages are preceded by "\>\>" and incoming messages are preceded
+    * by "\<\<"
+    */
+    public void setDebugging(PrintWriter w) {
+        debugOutput = w;
+    }
+    
+    /** Sets <b>s</b> as the PrintStream for debugging output, 
+    * which writes out all messages passed between Tor and the controller.  
+    * Outgoing messages are preceded by "\>\>" and incoming messages are preceded
+    * by "\<\<"
+    */
+    public void setDebugging(PrintStream s) {
+        debugOutput = new PrintWriter(s, true);
+    }
+
+    /** Set the EventHandler object that will be notified of any
+     * events Tor delivers to this connection.  To make Tor send us
+     * events, call setEvents(). */
+    public void setEventHandler(EventHandler handler) {
+        this.handler = handler;
+    }
+
+    /**
+     * Start a thread to react to Tor's responses in the background.
+     * This is necessary to handle asynchronous events and synchronous
+     * responses that arrive independantly over the same socket.
+     */
+    public synchronized Thread launchThread(boolean daemon) {
+    	ControlParseThread th = new ControlParseThread();
+        if (daemon)
+            th.setDaemon(true);
+        th.start();
+        this.thread = th;
+        return th;
+    }
+
+    protected class ControlParseThread extends Thread {
+
+        @Override
+    	public void run() {
+            try {
+                react();
+            } catch (IOException ex) {
+                parseThreadException = ex;
+            }
+        }
+    }
+
+    protected synchronized void checkThread() {
+        if (thread == null)
+            launchThread(true);
+    }
+
+    /** helper: implement the main background loop. */
+    protected void react() throws IOException {
+        while (true) {
+            ArrayList<ReplyLine> lst = readReply();
+            if (lst.isEmpty()) {
+                // connection has been closed remotely! end the loop!
+                return;
+            }
+            if ((lst.get(0)).status.startsWith("6"))
+                handleEvent(lst);
+            else {
+                synchronized (waiters) {
+ 		if (!waiters.isEmpty())
+		{
+                    Waiter w;
+                    w = waiters.removeFirst();
+                    w.setResponse(lst);
+		}
+                }		
+
+            }
+        }
+    }
+
+    /** Change the value of the configuration option 'key' to 'val'.
+     */
+    public void setConf(String key, String value) throws IOException {
+        List<String> lst = new ArrayList<String>();
+        lst.add(key+" "+value);
+        setConf(lst);
+    }
+
+    /** Change the values of the configuration options stored in kvMap. */
+    public void setConf(Map<String, String> kvMap) throws IOException {
+        List<String> lst = new ArrayList<String>();
+        for (Iterator<Map.Entry<String,String>> it = kvMap.entrySet().iterator(); it.hasNext(); ) {
+            Map.Entry<String,String> ent = it.next();
+            lst.add(ent.getKey()+" "+ent.getValue()+"\n");
+        }
+        setConf(lst);
+    }
+
+    /** Changes the values of the configuration options stored in
+     * <b>kvList</b>.  Each list element in <b>kvList</b> is expected to be
+     * String of the format "key value".
+     *
+     * Tor behaves as though it had just read each of the key-value pairs
+     * from its configuration file.  Keywords with no corresponding values have
+     * their configuration values reset to their defaults.  setConf is
+     * all-or-nothing: if there is an error in any of the configuration settings,
+     * Tor sets none of them.
+     *
+     * When a configuration option takes multiple values, or when multiple
+     * configuration keys form a context-sensitive group (see getConf below), then
+     * setting any of the options in a setConf command is taken to reset all of
+     * the others.  For example, if two ORBindAddress values are configured, and a
+     * command arrives containing a single ORBindAddress value, the new
+     * command's value replaces the two old values.
+     * 
+     * To remove all settings for a given option entirely (and go back to its
+     * default value), include a String in <b>kvList</b> containing the key and no value.
+     */
+    public void setConf(Collection<String> kvList) throws IOException {
+        if (kvList.size() == 0)
+            return;
+        StringBuffer b = new StringBuffer("SETCONF");
+        for (Iterator<String> it = kvList.iterator(); it.hasNext(); ) {
+            String kv = it.next();
+            int i = kv.indexOf(' ');
+            if (i == -1)
+                b.append(" ").append(kv);
+            b.append(" ").append(kv.substring(0,i)).append("=")
+                .append(quote(kv.substring(i+1)));
+        }
+        b.append("\r\n");
+        sendAndWaitForResponse(b.toString(), null);
+    }
+    
+    /** Try to reset the values listed in the collection 'keys' to their
+     * default values.
+     **/
+    public void resetConf(Collection<String> keys) throws IOException {
+        if (keys.size() == 0)
+            return;
+        StringBuffer b = new StringBuffer("RESETCONF");
+        for (Iterator<String> it = keys.iterator(); it.hasNext(); ) {
+            String key = it.next();
+            b.append(" ").append(key);
+        }
+        b.append("\r\n");
+        sendAndWaitForResponse(b.toString(), null);
+    }
+
+    /** Return the value of the configuration option 'key' */
+    public List<ConfigEntry> getConf(String key) throws IOException {
+        List<String> lst = new ArrayList<String>();
+        lst.add(key);
+        return getConf(lst);
+    }
+
+    /** Requests the values of the configuration variables listed in <b>keys</b>.
+     * Results are returned as a list of ConfigEntry objects.
+     * 
+     * If an option appears multiple times in the configuration, all of its
+     * key-value pairs are returned in order.
+     *
+     * Some options are context-sensitive, and depend on other options with
+     * different keywords.  These cannot be fetched directly.  Currently there
+     * is only one such option: clients should use the "HiddenServiceOptions"
+     * virtual keyword to get all HiddenServiceDir, HiddenServicePort,
+     * HiddenServiceNodes, and HiddenServiceExcludeNodes option settings.
+     */
+    public List<ConfigEntry> getConf(Collection<String> keys) throws IOException {
+        StringBuffer sb = new StringBuffer("GETCONF");
+        for (Iterator<String> it = keys.iterator(); it.hasNext(); ) {
+            String key = it.next();
+            sb.append(" ").append(key);
+        }
+        sb.append("\r\n");
+        List<ReplyLine> lst = sendAndWaitForResponse(sb.toString(), null);
+        List<ConfigEntry> result = new ArrayList<ConfigEntry>();
+        for (Iterator<ReplyLine> it = lst.iterator(); it.hasNext(); ) {
+            String kv = (it.next()).msg;
+            int idx = kv.indexOf('=');
+            if (idx >= 0)
+                result.add(new ConfigEntry(kv.substring(0, idx),
+                                           kv.substring(idx+1)));
+            else
+                result.add(new ConfigEntry(kv));
+        }
+        return result;
+    }
+
+    /** Request that the server inform the client about interesting events.
+     * Each element of <b>events</b> is one of the following Strings: 
+     * ["CIRC" | "STREAM" | "ORCONN" | "BW" | "DEBUG" |
+     *  "INFO" | "NOTICE" | "WARN" | "ERR" | "NEWDESC" | "ADDRMAP"] .
+     * 
+     * Any events not listed in the <b>events</b> are turned off; thus, calling
+     * setEvents with an empty <b>events</b> argument turns off all event reporting.
+     */
+    public void setEvents(List<String> events) throws IOException {
+        StringBuffer sb = new StringBuffer("SETEVENTS");
+        for (Iterator<String> it = events.iterator(); it.hasNext(); ) {
+            sb.append(" ").append(it.next());
+        }
+        sb.append("\r\n");
+        sendAndWaitForResponse(sb.toString(), null);
+    }
+
+    /** Authenticates the controller to the Tor server.
+     *
+     * By default, the current Tor implementation trusts all local users, and 
+     * the controller can authenticate itself by calling authenticate(new byte[0]).
+     *
+     * If the 'CookieAuthentication' option is true, Tor writes a "magic cookie"
+     * file named "control_auth_cookie" into its data directory.  To authenticate,
+     * the controller must send the contents of this file in <b>auth</b>.
+     * 
+     * If the 'HashedControlPassword' option is set, <b>auth</b> must contain the salted
+     * hash of a secret password.  The salted hash is computed according to the
+     * S2K algorithm in RFC 2440 (OpenPGP), and prefixed with the s2k specifier.
+     * This is then encoded in hexadecimal, prefixed by the indicator sequence
+     * "16:".
+     *
+     * You can generate the salt of a password by calling
+     *       'tor --hash-password <password>'
+     * or by using the provided PasswordDigest class.
+     * To authenticate under this scheme, the controller sends Tor the original
+     * secret that was used to generate the password.
+     */
+    public void authenticate(byte[] auth) throws IOException {
+        String cmd = "AUTHENTICATE " + Bytes.hex(auth) + "\r\n";
+        sendAndWaitForResponse(cmd, null);
+    }
+
+    /** Instructs the server to write out its configuration options into its torrc.
+     */
+    public void saveConf() throws IOException {
+        sendAndWaitForResponse("SAVECONF\r\n", null);
+    }
+
+    /** Sends a signal from the controller to the Tor server.
+     * <b>signal</b> is one of the following Strings:
+     * <ul>
+     * <li>"RELOAD" or "HUP" :  Reload config items, refetch directory</li>
+     * <li>"SHUTDOWN" or "INT" : Controlled shutdown: if server is an OP, exit immediately.
+     *     If it's an OR, close listeners and exit after 30 seconds</li>
+     * <li>"DUMP" or "USR1" : Dump stats: log information about open connections and circuits</li>
+     * <li>"DEBUG" or "USR2" : Debug: switch all open logs to loglevel debug</li>
+     * <li>"HALT" or "TERM" : Immediate shutdown: clean up and exit now</li>
+     * </ul>
+     */
+    public void signal(String signal) throws IOException {
+        String cmd = "SIGNAL " + signal + "\r\n";
+        sendAndWaitForResponse(cmd, null);
+    }
+
+    /** Send a signal to the Tor process to shut it down or halt it.
+     * Does not wait for a response. */
+    public void shutdownTor(String signal) throws IOException {
+        String s = "SIGNAL " + signal + "\r\n";
+        Waiter w = new Waiter();
+        if (debugOutput != null)
+            debugOutput.print(">> "+s);
+        synchronized (waiters) {
+            output.write(s);
+            output.flush();
+        }
+    }
+
+    /** Tells the Tor server that future SOCKS requests for connections to a set of original
+     * addresses should be replaced with connections to the specified replacement
+     * addresses.  Each element of <b>kvLines</b> is a String of the form
+     * "old-address new-address".  This function returns the new address mapping.
+     *
+     * The client may decline to provide a body for the original address, and
+     * instead send a special null address ("0.0.0.0" for IPv4, "::0" for IPv6, or
+     * "." for hostname), signifying that the server should choose the original
+     * address itself, and return that address in the reply.  The server
+     * should ensure that it returns an element of address space that is unlikely
+     * to be in actual use.  If there is already an address mapped to the
+     * destination address, the server may reuse that mapping.
+     * 
+     * If the original address is already mapped to a different address, the old
+     * mapping is removed.  If the original address and the destination address
+     * are the same, the server removes any mapping in place for the original
+     * address.
+     *
+     * Mappings set by the controller last until the Tor process exits:
+     * they never expire. If the controller wants the mapping to last only
+     * a certain time, then it must explicitly un-map the address when that
+     * time has elapsed.
+     */
+    public Map<String,String> mapAddresses(Collection<String> kvLines) throws IOException {
+        StringBuffer sb = new StringBuffer("MAPADDRESS");
+        for (Iterator<String> it = kvLines.iterator(); it.hasNext(); ) {
+            String kv = it.next();
+            int i = kv.indexOf(' ');
+            sb.append(" ").append(kv.substring(0,i)).append("=")
+                .append(quote(kv.substring(i+1)));
+        }
+        sb.append("\r\n");
+        List<ReplyLine> lst = sendAndWaitForResponse(sb.toString(), null);
+        Map<String,String> result = new HashMap<String,String>();
+        for (Iterator<ReplyLine> it = lst.iterator(); it.hasNext(); ) {
+            String kv = (it.next()).msg;
+            int idx = kv.indexOf('=');
+            result.put(kv.substring(0, idx),
+                       kv.substring(idx+1));
+        }
+        return result;
+    }
+
+    public Map<String,String> mapAddresses(Map<String,String> addresses) throws IOException {
+        List<String> kvList = new ArrayList<String>();
+        for (Iterator<Map.Entry<String, String>> it = addresses.entrySet().iterator(); it.hasNext(); ) {
+            Map.Entry<String,String> e = it.next();
+            kvList.add(e.getKey()+" "+e.getValue());
+        }
+        return mapAddresses(kvList);
+    }
+
+    public String mapAddress(String fromAddr, String toAddr) throws IOException {
+        List<String> lst = new ArrayList<String>();
+        lst.add(fromAddr+" "+toAddr+"\n");
+        Map<String,String> m = mapAddresses(lst);
+        return m.get(fromAddr);
+    }
+
+    /** Queries the Tor server for keyed values that are not stored in the torrc
+     * configuration file.  Returns a map of keys to values.
+     *
+     * Recognized keys include:
+     * <ul>
+     * <li>"version" : The version of the server's software, including the name
+     *  of the software. (example: "Tor 0.0.9.4")</li>
+     * <li>"desc/id/<OR identity>" or "desc/name/<OR nickname>" : the latest server
+     * descriptor for a given OR, NUL-terminated.  If no such OR is known, the
+     * corresponding value is an empty string.</li>
+     * <li>"network-status" : a space-separated list of all known OR identities.
+     * This is in the same format as the router-status line in directories;
+     * see tor-spec.txt for details.</li>
+     * <li>"addr-mappings/all"</li>
+     * <li>"addr-mappings/config"</li>
+     * <li>"addr-mappings/cache"</li>
+     * <li>"addr-mappings/control" : a space-separated list of address mappings, each
+     * in the form of "from-address=to-address".  The 'config' key
+     * returns those address mappings set in the configuration; the 'cache'
+     * key returns the mappings in the client-side DNS cache; the 'control'
+     * key returns the mappings set via the control interface; the 'all'
+     * target returns the mappings set through any mechanism.</li>
+     * <li>"circuit-status" : A series of lines as for a circuit status event. Each line is of the form:
+     * "CircuitID CircStatus Path"</li>
+     * <li>"stream-status" : A series of lines as for a stream status event.  Each is of the form:
+     * "StreamID StreamStatus CircID Target"</li>
+     * <li>"orconn-status" : A series of lines as for an OR connection status event.  Each is of the
+     * form: "ServerID ORStatus"</li>
+     * </ul>
+     */
+    public Map<String,String> getInfo(Collection<String> keys) throws IOException {
+        StringBuffer sb = new StringBuffer("GETINFO");
+        for (Iterator<String> it = keys.iterator(); it.hasNext(); ) {
+            sb.append(" ").append(it.next());
+        }
+        sb.append("\r\n");
+        List<ReplyLine> lst = sendAndWaitForResponse(sb.toString(), null);
+        Map<String,String> m = new HashMap<String,String>();
+        for (Iterator<ReplyLine> it = lst.iterator(); it.hasNext(); ) {
+            ReplyLine line = it.next();
+            int idx = line.msg.indexOf('=');
+            if (idx<0)
+                break;
+            String k = line.msg.substring(0,idx);
+            String v;
+            if (line.rest != null) {
+                v = line.rest;
+            } else {
+                v = line.msg.substring(idx+1);
+            }
+            m.put(k, v);
+        }
+        return m;
+    }
+    
+    
+    
+    /** Return the value of the information field 'key' */
+    public String getInfo(String key) throws IOException {
+        List<String> lst = new ArrayList<String>();
+        lst.add(key);
+        Map<String,String> m = getInfo(lst);
+        return  m.get(key);
+    }
+
+    /** An extendCircuit request takes one of two forms: either the <b>circID</b> is zero, in
+     * which case it is a request for the server to build a new circuit according
+     * to the specified path, or the <b>circID</b> is nonzero, in which case it is a
+     * request for the server to extend an existing circuit with that ID according
+     * to the specified <b>path</b>.
+     *
+     * If successful, returns the Circuit ID of the (maybe newly created) circuit.
+     */
+    public String extendCircuit(String circID, String path) throws IOException {
+        List<ReplyLine> lst = sendAndWaitForResponse(
+                          "EXTENDCIRCUIT "+circID+" "+path+"\r\n", null);
+        return (lst.get(0)).msg;
+    }
+    
+    /** Informs the Tor server that the stream specified by <b>streamID</b> should be
+     * associated with the circuit specified by <b>circID</b>.  
+     * 
+     * Each stream may be associated with
+     * at most one circuit, and multiple streams may share the same circuit.
+     * Streams can only be attached to completed circuits (that is, circuits that
+     * have sent a circuit status "BUILT" event or are listed as built in a
+     * getInfo circuit-status request).
+     * 
+     * If <b>circID</b> is 0, responsibility for attaching the given stream is
+     * returned to Tor.
+     * 
+     * By default, Tor automatically attaches streams to
+     * circuits itself, unless the configuration variable
+     * "__LeaveStreamsUnattached" is set to "1".  Attempting to attach streams
+     * via TC when "__LeaveStreamsUnattached" is false may cause a race between
+     * Tor and the controller, as both attempt to attach streams to circuits.
+     */
+    public void attachStream(String streamID, String circID)
+        throws IOException {
+        sendAndWaitForResponse("ATTACHSTREAM "+streamID+" "+circID+"\r\n", null);
+    }
+
+    /** Tells Tor about the server descriptor in <b>desc</b>.
+     * 
+     * The descriptor, when parsed, must contain a number of well-specified
+     * fields, including fields for its nickname and identity.
+     */
+    // More documentation here on format of desc?
+    // No need for return value?  control-spec.txt says reply is merely "250 OK" on success...
+    public String postDescriptor(String desc) throws IOException {
+        List<ReplyLine> lst = sendAndWaitForResponse("+POSTDESCRIPTOR\r\n", desc);
+        return (lst.get(0)).msg;
+    }
+
+    /** Tells Tor to change the exit address of the stream identified by <b>streamID</b>
+     * to <b>address</b>. No remapping is performed on the new provided address.
+     * 
+     * To be sure that the modified address will be used, this event must be sent
+     * after a new stream event is received, and before attaching this stream to
+     * a circuit.
+     */
+    public void redirectStream(String streamID, String address) throws IOException {
+        sendAndWaitForResponse("REDIRECTSTREAM "+streamID+" "+address+"\r\n",
+                               null);
+    }
+
+    /** Tells Tor to close the stream identified by <b>streamID</b>.
+     * <b>reason</b> should be one of the Tor RELAY_END reasons given in tor-spec.txt, as a decimal:
+     * <ul>
+     * <li>1 -- REASON_MISC           (catch-all for unlisted reasons)</li>
+     * <li>2 -- REASON_RESOLVEFAILED  (couldn't look up hostname)</li>
+     * <li>3 -- REASON_CONNECTREFUSED (remote host refused connection)</li>
+     * <li>4 -- REASON_EXITPOLICY     (OR refuses to connect to host or port)</li>
+     * <li>5 -- REASON_DESTROY        (Circuit is being destroyed)</li>
+     * <li>6 -- REASON_DONE           (Anonymized TCP connection was closed)</li>
+     * <li>7 -- REASON_TIMEOUT        (Connection timed out, or OR timed out while connecting)</li>
+     * <li>8 -- (unallocated)</li>
+     * <li>9 -- REASON_HIBERNATING    (OR is temporarily hibernating)</li>
+     * <li>10 -- REASON_INTERNAL       (Internal error at the OR)</li>
+     * <li>11 -- REASON_RESOURCELIMIT  (OR has no resources to fulfill request)</li>
+     * <li>12 -- REASON_CONNRESET      (Connection was unexpectedly reset)</li>
+     * <li>13 -- REASON_TORPROTOCOL    (Sent when closing connection because of Tor protocol violations)</li>
+     * </ul>
+     *
+     * Tor may hold the stream open for a while to flush any data that is pending.
+     */
+    public void closeStream(String streamID, byte reason)
+        throws IOException {
+        sendAndWaitForResponse("CLOSESTREAM "+streamID+" "+reason+"\r\n",null);
+    }
+
+    /** Tells Tor to close the circuit identified by <b>circID</b>.
+     * If <b>ifUnused</b> is true, do not close the circuit unless it is unused.
+     */
+    public void closeCircuit(String circID, boolean ifUnused) throws IOException {
+        sendAndWaitForResponse("CLOSECIRCUIT "+circID+
+                               (ifUnused?" IFUNUSED":"")+"\r\n", null);
+    }
+}
+
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/TorControlError.java b/orbotservice/src/main/java/net/freehaven/tor/control/TorControlError.java
new file mode 100644
index 0000000..d07ee51
--- /dev/null
+++ b/orbotservice/src/main/java/net/freehaven/tor/control/TorControlError.java
@@ -0,0 +1,39 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control;
+
+import java.io.IOException;
+
+/**
+ * An exception raised when Tor tells us about an error.
+ */
+public class TorControlError extends IOException {
+
+    static final long serialVersionUID = 3;
+
+    private final int errorType;
+
+    public TorControlError(int type, String s) {
+        super(s);
+        errorType = type;
+    }
+
+    public TorControlError(String s) {
+        this(-1, s);
+    }
+
+    public int getErrorType() {
+        return errorType;
+    }
+
+    public String getErrorMsg() {
+        try {
+            if (errorType == -1)
+                return null;
+            return TorControlCommands.ERROR_MSGS[errorType];
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            return "Unrecongized error #"+errorType;
+        }
+    }
+}
+
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/TorControlSyntaxError.java b/orbotservice/src/main/java/net/freehaven/tor/control/TorControlSyntaxError.java
new file mode 100644
index 0000000..dba4f44
--- /dev/null
+++ b/orbotservice/src/main/java/net/freehaven/tor/control/TorControlSyntaxError.java
@@ -0,0 +1,16 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control;
+
+import java.io.IOException;
+
+/**
+ * An exception raised when Tor behaves in an unexpected way.
+ */
+public class TorControlSyntaxError extends IOException {
+
+    static final long serialVersionUID = 3;
+
+    public TorControlSyntaxError(String s) { super(s); }
+}
+
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/examples/.cvsignore b/orbotservice/src/main/java/net/freehaven/tor/control/examples/.cvsignore
new file mode 100644
index 0000000..6b468b6
--- /dev/null
+++ b/orbotservice/src/main/java/net/freehaven/tor/control/examples/.cvsignore
@@ -0,0 +1 @@
+*.class
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/examples/DebuggingEventHandler.java b/orbotservice/src/main/java/net/freehaven/tor/control/examples/DebuggingEventHandler.java
new file mode 100644
index 0000000..48c49a2
--- /dev/null
+++ b/orbotservice/src/main/java/net/freehaven/tor/control/examples/DebuggingEventHandler.java
@@ -0,0 +1,44 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control.examples;
+
+import java.io.PrintWriter;
+import java.util.Iterator;
+import org.torproject.android.control.EventHandler;
+
+public class DebuggingEventHandler implements EventHandler {
+
+    private final PrintWriter out;
+
+    public DebuggingEventHandler(PrintWriter p) {
+        out = p;
+    }
+
+    public void circuitStatus(String status, String circID, String path) {
+        out.println("Circuit "+circID+" is now "+status+" (path="+path+")");
+    }
+    public void streamStatus(String status, String streamID, String target) {
+        out.println("Stream "+streamID+" is now "+status+" (target="+target+")");
+    }
+    public void orConnStatus(String status, String orName) {
+        out.println("OR connection to "+orName+" is now "+status);
+    }
+    public void bandwidthUsed(long read, long written) {
+        out.println("Bandwidth usage: "+read+" bytes read; "+
+                    written+" bytes written.");
+    }
+    public void newDescriptors(java.util.List<String> orList) {
+        out.println("New descriptors for routers:");
+        for (Iterator<String> i = orList.iterator(); i.hasNext(); )
+            out.println("   "+i.next());
+    }
+    public void message(String type, String msg) {
+        out.println("["+type+"] "+msg.trim());
+    }
+
+    public void unrecognized(String type, String msg) {
+        out.println("unrecognized event ["+type+"] "+msg.trim());
+    }
+
+}
+
diff --git a/orbotservice/src/main/java/net/freehaven/tor/control/examples/Main.java b/orbotservice/src/main/java/net/freehaven/tor/control/examples/Main.java
new file mode 100644
index 0000000..b0e0a3c
--- /dev/null
+++ b/orbotservice/src/main/java/net/freehaven/tor/control/examples/Main.java
@@ -0,0 +1,146 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control.examples;
+
+import org.torproject.android.control.*;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.Socket;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Iterator;
+
+public class Main implements TorControlCommands {
+
+    public static void main(String args[]) {
+        if (args.length < 1) {
+            System.err.println("No command given.");
+            return;
+        }
+        try {
+            if (args[0].equals("set-config")) {
+                setConfig(args);
+            } else if (args[0].equals("get-config")) {
+                getConfig(args);
+            } else if (args[0].equals("get-info")) {
+                getInfo(args);
+            } else if (args[0].equals("listen")) {
+                listenForEvents(args);
+            } else if (args[0].equals("signal")) {
+                signal(args);
+            } else if (args[0].equals("auth")) {
+                authDemo(args);
+            } else {
+                System.err.println("Unrecognized command: "+args[0]);
+            }
+        } catch (EOFException ex) {
+            System.out.println("Control socket closed by Tor.");
+        } catch (TorControlError ex) {
+            System.err.println("Error from Tor process: "+
+                               ex+" ["+ex.getErrorMsg()+"]");
+        } catch (IOException ex) {
+            System.err.println("IO exception when talking to Tor process: "+
+                               ex);
+            ex.printStackTrace(System.err);
+        }
+    }
+
+    private static TorControlConnection getConnection(String[] args,
+        boolean daemon) throws IOException {
+        Socket s = new Socket("127.0.0.1", 9100);
+        TorControlConnection conn = new TorControlConnection(s);
+        conn.launchThread(daemon);
+        conn.authenticate(new byte[0]);
+        return conn;
+    }
+
+    private static TorControlConnection getConnection(String[] args)
+        throws IOException {
+        return getConnection(args, true);
+    }
+
+    public static void setConfig(String[] args) throws IOException {
+        // Usage: "set-config [-save] key value key value key value"
+        TorControlConnection conn = getConnection(args);
+        ArrayList<String> lst = new ArrayList<String>();
+        int i = 1;
+        boolean save = false;
+        if (args[i].equals("-save")) {
+            save = true;
+            ++i;
+        }
+        for (; i < args.length; i +=2) {
+            lst.add(args[i]+" "+args[i+1]);
+        }
+        conn.setConf(lst);
+        if (save) {
+            conn.saveConf();
+        }
+    }
+
+    public static void getConfig(String[] args) throws IOException {
+        // Usage: get-config key key key
+        TorControlConnection conn = getConnection(args);
+        List<ConfigEntry> lst = conn.getConf(Arrays.asList(args).subList(1,args.length));
+        for (Iterator<ConfigEntry> i = lst.iterator(); i.hasNext(); ) {
+            ConfigEntry e = i.next();
+            System.out.println("KEY: "+e.key);
+            System.out.println("VAL: "+e.value);
+        }
+    }
+
+    public static void getInfo(String[] args) throws IOException {
+        TorControlConnection conn = getConnection(args);
+        Map<String,String> m = conn.getInfo(Arrays.asList(args).subList(1,args.length));
+        for (Iterator<Map.Entry<String, String>> i = m.entrySet().iterator(); i.hasNext(); ) {
+            Map.Entry<String,String> e = i.next();
+            System.out.println("KEY: "+e.getKey());
+            System.out.println("VAL: "+e.getValue());
+        }
+    }
+
+    public static void listenForEvents(String[] args) throws IOException {
+        // Usage: listen [circ|stream|orconn|bw|newdesc|info|notice|warn|error]*
+        TorControlConnection conn = getConnection(args, false);
+        ArrayList<String> lst = new ArrayList<String>();
+        for (int i = 1; i < args.length; ++i) {
+            lst.add(args[i]);
+        }
+        conn.setEventHandler(
+            new DebuggingEventHandler(new PrintWriter(System.out, true)));
+        conn.setEvents(lst);
+    }
+
+    public static void signal(String[] args) throws IOException {
+        // Usage signal [reload|shutdown|dump|debug|halt]
+        TorControlConnection conn = getConnection(args, false);
+        // distinguish shutdown signal from other signals
+        if ("SHUTDOWN".equalsIgnoreCase(args[1])
+        		|| "HALT".equalsIgnoreCase(args[1])) {
+        	conn.shutdownTor(args[1].toUpperCase());
+        } else {
+        	conn.signal(args[1].toUpperCase());
+        }
+    }
+
+    public static void authDemo(String[] args) throws IOException {
+
+        PasswordDigest pwd = PasswordDigest.generateDigest();
+        Socket s = new Socket("127.0.0.1", 9100);
+        TorControlConnection conn = new TorControlConnection(s);
+        conn.launchThread(true);
+        conn.authenticate(new byte[0]);
+
+        conn.setConf("HashedControlPassword", pwd.getHashedPassword());
+
+        s = new Socket("127.0.0.1", 9100);
+        conn = new TorControlConnection(s);
+        conn.launchThread(true);
+        conn.authenticate(pwd.getSecret());
+    }
+
+}
+
diff --git a/orbotservice/src/main/java/org/torproject/android/service/DummyActivity.java b/orbotservice/src/main/java/org/torproject/android/service/DummyActivity.java
new file mode 100644
index 0000000..5400ba4
--- /dev/null
+++ b/orbotservice/src/main/java/org/torproject/android/service/DummyActivity.java
@@ -0,0 +1,15 @@
+package org.torproject.android.service;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+/*
+ * To combat background service being stopped/swiped
+ */
+public class DummyActivity extends Activity {
+	@Override
+	public void onCreate( Bundle icicle ) {
+		super.onCreate( icicle );
+		finish();
+	}
+}
\ No newline at end of file
diff --git a/orbotservice/src/main/java/org/torproject/android/service/HiddenServiceManager.java b/orbotservice/src/main/java/org/torproject/android/service/HiddenServiceManager.java
new file mode 100644
index 0000000..6b0d32d
--- /dev/null
+++ b/orbotservice/src/main/java/org/torproject/android/service/HiddenServiceManager.java
@@ -0,0 +1,25 @@
+package org.torproject.android.service;
+
+
+//list view with add/remove hidden services - user is prompted for port
+
+public class HiddenServiceManager {
+
+}
+/*
+ * 
+ * ## Once you have configured a hidden service, you can look at the
+## contents of the file ".../hidden_service/hostname" for the address
+## to tell people.
+##
+## HiddenServicePort x y:z says to redirect requests on port x to the
+## address y:z.
+
+#HiddenServiceDir @LOCALSTATEDIR@/lib/tor/hidden_service/
+#HiddenServicePort 80 127.0.0.1:80
+
+#HiddenServiceDir @LOCALSTATEDIR@/lib/tor/other_hidden_service/
+#HiddenServicePort 80 127.0.0.1:80
+#HiddenServicePort 22 127.0.0.1:22
+*/
+
diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java
new file mode 100644
index 0000000..665cf0c
--- /dev/null
+++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java
@@ -0,0 +1,37 @@
+/* Copyright (c) 2009, Nathan Freitas, Orbot/The Guardian Project - http://openideals.com/guardian */
+/* See LICENSE for licensing information */
+
+package org.torproject.android.service;
+
+public interface OrbotConstants {
+
+	public final static String TAG = "Orbot";
+
+	public final static String PREFS_KEY = "OrbotPrefs";
+	public final static String PREFS_KEY_TORIFIED = "PrefTord";
+
+	public final static int FILE_WRITE_BUFFER_SIZE = 2048;
+	
+	//path to check Tor against
+	public final static String URL_TOR_CHECK = "https://check.torproject.org";
+	
+    public final static String URL_TOR_BRIDGES = "https://bridges.torproject.org/bridges?transport=";
+
+	public final static String PREF_BRIDGES_UPDATED = "pref_bridges_enabled";
+	//public final static String PREF_BRIDGES_OBFUSCATED = "pref_bridges_obfuscated";
+    public final static String PREF_OR = "pref_or";
+    public final static String PREF_OR_PORT = "pref_or_port";
+    public final static String PREF_OR_NICKNAME = "pref_or_nickname";
+    public final static String PREF_REACHABLE_ADDRESSES = "pref_reachable_addresses";
+    public final static String PREF_REACHABLE_ADDRESSES_PORTS = "pref_reachable_addresses_ports";
+	public final static  int RESULT_CLOSE_ALL = 0;
+	
+	public final static String PREF_DISABLE_NETWORK = "pref_disable_network";
+	
+	public final static String PREF_TOR_SHARED_PREFS = "org.torproject.android_preferences";
+	
+	public final static int MAX_LOG_LENGTH = 10000;
+	
+	public final static String PREF_SOCKS = "pref_socks";
+	
+}
diff --git a/orbotservice/src/main/java/org/torproject/android/service/Prefs.java b/orbotservice/src/main/java/org/torproject/android/service/Prefs.java
new file mode 100644
index 0000000..4b9ea3d
--- /dev/null
+++ b/orbotservice/src/main/java/org/torproject/android/service/Prefs.java
@@ -0,0 +1,135 @@
+
+package org.torproject.android.service;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.text.TextUtils;
+
+import org.torproject.android.service.TorServiceUtils;
+
+import java.util.Locale;
+
+public class Prefs {
+
+    private final static String PREF_BRIDGES_ENABLED = "pref_bridges_enabled";
+    private final static String PREF_BRIDGES_LIST = "pref_bridges_list";
+    private final static String PREF_DEFAULT_LOCALE = "pref_default_locale";
+    private final static String PREF_ENABLE_LOGGING = "pref_enable_logging";
+    private final static String PREF_EXPANDED_NOTIFICATIONS = "pref_expanded_notifications";
+    private final static String PREF_HAS_ROOT = "has_root";
+    private final static String PREF_PERSIST_NOTIFICATIONS = "pref_persistent_notifications";
+    private final static String PREF_START_ON_BOOT = "pref_start_boot";
+    private final static String PREF_ALLOW_BACKGROUND_STARTS = "pref_allow_background_starts";
+    private final static String PREF_TRANSPARENT = "pref_transparent";
+    private final static String PREF_TRANSPARENT_ALL = "pref_transparent_all";
+    private final static String PREF_TRANSPARENT_TETHERING = "pref_transparent_tethering";
+    private final static String PREF_TRANSPROXY_REFRESH = "pref_transproxy_refresh";
+    private final static String PREF_USE_SYSTEM_IPTABLES = "pref_use_sys_iptables";
+    private final static String PREF_USE_VPN = "pref_vpn";
+    private final static String PREF_EXIT_NODES = "pref_exit_nodes";
+    
+    private static SharedPreferences prefs;
+
+    public static void setContext(Context context) {
+        if (prefs == null)
+            prefs = TorServiceUtils.getSharedPrefs(context);
+    }
+
+    private static void putBoolean(String key, boolean value) {
+        prefs.edit().putBoolean(key, value).apply();
+    }
+
+    private static void putString(String key, String value) {
+        prefs.edit().putString(key, value).apply();
+    }
+
+    public static boolean bridgesEnabled() {
+        return prefs.getBoolean(PREF_BRIDGES_ENABLED, false);
+    }
+
+    public static void putBridgesEnabled(boolean value) {
+        putBoolean(PREF_BRIDGES_ENABLED, value);
+    }
+
+    public static String getBridgesList() {
+        return prefs.getString(PREF_BRIDGES_LIST, "");
+    }
+
+    public static void setBridgesList(String value) {
+        putString(PREF_BRIDGES_LIST, value);
+    }
+
+    public static String getDefaultLocale() {
+        return prefs.getString(PREF_DEFAULT_LOCALE, Locale.getDefault().getLanguage());
+    }
+
+    public static void setDefaultLocale(String value) {
+        putString(PREF_DEFAULT_LOCALE, value);
+    }
+
+    public static boolean useSystemIpTables() {
+        return prefs.getBoolean(PREF_USE_SYSTEM_IPTABLES, false);
+    }
+
+    public static boolean useRoot() {
+        return prefs.getBoolean(PREF_HAS_ROOT, false);
+    }
+
+    public static boolean useTransparentProxying() {
+        return prefs.getBoolean(PREF_TRANSPARENT, false);
+    }
+
+    public static boolean transparentProxyAll() {
+        return prefs.getBoolean(PREF_TRANSPARENT_ALL, false);
+    }
+
+    public static boolean transparentTethering() {
+        return prefs.getBoolean(PREF_TRANSPARENT_TETHERING, false);
+    }
+
+    public static boolean transProxyNetworkRefresh() {
+        return prefs.getBoolean(PREF_TRANSPROXY_REFRESH, false);
+    }
+
+    public static boolean expandedNotifications() {
+        return prefs.getBoolean(PREF_EXPANDED_NOTIFICATIONS, false);
+    }
+
+    public static boolean useDebugLogging() {
+        return prefs.getBoolean(PREF_ENABLE_LOGGING, false);
+    }
+
+    public static boolean persistNotifications() {
+        return prefs.getBoolean(PREF_PERSIST_NOTIFICATIONS, true);
+    }
+
+    public static boolean allowBackgroundStarts() {
+        return prefs.getBoolean(PREF_ALLOW_BACKGROUND_STARTS, true);
+    }
+
+    public static boolean useVpn() {
+        return prefs.getBoolean(PREF_USE_VPN, false);
+    }
+
+    public static void putUseVpn(boolean value) {
+        putBoolean(PREF_USE_VPN, value);
+    }
+
+    public static boolean startOnBoot() {
+        return prefs.getBoolean(PREF_START_ON_BOOT, true);
+    }
+
+    public static void putStartOnBoot(boolean value) {
+        putBoolean(PREF_START_ON_BOOT, value);
+    }
+    
+    public static String getExitNodes ()
+    {
+    	return prefs.getString(PREF_EXIT_NODES, "");
+    }
+    
+    public static void setExitNodes (String exits)
+    {
+    	putString(PREF_EXIT_NODES,exits);
+    }
+}
diff --git a/orbotservice/src/main/java/org/torproject/android/service/StartTorReceiver.java b/orbotservice/src/main/java/org/torproject/android/service/StartTorReceiver.java
new file mode 100644
index 0000000..22e703a
--- /dev/null
+++ b/orbotservice/src/main/java/org/torproject/android/service/StartTorReceiver.java
@@ -0,0 +1,35 @@
+
+package org.torproject.android.service;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.text.TextUtils;
+
+
+public class StartTorReceiver extends BroadcastReceiver implements TorServiceConstants {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        /* sanitize the Intent before forwarding it to TorService */
+        Prefs.setContext(context);
+        String action = intent.getAction();
+        if (TextUtils.equals(action, ACTION_START)) {
+            String packageName = intent.getStringExtra(EXTRA_PACKAGE_NAME);
+            if (Prefs.allowBackgroundStarts()) {
+                Intent startTorIntent = new Intent(context, TorService.class);
+                startTorIntent.setAction(action);
+                if (packageName != null)
+                    startTorIntent.putExtra(EXTRA_PACKAGE_NAME, packageName);
+                context.startService(startTorIntent);
+            } else if (!TextUtils.isEmpty(packageName)) {
+                // let the requesting app know that the user has disabled
+                // starting via Intent
+                Intent startsDisabledIntent = new Intent(ACTION_STATUS);
+                startsDisabledIntent.putExtra(EXTRA_STATUS, STATUS_STARTS_DISABLED);
+                startsDisabledIntent.setPackage(packageName);
+                context.sendBroadcast(startsDisabledIntent);
+            }
+        }
+    }
+}
diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorResourceInstaller.java b/orbotservice/src/main/java/org/torproject/android/service/TorResourceInstaller.java
new file mode 100644
index 0000000..47d706f
--- /dev/null
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorResourceInstaller.java
@@ -0,0 +1,354 @@
+/* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - http://openideals.com/guardian */
+/* See LICENSE for licensing information */
+
+package org.torproject.android.service;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.StringBufferInputStream;
+import java.util.ArrayList;
+import java.util.concurrent.TimeoutException;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import android.content.Context;
+import android.os.Build;
+import android.util.Log;
+
+public class TorResourceInstaller implements TorServiceConstants {
+
+    
+    File installFolder;
+    Context context;
+    
+    public TorResourceInstaller (Context context, File installFolder)
+    {
+        this.installFolder = installFolder;
+        
+        this.context = context;
+    }
+    
+    public void deleteDirectory(File file) {
+        if( file.exists() ) {
+            if (file.isDirectory()) {
+                File[] files = file.listFiles();
+                for(int i=0; i<files.length; i++) {
+                    if(files[i].isDirectory()) {
+                        deleteDirectory(files[i]);
+                    }
+                    else {
+                        files[i].delete();
+                    }
+                }
+            }
+                
+            file.delete();
+        }
+    }
+    
+    private final static String COMMAND_RM_FORCE = "rm -f ";
+    private final static String MP3_EXT = ".mp3";
+    //        
+    /*
+     * Extract the Tor resources from the APK file using ZIP
+     */
+    public boolean installResources () throws IOException, FileNotFoundException, TimeoutException
+    {
+        
+        InputStream is;
+        File outFile;
+
+        String cpuPath = "armeabi";
+            
+        if (Build.CPU_ABI.contains("x86"))
+        	cpuPath = "x86";
+        
+        deleteDirectory(installFolder);
+        
+        installFolder.mkdirs();
+        
+
+        is = context.getResources().openRawResource(R.raw.torrc);
+        outFile = new File(installFolder, TORRC_ASSET_KEY);
+        streamToFile(is,outFile, false, false);
+        
+        is = context.getResources().openRawResource(R.raw.torpolipo);
+        outFile = new File(installFolder, POLIPOCONFIG_ASSET_KEY);
+        streamToFile(is,outFile, false, false);
+    
+        //only install if ARM (GoLang only supports ARM for now)
+        if (cpuPath.equals("armeabi"))
+        {
+        	 cpuPath = "armeabi";
+            is = context.getAssets().open(cpuPath + "/" + OBFSCLIENT_ASSET_KEY + MP3_EXT);
+	        outFile = new File(installFolder, OBFSCLIENT_ASSET_KEY);
+	        streamToFile(is,outFile, false, true);
+	        setExecutable(outFile);
+	        /**
+            is = context.getAssets().open(cpuPath + "/" + MEEK_ASSET_KEY + MP3_EXT);
+	        outFile = new File(installFolder, MEEK_ASSET_KEY);
+	        shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish();
+	        streamToFile(is,outFile, false, true);
+	        setExecutable(outFile);
+	        */
+	        
+        }
+                
+        is = context.getAssets().open(cpuPath + '/' + TOR_ASSET_KEY + MP3_EXT);
+        outFile = new File(installFolder, TOR_ASSET_KEY);
+        streamToFile(is,outFile, false, true);
+        setExecutable(outFile);
+    
+        is = context.getAssets().open(cpuPath + '/' + POLIPO_ASSET_KEY + MP3_EXT);
+        outFile = new File(installFolder, POLIPO_ASSET_KEY);
+        streamToFile(is,outFile, false, true);
+        setExecutable(outFile);
+    
+        is = context.getAssets().open(cpuPath + '/' + IPTABLES_ASSET_KEY + MP3_EXT);
+        outFile = new File(installFolder, IPTABLES_ASSET_KEY);
+        streamToFile(is,outFile, false, true);
+        setExecutable(outFile);
+        
+        is = context.getAssets().open(cpuPath + '/' + PDNSD_ASSET_KEY + MP3_EXT);
+        outFile = new File(installFolder, PDNSD_ASSET_KEY);
+        streamToFile(is,outFile, false, true);
+        setExecutable(outFile);
+        
+        installGeoIP();
+    
+        return true;
+    }
+    
+    public boolean updateTorConfigCustom (File fileTorRcCustom, String extraLines) throws IOException, FileNotFoundException, TimeoutException
+    {
+    	if (fileTorRcCustom.exists())
+    	{
+    		fileTorRcCustom.delete();
+    		Log.d("torResources","deleting existing torrc.custom");
+    	}
+    	else
+    		fileTorRcCustom.createNewFile();
+    	
+    	FileOutputStream fos = new FileOutputStream(fileTorRcCustom, false);
+    	PrintStream ps = new PrintStream(fos);
+    	ps.print(extraLines);
+    	ps.close();
+    	
+        return true;
+    }
+    
+    public boolean updatePolipoConfig (File filePolipo, String extraLines) throws IOException, FileNotFoundException, TimeoutException
+    {
+        
+        InputStream is;
+        
+
+        is = context.getResources().openRawResource(R.raw.torpolipo);        
+        streamToFile(is,filePolipo, false, false);
+
+        if (extraLines != null && extraLines.length() > 0)
+        {
+            StringBufferInputStream sbis = new StringBufferInputStream('\n' + extraLines + '\n');
+            streamToFile(sbis,filePolipo,true,false);
+        }
+        
+
+        return true;
+    }
+    
+    public boolean installPolipoConf () throws IOException, FileNotFoundException, TimeoutException
+    {
+        
+        InputStream is;
+        File outFile;
+        
+
+        is = context.getResources().openRawResource(R.raw.torpolipo);
+        outFile = new File(installFolder, POLIPOCONFIG_ASSET_KEY);
+        streamToFile(is,outFile, false, false);
+        
+        return true;
+    }
+    
+    /*
+     * Extract the Tor binary from the APK file using ZIP
+     */
+    
+    private boolean installGeoIP () throws IOException, FileNotFoundException
+    {
+        
+        InputStream is;
+        File outFile;
+        
+        outFile = new File(installFolder, GEOIP_ASSET_KEY);
+        is = context.getResources().openRawResource(R.raw.geoip);
+        streamToFile(is, outFile, false, true);
+        
+        is = context.getResources().openRawResource(R.raw.geoip6);
+        outFile = new File(installFolder, GEOIP6_ASSET_KEY);
+        streamToFile(is, outFile, false, true);
+    
+        return true;
+    }
+    
+    /*
+    private static void copyAssetFile(Context ctx, String asset, File file) throws IOException, InterruptedException
+    {
+        
+        DataOutputStream out = new DataOutputStream(new FileOutputStream(file));
+        InputStream is = new GZIPInputStream(ctx.getAssets().open(asset));
+        
+        byte buf[] = new byte[8172];
+        int len;
+        while ((len = is.read(buf)) > 0) {
+            out.write(buf, 0, len);
+        }
+        out.close();
+        is.close();
+    }*/
+    
+    /*
+     * Write the inputstream contents to the file
+     */
+    public static boolean streamToFile(InputStream stm, File outFile, boolean append, boolean zip) throws IOException
+
+    {
+        byte[] buffer = new byte[FILE_WRITE_BUFFER_SIZE];
+
+        int bytecount;
+
+        OutputStream stmOut = new FileOutputStream(outFile.getAbsolutePath(), append);
+        ZipInputStream zis = null;
+        
+        if (zip)
+        {
+            zis = new ZipInputStream(stm);            
+            ZipEntry ze = zis.getNextEntry();
+            stm = zis;
+            
+        }
+        
+        while ((bytecount = stm.read(buffer)) > 0)
+        {
+
+            stmOut.write(buffer, 0, bytecount);
+
+        }
+
+        stmOut.close();
+        stm.close();
+        
+        if (zis != null)
+            zis.close();
+        
+        
+        return true;
+
+    }
+    
+    //copy the file from inputstream to File output - alternative impl
+    public static boolean copyFile (InputStream is, File outputFile)
+    {
+        
+        try {
+        	if (outputFile.exists())
+        		outputFile.delete();
+        	
+            boolean newFile = outputFile.createNewFile();
+            DataOutputStream out = new DataOutputStream(new FileOutputStream(outputFile));
+            DataInputStream in = new DataInputStream(is);
+            
+            int b = -1;
+            byte[] data = new byte[1024];
+            
+            while ((b = in.read(data)) != -1) {
+                out.write(data);
+            }
+            
+            if (b == -1); //rejoice
+            
+            //
+            out.flush();
+            out.close();
+            in.close();
+            // chmod?
+            
+            return newFile;
+            
+            
+        } catch (IOException ex) {
+            Log.e(OrbotConstants.TAG, "error copying binary", ex);
+            return false;
+        }
+
+    }
+    
+    
+
+   
+    /**
+     * Copies a raw resource file, given its ID to the given location
+     * @param ctx context
+     * @param resid resource id
+     * @param file destination file
+     * @param mode file permissions (E.g.: "755")
+     * @throws IOException on error
+     * @throws InterruptedException when interrupted
+     */
+    public static void copyRawFile(Context ctx, int resid, File file, String mode, boolean isZipd) throws IOException, InterruptedException
+    {
+        final String abspath = file.getAbsolutePath();
+        // Write the iptables binary
+        final FileOutputStream out = new FileOutputStream(file);
+        InputStream is = ctx.getResources().openRawResource(resid);
+        
+        if (isZipd)
+        {
+            ZipInputStream zis = new ZipInputStream(is);            
+            ZipEntry ze = zis.getNextEntry();
+            is = zis;
+        }
+        
+        byte buf[] = new byte[1024];
+        int len;
+        while ((len = is.read(buf)) > 0) {
+            out.write(buf, 0, len);
+        }
+        out.close();
+        is.close();
+        // Change the permissions
+        Runtime.getRuntime().exec("chmod "+mode+" "+abspath).waitFor();
+    }
+    /**
+     * Asserts that the binary files are installed in the bin directory.
+     * @param ctx context
+     * @param showErrors indicates if errors should be alerted
+     * @return false if the binary files could not be installed
+     */
+    /*
+    public static boolean assertIpTablesBinaries(Context ctx, boolean showErrors) throws Exception {
+        boolean changed = false;
+        
+        // Check iptables_g1
+        File file = new File(ctx.getDir("bin",0), "iptables");
+        copyRawFile(ctx, R.raw.iptables, file, CHMOD_EXEC, false);
+                
+        return true;
+    }*/
+    
+
+    private void setExecutable(File fileBin) {
+        fileBin.setReadable(true);
+        fileBin.setExecutable(true);
+        fileBin.setWritable(false);
+        fileBin.setWritable(true, true);
+    }
+
+}
diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
new file mode 100644
index 0000000..eedf682
--- /dev/null
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
@@ -0,0 +1,2404 @@
+/* Copyright (c) 2009-2011, Nathan Freitas, Orbot / The Guardian Project - https://guardianproject.info/apps/orbot */
+/* See LICENSE for licensing information */
+/*
+ * Code for iptables binary management taken from DroidWall GPLv3
+ * Copyright (C) 2009-2010  Rodrigo Zechin Rosauro
+ */
+
+package org.torproject.android.service;
+
+
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
+import android.app.Application;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.VpnService;
+import android.os.Build;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.support.v4.content.LocalBroadcastManager;
+import android.text.TextUtils;
+import android.util.Log;
+import android.widget.RemoteViews;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.torproject.android.control.ConfigEntry;
+import org.torproject.android.control.EventHandler;
+import org.torproject.android.control.TorControlConnection;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.Socket;
+import java.net.URL;
+import java.net.URLConnection;
+import java.text.Normalizer;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeoutException;
+
+public class TorService extends Service implements TorServiceConstants, OrbotConstants, EventHandler
+{
+    
+    private String mCurrentStatus = STATUS_OFF;
+    
+    private final static int CONTROL_SOCKET_TIMEOUT = 0;
+        
+    private TorControlConnection conn = null;
+    private Socket torConnSocket = null;
+    private int mLastProcessId = -1;
+    
+    private int mPortHTTP = HTTP_PROXY_PORT_DEFAULT;
+    private int mPortSOCKS = SOCKS_PROXY_PORT_DEFAULT;
+    
+    private static final int NOTIFY_ID = 1;
+    private static final int TRANSPROXY_NOTIFY_ID = 2;
+    private static final int ERROR_NOTIFY_ID = 3;
+    private static final int HS_NOTIFY_ID = 4;
+    
+    private static final int MAX_START_TRIES = 3;
+
+    private ArrayList<String> configBuffer = null;
+    private ArrayList<String> resetBuffer = null;
+
+    private boolean isTorUpgradeAndConfigComplete = false;
+
+    private File fileControlPort;
+    
+    private TorTransProxy mTransProxy;
+
+    private long mTotalTrafficWritten = 0;
+    private long mTotalTrafficRead = 0;
+    private boolean mConnectivity = true; 
+    private int mNetworkType = -1;
+
+    private long lastRead = -1;
+    private long lastWritten = -1;
+    
+    private NotificationManager mNotificationManager = null;
+    private Notification.Builder mNotifyBuilder;
+    private Notification mNotification;
+    private boolean mNotificationShowing = false;
+
+	boolean mIsLollipop = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
+
+    private ExecutorService mExecutor = Executors.newFixedThreadPool(1);
+
+    private NumberFormat mNumberFormat = null;
+    
+  //  private OrbotVpnManager mVpnManager;
+    
+    public static File appBinHome;
+    public static File appCacheHome;
+
+    public static File fileTor;
+    public static File filePolipo;
+    public static File fileObfsclient;
+    // public static File fileMeekclient;
+    public static File fileXtables;
+    public static File fileTorRc;
+    public static File filePdnsd;
+
+
+    public void debug(String msg)
+    {
+        if (Prefs.useDebugLogging())
+        {
+            Log.d(OrbotConstants.TAG,msg);
+            sendCallbackLogMessage(msg);    
+
+        }
+    }
+    
+    public void logException(String msg, Exception e)
+    {
+        if (Prefs.useDebugLogging())
+        {
+            Log.e(OrbotConstants.TAG,msg,e);
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            e.printStackTrace(new PrintStream(baos));
+            
+            sendCallbackLogMessage(msg + '\n'+ new String(baos.toByteArray()));
+            
+        }
+        else
+            sendCallbackLogMessage(msg);
+            
+
+    }
+    
+    
+    private boolean findExistingTorDaemon() {
+        try {
+            mLastProcessId = initControlConnection(3, true);
+
+            if (mLastProcessId != -1 && conn != null) {
+                sendCallbackLogMessage(getString(R.string.found_existing_tor_process));
+                sendCallbackStatus(STATUS_ON);
+                return true;
+            }
+        } catch (Exception e) {
+        }
+        return false;
+    }
+
+    /* (non-Javadoc)
+     * @see android.app.Service#onLowMemory()
+     */
+    @Override
+    public void onLowMemory() {
+        super.onLowMemory();
+        
+        logNotice( "Low Memory Warning!");
+        
+    }
+
+    private void clearNotifications ()
+    {
+        if (mNotificationManager != null)
+            mNotificationManager.cancelAll();
+        
+
+        hmBuiltNodes.clear();
+        mNotificationShowing = false;
+    }
+	        
+    @SuppressLint("NewApi")
+    private void showToolbarNotification (String notifyMsg, int notifyType, int icon)
+     {        
+         
+         //Reusable code.
+         Intent intent = new Intent();
+         PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0);
+ 
+        if (mNotifyBuilder == null)
+        {
+            
+            mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+                
+            if (mNotifyBuilder == null)
+            {
+                mNotifyBuilder = new Notification.Builder(this)
+                    .setContentTitle(getString(R.string.app_name))
+                    .setSmallIcon(R.drawable.ic_stat_tor);
+
+                mNotifyBuilder.setContentIntent(pendIntent);
+            }        
+                                
+        }
+
+        mNotifyBuilder.setContentText(notifyMsg);
+        mNotifyBuilder.setSmallIcon(icon);
+        
+        if (notifyType != NOTIFY_ID)
+        {
+            mNotifyBuilder.setTicker(notifyMsg);
+        //    mNotifyBuilder.setLights(Color.GREEN, 1000, 1000);
+        }
+        else
+        {
+            mNotifyBuilder.setTicker(null);
+        }
+        
+        mNotifyBuilder.setOngoing(Prefs.persistNotifications());
+        
+        mNotification = mNotifyBuilder.build();
+        
+        if (Build.VERSION.SDK_INT >= 16 && Prefs.expandedNotifications()) {
+            // Create remote view that needs to be set as bigContentView for the notification.
+             RemoteViews expandedView = new RemoteViews(this.getPackageName(), 
+                     R.layout.layout_notification_expanded);
+             
+             StringBuffer sbInfo = new StringBuffer();
+             
+             if (notifyType == NOTIFY_ID)
+                 expandedView.setTextViewText(R.id.text, notifyMsg);
+             else
+             {
+                 expandedView.setTextViewText(R.id.info, notifyMsg);
+             }
+
+             if (hmBuiltNodes.size() > 0)
+             {
+                 Set<String> itBuiltNodes = hmBuiltNodes.keySet();
+                 for (String key : itBuiltNodes)
+                 {
+                     Node node = hmBuiltNodes.get(key);
+                     
+                     if (node.ipAddress != null)
+                     {
+                         sbInfo.append(node.ipAddress);
+                     
+                         if (node.country != null)
+                             sbInfo.append(' ').append(node.country);
+                     
+                         if (node.organization != null)
+                             sbInfo.append(" (").append(node.organization).append(')');
+                     
+                         sbInfo.append('\n');
+                     }
+                     
+                 }
+                 
+                 expandedView.setTextViewText(R.id.text2, sbInfo.toString());
+             }
+             
+             expandedView.setTextViewText(R.id.title, getString(R.string.app_name)); 
+             
+             expandedView.setImageViewResource(R.id.icon, icon);
+            mNotification.bigContentView = expandedView;
+        }
+        
+        if (Prefs.persistNotifications() && (!mNotificationShowing))
+        {
+            startForeground(NOTIFY_ID, mNotification);
+            logNotice("Set background service to FOREGROUND");
+        }
+        else
+        {
+            mNotificationManager.notify(NOTIFY_ID, mNotification);
+        }
+        
+        mNotificationShowing = true;
+     }
+    
+
+    /* (non-Javadoc)
+     * @see android.app.Service#onStart(android.content.Intent, int)
+     */
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        if (intent != null)
+            new Thread (new IncomingIntentRouter(intent)).start();
+        else
+            Log.d(OrbotConstants.TAG, "Got null onStartCommand() intent");
+
+        return Service.START_STICKY;
+    }
+    
+    private class IncomingIntentRouter implements Runnable
+    {
+        Intent mIntent;
+        
+        public IncomingIntentRouter (Intent intent)
+        {
+            mIntent = intent;
+        }
+        
+        public void run() {
+            String action = mIntent.getAction();
+
+            if (action != null) {
+                if (action.equals(ACTION_START)) {
+                    replyWithStatus(mIntent);
+                    startTor();
+                    // stopTor() is called when the Service is destroyed
+                }
+                else if (action.equals(ACTION_STATUS)) {
+                    replyWithStatus(mIntent);                    
+                }
+                else if (action.equals(CMD_SIGNAL_HUP)) {
+                    requestTorRereadConfig();
+                } else if (action.equals(CMD_NEWNYM)) {
+                    newIdentity();
+                } else if (action.equals(CMD_FLUSH)) {
+                    flushTransparentProxyRules();
+                } else if (action.equals(CMD_UPDATE_TRANS_PROXY)) {
+                    processTransparentProxying();
+                } else if (action.equals(CMD_VPN)) {
+                    enableVpnProxy();
+                } else if (action.equals(CMD_VPN_CLEAR)) {
+                    clearVpnProxy();
+                } else if (action.equals(CMD_SET_EXIT)) {
+                	
+                	setExitNode(mIntent.getStringExtra("exit"));
+                	
+                } else {
+                    Log.w(OrbotConstants.TAG, "unhandled TorService Intent: " + action);
+                }
+            }
+        }
+    }
+    
+    @Override
+    public void onTaskRemoved(Intent rootIntent){
+         Log.d(OrbotConstants.TAG,"task removed");
+         Intent intent = new Intent( this, DummyActivity.class );
+         intent.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK );
+         startActivity( intent );
+    }
+
+    @Override
+    public void onDestroy() {
+        stopTor();
+        unregisterReceiver(mNetworkStateReceiver);
+        super.onDestroy();
+    }
+
+    /**
+    @Override
+    public void onRevoke ()
+    {
+    	//if (mVpnManager != null)
+    	//	mVpnManager.onRevoke();
+    	
+    	super.onRevoke();
+
+    }**/
+
+    private void stopTor() {
+        Log.i("TorService", "stopTor");
+        try {
+            sendCallbackStatus(STATUS_STOPPING);
+            sendCallbackLogMessage(getString(R.string.status_shutting_down));
+
+            killAllDaemons();
+
+            //stop the foreground priority and make sure to remove the persistant notification
+            stopForeground(true);
+
+            if (Prefs.useRoot() && Prefs.useTransparentProxying())
+            {
+                disableTransparentProxy();
+            }
+
+            sendCallbackLogMessage(getString(R.string.status_disabled));
+        }
+        catch (Exception e)
+        {
+            logNotice("An error occured stopping Tor: " + e.getMessage());
+            sendCallbackLogMessage(getString(R.string.something_bad_happened));
+        }
+        clearNotifications();
+        sendCallbackStatus(STATUS_OFF);
+    }
+
+
+    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);
+                        return null;
+                    }
+                }
+                else
+                {
+                    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 killAllDaemons() throws Exception {
+        if (conn != null) {
+            logNotice("Using control port to shutdown Tor");
+
+            try {
+                logNotice("sending HALT signal to Tor process");
+                conn.shutdownTor("HALT");
+
+            } catch (IOException e) {
+                Log.d(OrbotConstants.TAG, "error shutting down Tor via connection", e);
+            }
+
+            conn = null;
+        }
+
+        // try these separately in case one fails, then it can try the next
+        File cannotKillFile = null;
+        try {
+        	TorServiceUtils.killProcess(fileObfsclient);
+        } catch (IOException e) {
+           // e.printStackTrace();
+            Log.w(OrbotConstants.TAG,"could not kill obfsclient",e);
+            cannotKillFile = fileObfsclient;
+        }
+        
+        try {
+        	TorServiceUtils.killProcess(filePolipo);
+        } catch (IOException e) {
+            Log.w(OrbotConstants.TAG,"could not kill polipo",e);
+            cannotKillFile = filePolipo;
+        }
+        try {
+            TorServiceUtils.killProcess(fileTor);
+        } catch (IOException e) {
+            Log.w(OrbotConstants.TAG,"could not kill tor",e);
+            cannotKillFile = fileTor;
+        }
+    }
+
+    private void requestTorRereadConfig() {
+        try {
+            conn.signal("HUP");
+            return;
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        // if that fails, try again using native utils
+        try {
+        	TorServiceUtils.killProcess(fileTor, "-1"); // this is -HUP
+        } catch (Exception e) {
+            e.printStackTrace();
+        } 
+    }
+
+        private void logNotice (String msg)
+    {
+        if (msg != null && msg.trim().length() > 0)
+        {
+            if (Prefs.useDebugLogging())
+                Log.d(OrbotConstants.TAG, msg);
+        
+            sendCallbackLogMessage(msg);
+        }
+    }
+    
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        try
+        {
+            appBinHome = getDir(TorServiceConstants.DIRECTORY_TOR_BINARY, Application.MODE_PRIVATE);
+            appCacheHome = getDir(TorServiceConstants.DIRECTORY_TOR_DATA,Application.MODE_PRIVATE);
+
+            fileTor= new File(appBinHome, TorServiceConstants.TOR_ASSET_KEY);
+            filePolipo = new File(appBinHome, TorServiceConstants.POLIPO_ASSET_KEY);
+            fileObfsclient = new File(appBinHome, TorServiceConstants.OBFSCLIENT_ASSET_KEY);
+            fileXtables = new File(appBinHome, TorServiceConstants.IPTABLES_ASSET_KEY);
+            fileTorRc = new File(appBinHome, TorServiceConstants.TORRC_ASSET_KEY);
+            filePdnsd = new File(appBinHome, TorServiceConstants.PDNSD_ASSET_KEY);
+
+            mNumberFormat = NumberFormat.getInstance(Locale.getDefault()); //localized numbers!
+
+            if (mNotificationManager == null)
+            {
+               
+               IntentFilter mNetworkStateFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);               
+                registerReceiver(mNetworkStateReceiver , mNetworkStateFilter);
+         
+                mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+             
+            }
+        
+            new Thread(new Runnable ()
+            {
+                public void run ()
+                {
+                    try
+                    {
+                        
+                        torUpgradeAndConfig();
+                    
+                        findExistingTorDaemon();
+                    }
+                    catch (Exception e)
+                    {
+                        Log.e(OrbotConstants.TAG,"error onBind",e);
+                        logNotice("error finding exiting process: " + e.toString());
+                    }
+                    
+                }
+            }).start();
+        	
+        }
+        catch (Exception e)
+        {
+            //what error here
+            Log.e(OrbotConstants.TAG, "Error installing Orbot binaries",e);
+            logNotice("There was an error installing Orbot binaries");
+        }
+        
+        Log.i("TorService", "onCreate end");
+    }
+
+    private void torUpgradeAndConfig() throws IOException, TimeoutException {
+        if (isTorUpgradeAndConfigComplete)
+            return;
+
+        SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+        String version = prefs.getString(PREF_BINARY_TOR_VERSION_INSTALLED,null);
+
+        logNotice("checking binary version: " + version);
+        
+        TorResourceInstaller installer = new TorResourceInstaller(this, appBinHome);
+        
+        if (version == null || (!version.equals(BINARY_TOR_VERSION)) || (!fileTor.exists()))
+        {
+            logNotice("upgrading binaries to latest version: " + BINARY_TOR_VERSION);
+            
+            boolean success = installer.installResources();
+            
+            if (success)
+                prefs.edit().putString(PREF_BINARY_TOR_VERSION_INSTALLED,BINARY_TOR_VERSION).commit();    
+        }
+
+        updateTorConfigFile ();
+        isTorUpgradeAndConfigComplete = true;
+    }
+
+    private boolean updateTorConfigFile () throws FileNotFoundException, IOException, TimeoutException
+    {
+        SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+
+        TorResourceInstaller installer = new TorResourceInstaller(this, appBinHome);
+        
+        StringBuffer extraLines = new StringBuffer();
+        
+        String TORRC_CONTROLPORT_FILE_KEY = "ControlPortWriteToFile";
+        fileControlPort = new File(appBinHome, "control.txt");
+        extraLines.append(TORRC_CONTROLPORT_FILE_KEY).append(' ').append(fileControlPort.getCanonicalPath()).append('\n');
+
+//         extraLines.append("RunAsDaemon 1").append('\n');
+ //        extraLines.append("AvoidDiskWrites 1").append('\n');
+        
+         String socksPortPref = prefs.getString(OrbotConstants.PREF_SOCKS,
+                 String.valueOf(TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT));
+         if (socksPortPref.indexOf(':')!=-1)
+             socksPortPref = socksPortPref.split(":")[1];
+         
+        if (!socksPortPref.equalsIgnoreCase("auto"))
+        {
+	        boolean isPortUsed = TorServiceUtils.isPortOpen("127.0.0.1",Integer.parseInt(socksPortPref),500);
+	        
+	        if (isPortUsed) //the specified port is not available, so let Tor find one instead
+	        	socksPortPref = "auto";
+        }
+        
+        extraLines.append("SOCKSPort ").append(socksPortPref).append('\n');
+        extraLines.append("SafeSocks 0").append('\n');
+        extraLines.append("TestSocks 0").append('\n');
+        extraLines.append("WarnUnsafeSocks 1").append('\n');
+
+        String transPort = prefs.getString("pref_transport", TorServiceConstants.TOR_TRANSPROXY_PORT_DEFAULT+"");
+        String dnsPort = prefs.getString("pref_dnsport", TorServiceConstants.TOR_DNS_PORT_DEFAULT+"");
+            
+        extraLines.append("TransPort ").append(transPort).append('\n');
+    	extraLines.append("DNSPort ").append(dnsPort).append("\n");
+    	
+    	if (Prefs.useVpn())
+    		extraLines.append("DNSListenAddress 0.0.0.0").append('\n');
+    	
+        if (Prefs.transparentTethering())
+        {
+            extraLines.append("TransListenAddress 0.0.0.0").append('\n');
+            extraLines.append("DNSListenAddress 0.0.0.0").append('\n');            
+        }
+       
+        extraLines.append("VirtualAddrNetwork 10.192.0.0/10").append('\n');
+        extraLines.append("AutomapHostsOnResolve 1").append('\n');
+
+        extraLines.append("DisableNetwork 0").append('\n');
+                
+        if (Prefs.useDebugLogging())
+        {
+        	extraLines.append("Log debug syslog").append('\n');    
+        	extraLines.append("Log info syslog").append('\n');
+        	extraLines.append("SafeLogging 0").append('\n');   
+
+        }
+        
+        processSettingsImpl(extraLines);
+        
+        String torrcCustom = new String(prefs.getString("pref_custom_torrc", "").getBytes("US-ASCII"));
+        extraLines.append(torrcCustom).append('\n');
+
+        logNotice("updating torrc custom configuration...");
+
+        debug("torrc.custom=" + extraLines.toString());
+        
+        File fileTorRcCustom = new File(fileTorRc.getAbsolutePath() + ".custom");
+        boolean success = installer.updateTorConfigCustom(fileTorRcCustom, extraLines.toString());    
+        
+        if (success)
+        {
+            logNotice ("success.");
+        }
+        
+        return success;
+    }
+
+    /**
+     * Send Orbot's status in reply to an
+     * {@link TorServiceConstants#ACTION_START} {@link Intent}, targeted only to
+     * the app that sent the initial request.
+     */
+    private void replyWithStatus(Intent startRequest) {
+        String packageName = startRequest.getStringExtra(EXTRA_PACKAGE_NAME);
+
+        Intent reply = new Intent(ACTION_STATUS);
+        reply.putExtra(EXTRA_STATUS, mCurrentStatus);
+        reply.putExtra(EXTRA_SOCKS_PROXY, "socks://127.0.0.1:" + mPortSOCKS);
+        reply.putExtra(EXTRA_SOCKS_PROXY_HOST, "127.0.0.1");
+        reply.putExtra(EXTRA_SOCKS_PROXY_PORT, mPortSOCKS);
+        reply.putExtra(EXTRA_HTTP_PROXY, "http://127.0.0.1" + mPortHTTP);
+        reply.putExtra(EXTRA_HTTP_PROXY_HOST, "127.0.0.1");
+        reply.putExtra(EXTRA_HTTP_PROXY_PORT, mPortHTTP);
+        
+        if (packageName != null)
+        {
+        	reply.setPackage(packageName);
+        	sendBroadcast(reply);
+        }
+        else
+        {
+            LocalBroadcastManager.getInstance(this).sendBroadcast(reply);
+
+        }
+
+    }
+
+    /**
+     * The entire process for starting tor and related services is run from this method.
+     */
+    private void startTor() {
+        // STATUS_STARTING is set in onCreate()
+        if (mCurrentStatus == STATUS_STOPPING) {
+            // these states should probably be handled better
+            sendCallbackLogMessage("Ignoring start request, currently " + mCurrentStatus);
+            return;
+        } else if (mCurrentStatus == STATUS_ON && findExistingTorDaemon()) {
+        
+            sendCallbackLogMessage("Ignoring start request, already started.");
+            
+            return;
+        }        
+        
+
+        try {
+        	
+	        // make sure there are no stray daemons running
+	        killAllDaemons();
+	
+	        sendCallbackStatus(STATUS_STARTING);
+	        sendCallbackLogMessage(getString(R.string.status_starting_up));
+	        logNotice(getString(R.string.status_starting_up));
+	        
+	        ArrayList<String> customEnv = new ArrayList<String>();
+	
+	        if (Prefs.bridgesEnabled())
+	        	if (Prefs.useVpn() && !mIsLollipop)
+	        	{
+	        		//TODO customEnv.add("TOR_PT_PROXY=socks5://" + OrbotVpnManager.sSocksProxyLocalhost + ":" + OrbotVpnManager.sSocksProxyServerPort);
+	        	}
+	        
+	      //  String baseDirectory = fileTor.getParent();
+	       // Shell shellUser = Shell.startShell(customEnv, baseDirectory);
+	        
+	        boolean success = runTorShellCmd();
+	        
+	        if (success)
+	        {
+	            if (mPortHTTP != -1)
+	                runPolipoShellCmd();
+	            
+	            if (Prefs.useRoot() && Prefs.useTransparentProxying())
+	            {
+
+	                disableTransparentProxy();
+	                enableTransparentProxy();
+	                
+
+	            }
+	            
+	            getHiddenServiceHostname ();
+	        }
+	        else
+	        {
+	                 showToolbarNotification(getString(R.string.unable_to_start_tor), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr);
+	        }
+
+        } catch (Exception e) {
+            logException("Unable to start Tor: " + e.toString(), e);
+            showToolbarNotification(
+                    getString(R.string.unable_to_start_tor) + ": " + e.getMessage(),
+                    ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr);
+            stopTor();
+        }
+    }
+
+    private boolean flushTransparentProxyRules () {
+        if (Prefs.useRoot())
+        {
+             if (mTransProxy == null)
+                 mTransProxy = new TorTransProxy(this, fileXtables);
+
+             try {
+                 mTransProxy.flushTransproxyRules(this);
+             } catch (Exception e) {
+                 e.printStackTrace();
+                 return false;
+             }
+         
+             return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+    
+    /*
+     * activate means whether to apply the users preferences
+     * or clear them out
+     * 
+     * the idea is that if Tor is off then transproxy is off
+     */
+    private boolean enableTransparentProxy () throws Exception
+     {
+        
+         if (mTransProxy == null)
+         {
+             mTransProxy = new TorTransProxy(this, fileXtables);
+             
+         }
+
+        SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+        String transProxy = prefs.getString("pref_transport", TorServiceConstants.TOR_TRANSPROXY_PORT_DEFAULT+"");
+        String dnsPort = prefs.getString("pref_dnsport", TorServiceConstants.TOR_TRANSPROXY_PORT_DEFAULT+"");
+        
+        if (transProxy.indexOf(':')!=-1) //we just want the port for this
+            transProxy = transProxy.split(":")[1];
+        
+        if (dnsPort.indexOf(':')!=-1) //we just want the port for this
+            dnsPort = dnsPort.split(":")[1];
+        
+        mTransProxy.setTransProxyPort(Integer.parseInt(transProxy));
+        mTransProxy.setDNSPort(Integer.parseInt(dnsPort));
+        
+        int code = 0; // Default state is "okay"
+        
+        if(Prefs.transparentProxyAll())
+        {
+
+            code = mTransProxy.setTransparentProxyingAll(this, true);
+        }
+        else
+        {
+            ArrayList<TorifiedApp> apps = getApps(this, TorServiceUtils.getSharedPrefs(getApplicationContext()));
+
+            code = mTransProxy.setTransparentProxyingByApp(this,apps, true);
+        }
+        
+        debug ("TorTransProxy resp code: " + code);
+        
+        if (code == 0)
+        {
+
+            if (Prefs.transparentTethering())
+            {
+                showToolbarNotification(getString(R.string.transproxy_enabled_for_tethering_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor);
+
+                mTransProxy.enableTetheringRules(this);
+
+                  
+            }
+            else
+            {
+                showToolbarNotification(getString(R.string.transparent_proxying_enabled), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor);
+
+            }
+        }
+        else
+        {
+            showToolbarNotification(getString(R.string.warning_error_starting_transparent_proxying_), TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor);
+
+        }
+    
+        return true;
+     }
+
+    public static ArrayList<TorifiedApp> getApps (Context context, SharedPreferences prefs)
+    {
+
+        String tordAppString = prefs.getString(PREFS_KEY_TORIFIED, "");
+        String[] tordApps;
+
+        StringTokenizer st = new StringTokenizer(tordAppString,"|");
+        tordApps = new String[st.countTokens()];
+        int tordIdx = 0;
+        while (st.hasMoreTokens())
+        {
+            tordApps[tordIdx++] = st.nextToken();
+        }
+
+        Arrays.sort(tordApps);
+
+        //else load the apps up
+        PackageManager pMgr = context.getPackageManager();
+
+        List<ApplicationInfo> lAppInfo = pMgr.getInstalledApplications(0);
+
+        Iterator<ApplicationInfo> itAppInfo = lAppInfo.iterator();
+
+        ArrayList<TorifiedApp> apps = new ArrayList<TorifiedApp>();
+
+        ApplicationInfo aInfo = null;
+
+        int appIdx = 0;
+        TorifiedApp app = null;
+
+        while (itAppInfo.hasNext())
+        {
+            aInfo = itAppInfo.next();
+
+            app = new TorifiedApp();
+
+            try {
+                PackageInfo pInfo = pMgr.getPackageInfo(aInfo.packageName, PackageManager.GET_PERMISSIONS);
+
+                if (pInfo != null && pInfo.requestedPermissions != null)
+                {
+                    for (String permInfo:pInfo.requestedPermissions)
+                    {
+                        if (permInfo.equals("android.permission.INTERNET"))
+                        {
+                            app.setUsesInternet(true);
+
+                        }
+                    }
+
+                }
+
+
+            } catch (Exception e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+
+            if ((aInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 1)
+            {
+                //System app
+                app.setUsesInternet(true);
+            }
+
+
+            if (!app.usesInternet())
+                continue;
+            else
+            {
+                apps.add(app);
+            }
+
+
+            app.setEnabled(aInfo.enabled);
+            app.setUid(aInfo.uid);
+            app.setUsername(pMgr.getNameForUid(app.getUid()));
+            app.setProcname(aInfo.processName);
+            app.setPackageName(aInfo.packageName);
+
+            try
+            {
+                app.setName(pMgr.getApplicationLabel(aInfo).toString());
+            }
+            catch (Exception e)
+            {
+                app.setName(aInfo.packageName);
+            }
+
+
+            //app.setIcon(pMgr.getApplicationIcon(aInfo));
+
+            // check if this application is allowed
+            if (Arrays.binarySearch(tordApps, app.getUsername()) >= 0) {
+                app.setTorified(true);
+            }
+            else
+            {
+                app.setTorified(false);
+            }
+
+            appIdx++;
+        }
+
+        Collections.sort(apps);
+
+        return apps;
+    }
+    
+    /*
+     * activate means whether to apply the users preferences
+     * or clear them out
+     * 
+     * the idea is that if Tor is off then transproxy is off
+     */
+    private boolean disableTransparentProxy () throws Exception
+     {
+        
+         debug ("Transparent Proxying: disabling...");
+
+         if (mTransProxy == null)
+             mTransProxy = new TorTransProxy(this, fileXtables);
+ 
+         mTransProxy.setTransparentProxyingAll(this, false);
+        ArrayList<TorifiedApp> apps = getApps(this, TorServiceUtils.getSharedPrefs(getApplicationContext()));
+        mTransProxy.setTransparentProxyingByApp(this, apps, false);
+    
+         return true;
+     }
+    
+    private boolean runTorShellCmd() throws Exception
+    {
+
+        String torrcPath = new File(appBinHome, TORRC_ASSET_KEY).getCanonicalPath();
+
+        updateTorConfigFile();
+        
+        sendCallbackLogMessage(getString(R.string.status_starting_up));
+        
+        String torCmdString = fileTor.getCanonicalPath()
+                + " DataDirectory " + appCacheHome.getCanonicalPath()
+                + " --defaults-torrc " + torrcPath
+                + " -f " + torrcPath + ".custom";
+    
+        debug(torCmdString);
+        
+        Process proc = exec(torCmdString + " --verify-config", true);
+
+        int exitCode = proc.exitValue();
+        String output = "";
+       // String output = shellTorCommand.getOutput();
+        
+        if (exitCode != 0)
+        {
+            logNotice("Tor (" + exitCode + "): " + output);
+            throw new Exception ("Torrc config did not verify");
+            
+        }
+
+        proc = exec(torCmdString, true);
+        exitCode = proc.exitValue();
+        output = "";// shellTorCommand.getOutput();
+        
+        if (exitCode != 0)
+        {
+            logNotice("Tor (" + exitCode + "): " + output);
+            //throw new Exception ("unable to start");
+            return false;
+        }
+        
+        //now try to connect
+        mLastProcessId = initControlConnection (100,false);
+
+        if (mLastProcessId == -1)
+        {
+            logNotice(getString(R.string.couldn_t_start_tor_process_) + "; exit=" + exitCode);
+            sendCallbackLogMessage(getString(R.string.couldn_t_start_tor_process_));
+        
+            throw new Exception ("Unable to start Tor");
+        }
+        else
+        {
+        
+            logNotice("Tor started; process id=" + mLastProcessId);
+           
+        }
+        
+        return true;
+    }
+
+    private Process exec (String cmd, boolean wait) throws Exception
+    {
+        Process proc = Runtime.getRuntime().exec(cmd);
+
+        if (wait)
+            proc.waitFor();
+
+        return proc;
+    }
+    
+    private void updatePolipoConfig () throws FileNotFoundException, IOException
+    {
+        
+
+        File file = new File(appBinHome, POLIPOCONFIG_ASSET_KEY);
+        
+        Properties props = new Properties();
+        
+        props.load(new FileReader(file));
+        
+        props.put("socksParentProxy", "\"localhost:" + mPortSOCKS + "\"");
+        props.put("proxyPort",mPortHTTP+"");
+        
+        props.store(new FileWriter(file), "updated");
+        
+    }
+    
+    
+    private void runPolipoShellCmd () throws Exception
+    {
+        
+        logNotice( "Starting polipo process");
+        
+            int polipoProcId = TorServiceUtils.findProcessId(filePolipo.getCanonicalPath());
+
+            StringBuilder log = null;
+            
+            int attempts = 0;
+            
+            if (polipoProcId == -1)
+            {
+                log = new StringBuilder();
+                
+                updatePolipoConfig();
+                
+                String polipoConfigPath = new File(appBinHome, POLIPOCONFIG_ASSET_KEY).getCanonicalPath();
+                String cmd = (filePolipo.getCanonicalPath() + " -c " + polipoConfigPath + " &");
+
+                Process proc = exec(cmd,false);
+
+                //wait one second to make sure it has started up
+                Thread.sleep(1000);
+                
+                while ((polipoProcId = TorServiceUtils.findProcessId(filePolipo.getCanonicalPath())) == -1  && attempts < MAX_START_TRIES)
+                {
+                    logNotice("Couldn't find Polipo process... retrying...\n" + log);
+                    Thread.sleep(3000);
+                    attempts++;
+                }
+                
+                logNotice(log.toString());
+            }
+            
+            sendCallbackLogMessage(getString(R.string.privoxy_is_running_on_port_) + mPortHTTP);
+            
+            logNotice("Polipo process id=" + polipoProcId);
+            
+    }
+    
+    private int initControlConnection (int maxTries, boolean isReconnect) throws Exception, RuntimeException
+    {
+            int controlPort = -1;
+            int attempt = 0;
+
+            logNotice( "Waiting for control port...");
+            
+            while (conn == null && attempt++ < maxTries)
+            {
+                try
+                {
+                    
+                    controlPort = getControlPort();
+                    
+                    if (controlPort != -1)
+                    {
+                        logNotice( "Connecting to control port: " + controlPort);
+                        
+                        torConnSocket = new Socket(IP_LOCALHOST, controlPort);
+                        torConnSocket.setSoTimeout(CONTROL_SOCKET_TIMEOUT);
+                        
+                        conn = new TorControlConnection(torConnSocket);
+                        conn.launchThread(true);//is daemon
+                        
+                        break;
+                    }
+                    
+                }
+                catch (Exception ce)
+                {
+                    conn = null;
+                //    logException( "Error connecting to Tor local control port: " + ce.getMessage(),ce);
+                    
+                }
+                
+                
+                try {
+                //    logNotice("waiting...");
+                    Thread.sleep(1000); }
+                catch (Exception e){}
+            }
+            
+            if (conn != null)
+            {
+                    logNotice( "SUCCESS connected to Tor control port.");
+                    
+                    File fileCookie = new File(appCacheHome, TOR_CONTROL_COOKIE);
+                    
+                    if (fileCookie.exists())
+                    {
+                        byte[] cookie = new byte[(int)fileCookie.length()];
+                        DataInputStream fis = new DataInputStream(new FileInputStream(fileCookie));
+                        fis.read(cookie);
+                        fis.close();
+                        conn.authenticate(cookie);
+                                
+                        logNotice( "SUCCESS - authenticated to control port.");
+                        
+                        sendCallbackLogMessage(getString(R.string.tor_process_starting) + ' ' + getString(R.string.tor_process_complete));
+    
+                        addEventHandler();
+                    
+                        String torProcId = conn.getInfo("process/pid");
+                        
+                         String confSocks = conn.getInfo("net/listeners/socks");
+                         StringTokenizer st = new StringTokenizer(confSocks," ");
+
+                         confSocks = st.nextToken().split(":")[1];
+                         confSocks = confSocks.substring(0,confSocks.length()-1);
+                         mPortSOCKS = Integer.parseInt(confSocks);
+                                                  
+                        return Integer.parseInt(torProcId);
+                        
+                    }
+                    else
+                    {
+                        logNotice ("Tor authentication cookie does not exist yet");
+                        conn = null;
+                                
+                    }
+                }
+                
+            
+            return -1;
+
+    }
+    
+    private int getControlPort ()
+    {
+        int result = -1;
+        
+        try
+        {
+            if (fileControlPort.exists())
+            {
+                debug("Reading control port config file: " + fileControlPort.getCanonicalPath());
+                BufferedReader bufferedReader = new BufferedReader(new FileReader(fileControlPort));
+                String line = bufferedReader.readLine();
+                
+                if (line != null)
+                {
+                    String[] lineParts = line.split(":");
+                    result = Integer.parseInt(lineParts[1]);
+                }
+                
+
+                bufferedReader.close();
+
+                //store last valid control port
+                SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+                prefs.edit().putInt("controlport", result).commit();
+                
+            }
+            else
+            {
+                debug("Control Port config file does not yet exist (waiting for tor): " + fileControlPort.getCanonicalPath());
+                
+            }
+            
+            
+        }
+        catch (FileNotFoundException e)
+        {    
+            debug("unable to get control port; file not found");
+        }
+        catch (Exception e)
+        {    
+            debug("unable to read control port config file");
+        }
+
+        return result;
+    }
+
+    public void addEventHandler () throws Exception
+    {
+           // We extend NullEventHandler so that we don't need to provide empty
+           // implementations for all the events we don't care about.
+           // ...
+        logNotice( "adding control port event handler");
+
+        conn.setEventHandler(this);
+        
+        conn.setEvents(Arrays.asList(new String[]{
+              "ORCONN", "CIRC", "NOTICE", "WARN", "ERR","BW"}));
+          // conn.setEvents(Arrays.asList(new String[]{
+            //  "DEBUG", "INFO", "NOTICE", "WARN", "ERR"}));
+
+        logNotice( "SUCCESS added control port event handler");
+    }
+    
+        /**
+         * Returns the port number that the HTTP proxy is running on
+         */
+        public int getHTTPPort() throws RemoteException {
+            return mPortHTTP;
+        }
+
+        
+        /**
+         * Returns the port number that the HTTP proxy is running on
+         */
+        public int getSOCKSPort() throws RemoteException {
+            return mPortSOCKS;
+        }
+
+         @TargetApi(14)
+        public void enableVpnProxy () {
+        	debug ("enabling VPN Proxy");
+            
+            Prefs.putUseVpn(true);
+            processTransparentProxying();
+            
+            updateConfiguration("DNSPort",TOR_VPN_DNS_LISTEN_ADDRESS + ":" + TorServiceConstants.TOR_DNS_PORT_DEFAULT,false);
+            
+          //  if (mVpnManager == null)
+         //   	mVpnManager = new OrbotVpnManager (this);
+            
+            Intent intent = new Intent();
+            intent.setAction("start");            
+            intent.putExtra("torSocks", mPortSOCKS);
+            
+           // mVpnManager.handleIntent(new Builder(),intent);
+           
+        }
+
+    @TargetApi(14)
+        public void clearVpnProxy ()
+        {   
+        	debug ("clearing VPN Proxy");
+            Prefs.putUseVpn(false);
+            processTransparentProxying();
+
+            /**
+            if (mVpnManager != null)
+            {
+            	Intent intent = new Intent();
+                intent.setAction("stop");
+            	mVpnManager.handleIntent(new Builder(), intent);
+            	mVpnManager = null;
+            }  **/
+                             
+        }
+
+    @Override
+    public void message(String severity, String msg) {
+        logNotice(severity + ": " + msg);
+    }
+
+    @Override
+    public void newDescriptors(List<String> orList) {
+    }
+
+    @Override
+    public void orConnStatus(String status, String orName) {
+        
+            StringBuilder sb = new StringBuilder();
+            sb.append("orConnStatus (");
+            sb.append(parseNodeName(orName) );
+            sb.append("): ");
+            sb.append(status);
+            
+            debug(sb.toString());
+    }
+
+    @Override
+    public void streamStatus(String status, String streamID, String target) {
+        
+            StringBuilder sb = new StringBuilder();
+            sb.append("StreamStatus (");
+            sb.append((streamID));
+            sb.append("): ");
+            sb.append(status);
+            
+            logNotice(sb.toString());
+    }
+
+    @Override
+    public void unrecognized(String type, String msg) {
+        
+            StringBuilder sb = new StringBuilder();
+            sb.append("Message (");
+            sb.append(type);
+            sb.append("): ");
+            sb.append(msg);
+            
+            logNotice(sb.toString());
+    }
+
+    @Override
+    public void bandwidthUsed(long read, long written) {
+    
+        if (read != lastRead || written != lastWritten)
+        {
+            StringBuilder sb = new StringBuilder();                
+            sb.append(formatCount(read));
+            sb.append(" \u2193");            
+            sb.append(" / ");
+            sb.append(formatCount(written));
+            sb.append(" \u2191");            
+               
+            int iconId = R.drawable.ic_stat_tor;
+            
+            if (read > 0 || written > 0)
+                iconId = R.drawable.ic_stat_tor_xfer;
+            
+            if (mConnectivity && Prefs.persistNotifications())
+                  showToolbarNotification(sb.toString(), NOTIFY_ID, iconId);
+
+            mTotalTrafficWritten += written;
+            mTotalTrafficRead += read;
+        }
+        
+        lastWritten = written;
+        lastRead = read;
+        
+        sendCallbackBandwidth(lastWritten, lastRead, mTotalTrafficWritten, mTotalTrafficRead);
+    }
+    
+    private String formatCount(long count) {
+        // Converts the supplied argument into a string.
+
+        // Under 2Mb, returns "xxx.xKb"
+        // Over 2Mb, returns "xxx.xxMb"
+ 	if (mNumberFormat != null)
+        	if (count < 1e6)
+            		return mNumberFormat.format(Math.round((float)((int)(count*10/1024))/10)) + "kbps";
+        	else
+            		return mNumberFormat.format(Math.round((float)((int)(count*100/1024/1024))/100)) + "mbps";
+	else
+		return "";
+        
+           //return count+" kB";
+    }
+    
+    public void circuitStatus(String status, String circID, String path) {
+        
+        /* once the first circuit is complete, then announce that Orbot is on*/
+        if (mCurrentStatus == STATUS_STARTING && TextUtils.equals(status, "BUILT"))
+            sendCallbackStatus(STATUS_ON);
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("Circuit (");
+        sb.append((circID));
+        sb.append(") ");
+        sb.append(status);
+        sb.append(": ");
+        
+        StringTokenizer st = new StringTokenizer(path,",");
+        Node node = null;
+        
+        while (st.hasMoreTokens())
+        {
+            String nodePath = st.nextToken();
+            node = new Node();
+            
+            String[] nodeParts;
+            
+            if (nodePath.contains("="))
+                nodeParts = nodePath.split("=");
+            else
+                nodeParts = nodePath.split("~");
+            
+            if (nodeParts.length == 1)
+            {
+                node.id = nodeParts[0].substring(1);
+                node.name = node.id;
+            }
+            else if (nodeParts.length == 2)
+            {
+                node.id = nodeParts[0].substring(1);
+                node.name = nodeParts[1];
+            }
+            
+            node.status = status;
+            
+            sb.append(node.name);
+            
+            if (st.hasMoreTokens())
+                sb.append (" > ");
+        }
+        
+        if (Prefs.useDebugLogging())
+            debug(sb.toString());
+        else if(status.equals("BUILT"))
+            logNotice(sb.toString());
+        else if (status.equals("CLOSED"))
+            logNotice(sb.toString());
+
+        if (Prefs.expandedNotifications())
+        {
+            //get IP from last nodename
+            if(status.equals("BUILT")){
+                
+                if (node.ipAddress == null)
+                    mExecutor.execute(new ExternalIPFetcher(node));
+                
+                hmBuiltNodes.put(node.id, node);
+            }
+            
+            if (status.equals("CLOSED"))
+            {
+                hmBuiltNodes.remove(node.id);
+                
+            }
+        }
+    
+    }
+    
+    private HashMap<String,Node> hmBuiltNodes = new HashMap<String,Node>();
+    
+    class Node
+    {
+        String status;
+        String id;
+        String name;
+        String ipAddress;
+        String country;
+        String organization;
+    }
+    
+    private class ExternalIPFetcher implements Runnable {
+
+        private Node mNode;
+        private int MAX_ATTEMPTS = 3;
+        private final static String ONIONOO_BASE_URL = "https://onionoo.torproject.org/details?fields=country_name,as_name,or_addresses&lookup=";
+        
+        public ExternalIPFetcher (Node node)
+        {
+            mNode = node;
+        }
+        
+        public void run ()
+        {
+            
+            for (int i = 0; i < MAX_ATTEMPTS; i++)
+            {
+                if (conn != null)
+                {
+                    try {
+
+                    	URLConnection conn = null;
+                    	
+                        Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 8118));
+                        conn = new URL(ONIONOO_BASE_URL + mNode.id).openConnection(proxy);
+    
+                        conn.setRequestProperty("Connection","Close");
+                        conn.setConnectTimeout(60000);
+                        conn.setReadTimeout(60000);
+                        
+                        InputStream is = conn.getInputStream();
+                        
+                        BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+    
+                        // getting JSON string from URL
+                        
+                        StringBuffer json = new StringBuffer();
+                        String line = null;
+    
+                        while ((line = reader.readLine())!=null)
+                            json.append(line);
+                        
+                        JSONObject jsonNodeInfo = new org.json.JSONObject(json.toString());
+                            
+                        JSONArray jsonRelays = jsonNodeInfo.getJSONArray("relays");
+                        
+                        if (jsonRelays.length() > 0)
+                        {
+                            mNode.ipAddress = jsonRelays.getJSONObject(0).getJSONArray("or_addresses").getString(0).split(":")[0];
+                            mNode.country = jsonRelays.getJSONObject(0).getString("country_name");
+                            mNode.organization = jsonRelays.getJSONObject(0).getString("as_name");
+                            
+                            StringBuffer sbInfo = new StringBuffer();
+                            sbInfo.append(mNode.ipAddress);
+                             
+                             if (mNode.country != null)
+                                 sbInfo.append(' ').append(mNode.country);
+                         
+                             if (mNode.organization != null)
+                                 sbInfo.append(" (").append(mNode.organization).append(')');
+                         
+                             logNotice(sbInfo.toString());
+                            
+                        }
+                        
+                        reader.close();
+                        is.close();
+                        
+                        break;
+                        
+                    } catch (Exception e) {
+                        
+                        debug ("Error getting node details from onionoo: " + e.getMessage());
+                        
+                        
+                    }
+                }
+            }
+        }
+        
+        
+    }
+    
+    private String parseNodeName(String node)
+    {
+        if (node.indexOf('=')!=-1)
+        {
+            return (node.substring(node.indexOf("=")+1));
+        }
+        else if (node.indexOf('~')!=-1)
+        {
+            return (node.substring(node.indexOf("~")+1));
+        }
+        else
+            return node;
+    }
+
+        public void processTransparentProxying() {
+            try{
+                if (Prefs.useRoot())
+                {
+                    if (Prefs.useTransparentProxying()){
+                        enableTransparentProxy();
+                    } else {
+                        disableTransparentProxy();
+                    }
+                }
+            } catch (Exception e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+            
+        }
+
+        public String getInfo (String key) {
+            try {
+                if(conn !=null){
+                    String m = conn.getInfo(key);
+                    return m;
+                }
+            }
+            catch(Exception ioe){
+            //    Log.e(TAG,"Unable to get Tor information",ioe);
+                logNotice("Unable to get Tor information"+ioe.getMessage());
+            }
+            return null;
+        }
+        
+        public String getConfiguration (String name)
+        {
+            try
+            {
+                if (conn != null)
+                {
+                    StringBuffer result = new StringBuffer();
+                    
+                    List<ConfigEntry> listCe = conn.getConf(name);
+                    
+                    Iterator<ConfigEntry> itCe = listCe.iterator();
+                    ConfigEntry ce = null;
+                    
+                       
+                    
+                    while (itCe.hasNext())
+                    {
+                        ce = itCe.next();
+                        
+                        result.append(ce.key);
+                        result.append(' ');
+                        result.append(ce.value);
+                        result.append('\n');
+                    }
+                    
+                          return result.toString();
+                }
+            }
+            catch (Exception ioe)
+            {
+                
+                logException("Unable to get Tor configuration: " + ioe.getMessage(),ioe);
+            }
+            
+            return null;
+        }
+        
+        private final static String RESET_STRING = "=\"\"";
+        /**
+         * Set configuration
+         **/
+        public boolean updateConfiguration (String name, String value, boolean saveToDisk)
+        { 
+            
+            
+            if (configBuffer == null)
+                configBuffer = new ArrayList<String>();
+            
+            if (resetBuffer == null)
+                resetBuffer = new ArrayList<String>();
+            
+            if (value == null || value.length() == 0)
+            {
+                resetBuffer.add(name + RESET_STRING);
+                
+            }
+            else
+            {
+                StringBuffer sbConf = new StringBuffer();
+                sbConf.append(name);
+                sbConf.append(' ');
+                sbConf.append(value);
+                
+                configBuffer.add(sbConf.toString());
+            }
+            
+            return false;
+        }
+        
+        public void setTorNetworkEnabled (final boolean isEnabled)
+        {
+
+        	
+        	//it is possible to not have a connection yet, and someone might try to newnym
+            if (conn != null)
+            {
+                new Thread ()
+                {
+                    public void run ()
+                    {
+                        try { 
+                            
+                            conn.setConf("DisableNetwork", isEnabled ? "0" : "1");
+                        	
+                        }
+                        catch (Exception ioe){
+                            debug("error requesting newnym: " + ioe.getLocalizedMessage());
+                        }
+                    }
+                }.start();
+            }
+        	
+        }
+        
+        public void newIdentity () 
+        {
+            //it is possible to not have a connection yet, and someone might try to newnym
+            if (conn != null)
+            {
+                new Thread ()
+                {
+                    public void run ()
+                    {
+                        try { 
+                            
+                            conn.signal("NEWNYM"); 
+                        
+                        }
+                        catch (Exception ioe){
+                            
+                        	debug("error requesting newnym: " + ioe.getLocalizedMessage());
+                            
+                        }
+                    }
+                }.start();
+            }
+        }
+        
+        public boolean saveConfiguration ()
+        {
+            try
+            {
+                if (conn != null)
+                {
+                    
+                     if (resetBuffer != null && resetBuffer.size() > 0)
+                        {    
+                         for (String value : configBuffer)
+                             {
+                                 
+                              //   debug("removing torrc conf: " + value);
+                                 
+                                 
+                             }
+                         
+                           // conn.resetConf(resetBuffer);
+                            resetBuffer = null;
+                        }
+                  
+                     if (configBuffer != null && configBuffer.size() > 0)
+                        {
+                             
+                                 for (String value : configBuffer)
+                                 {
+                                     
+                                     debug("Setting torrc conf: " + value);
+                                     
+                                     
+                                 }
+                                 
+                             conn.setConf(configBuffer);
+                                 
+                            configBuffer = null;
+                        }
+                  
+                          // Flush the configuration to disk.
+                    //this is doing bad things right now NF 22/07/10
+                          //conn.saveConf();
+    
+                          return true;
+                }
+            }
+            catch (Exception ioe)
+            {
+                logException("Unable to update Tor configuration: " + ioe.getMessage(),ioe);
+            }
+            
+            return false;
+        }
+
+    private void sendCallbackBandwidth(long upload, long download, long written, long read)    {
+        Intent intent = new Intent(LOCAL_ACTION_BANDWIDTH);
+
+        intent.putExtra("up",upload);
+	      intent.putExtra("down",download);
+	      intent.putExtra("written",written);
+	      intent.putExtra("read",read);
+	      intent.putExtra(EXTRA_STATUS, mCurrentStatus);
+
+        LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
+    }
+
+    private void sendCallbackLogMessage (String logMessage)
+    {
+        
+        Intent intent = new Intent(LOCAL_ACTION_LOG);
+          // You can also include some extra data.
+          intent.putExtra(LOCAL_EXTRA_LOG, logMessage);
+	      intent.putExtra(EXTRA_STATUS, mCurrentStatus);
+
+          LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
+
+    }
+    
+    private void sendCallbackStatus(String currentStatus) {
+        mCurrentStatus = currentStatus;
+        Intent intent = getActionStatusIntent(currentStatus);
+        // send for Orbot internals, using secure local broadcast
+        sendBroadcastOnlyToOrbot(intent);
+        // send for any apps that are interested
+        sendBroadcast(intent);
+    }
+
+    /**
+     * Send a secure broadcast only to Orbot itself
+     * @see {@link ContextWrapper#sendBroadcast(Intent)}
+     * @see {@link LocalBroadcastManager}
+     */
+    private boolean sendBroadcastOnlyToOrbot(Intent intent) {
+        return LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
+    }
+
+    private Intent getActionStatusIntent(String currentStatus) {
+        Intent intent = new Intent(ACTION_STATUS);
+        intent.putExtra(EXTRA_STATUS, currentStatus);
+        return intent;
+    }
+
+    /*
+     *  Another way to do this would be to use the Observer pattern by defining the 
+     *  BroadcastReciever in the Android manifest.
+     */
+    private final BroadcastReceiver mNetworkStateReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+
+        	if (mCurrentStatus != STATUS_ON)
+        		return;
+        	
+            SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+
+            boolean doNetworKSleep = prefs.getBoolean(OrbotConstants.PREF_DISABLE_NETWORK, true);
+            
+            final ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+            final NetworkInfo netInfo = cm.getActiveNetworkInfo();
+
+            boolean newConnectivityState = false;
+            int newNetType = -1;
+            
+            boolean isChanged = false;
+            
+            if (netInfo!=null)
+            	newNetType = netInfo.getType();
+
+            isChanged = ((mNetworkType != newNetType)&&(mConnectivity != newConnectivityState));
+            
+            if(netInfo != null && netInfo.isConnected()) {
+                // WE ARE CONNECTED: DO SOMETHING
+            	newConnectivityState = true;
+            }   
+            else {
+                // WE ARE NOT: DO SOMETHING ELSE
+            	newConnectivityState = false;
+            }
+            
+            mNetworkType = newNetType;
+        	mConnectivity = newConnectivityState;
+        	
+            if (doNetworKSleep)
+            {
+	            setTorNetworkEnabled (mConnectivity);
+	            
+	            if (!mConnectivity)
+                {
+                    logNotice(context.getString(R.string.no_network_connectivity_putting_tor_to_sleep_));
+                    showToolbarNotification(getString(R.string.no_internet_connection_tor),NOTIFY_ID,R.drawable.ic_stat_tor_off);
+                    
+                }
+                else
+                {
+                    logNotice(context.getString(R.string.network_connectivity_is_good_waking_tor_up_));
+                    showToolbarNotification(getString(R.string.status_activated),NOTIFY_ID,R.drawable.ic_stat_tor);
+                }
+	            
+	            //is this a change in state?
+	            if (isChanged)
+	            {
+	                try {
+	                    
+	                    if (mCurrentStatus != STATUS_OFF)
+	                    {
+	                        if (mConnectivity)
+	                        {
+	                            if (Prefs.useRoot() && Prefs.useTransparentProxying() && Prefs.transProxyNetworkRefresh())
+	                            {
+	                                
+
+	                                disableTransparentProxy();
+	                                enableTransparentProxy();
+
+	                            }
+	                        }
+	                    }
+	                    
+	                } catch (Exception e) {
+	                    logException ("error updating state after network restart",e);
+	                }
+		            
+	            }
+            }
+
+            
+        }
+    };
+
+    private boolean processSettingsImpl (StringBuffer extraLines) throws IOException
+    {
+        logNotice(getString(R.string.updating_settings_in_tor_service));
+        
+        SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+        
+        boolean useBridges = Prefs.bridgesEnabled();
+
+        boolean becomeRelay = prefs.getBoolean(OrbotConstants.PREF_OR, false);
+        boolean ReachableAddresses = prefs.getBoolean(OrbotConstants.PREF_REACHABLE_ADDRESSES,false);
+        boolean enableHiddenServices = prefs.getBoolean("pref_hs_enable", false);
+
+        boolean enableStrictNodes = prefs.getBoolean("pref_strict_nodes", false);
+        String entranceNodes = prefs.getString("pref_entrance_nodes", "");
+        String exitNodes = prefs.getString("pref_exit_nodes", "");
+        String excludeNodes = prefs.getString("pref_exclude_nodes", "");
+        
+        if (!useBridges)
+        {
+           
+            extraLines.append("UseBridges 0").append('\n');
+
+	        if (Prefs.useVpn()) //set the proxy here if we aren't using a bridge
+	        {
+	        	
+	        	if (!mIsLollipop)
+	        	{
+		        	String proxyType = "socks5";
+		        	//TODO VPN extraLines.append(proxyType + "Proxy" + ' ' + OrbotVpnManager.sSocksProxyLocalhost + ':' + OrbotVpnManager.sSocksProxyServerPort).append('\n');
+	        	};
+			
+	        }
+	        else
+	        {
+		        String proxyType = prefs.getString("pref_proxy_type", null);
+		        if (proxyType != null && proxyType.length() > 0)
+		        {
+		            String proxyHost = prefs.getString("pref_proxy_host", null);
+		            String proxyPort = prefs.getString("pref_proxy_port", null);
+		            String proxyUser = prefs.getString("pref_proxy_username", null);
+		            String proxyPass = prefs.getString("pref_proxy_password", null);
+		            
+		            if ((proxyHost != null && proxyHost.length()>0) && (proxyPort != null && proxyPort.length() > 0))
+		            {
+		            	extraLines.append(proxyType + "Proxy" + ' ' + proxyHost + ':' + proxyPort).append('\n');
+		                
+		                if (proxyUser != null && proxyPass != null)
+		                {
+		                    if (proxyType.equalsIgnoreCase("socks5"))
+		                    {
+		                    	extraLines.append("Socks5ProxyUsername" + ' ' + proxyUser).append('\n');
+		                    	extraLines.append("Socks5ProxyPassword" + ' ' + proxyPass).append('\n');
+		                    }
+		                    else
+		                    	extraLines.append(proxyType + "ProxyAuthenticator" + ' ' + proxyUser + ':' + proxyPort).append('\n');
+		                    
+		                }
+		                else if (proxyPass != null)
+		                	extraLines.append(proxyType + "ProxyAuthenticator" + ' ' + proxyUser + ':' + proxyPort).append('\n');
+		                
+		                
+		
+		            }
+		        }
+	        }
+        }
+        else
+        {
+        
+
+            extraLines.append("UseBridges 1").append('\n');
+            
+            String bridgeList = new String(Prefs.getBridgesList().getBytes("ISO-8859-1"));
+            
+            if (bridgeList != null && bridgeList.length() > 1) //longer then 1 = some real values here
+            {
+	            
+	            //check if any PT bridges are needed
+	            boolean obfsBridges = bridgeList.contains("obfs3")||bridgeList.contains("obfs4")||bridgeList.contains("scramblesuit");
+            
+	            if (obfsBridges)
+	            {
+	                extraLines.append("ClientTransportPlugin obfs3 exec " + fileObfsclient.getCanonicalPath()).append('\n');
+	                extraLines.append("ClientTransportPlugin obfs4 exec " + fileObfsclient.getCanonicalPath()).append('\n');
+	                extraLines.append("ClientTransportPlugin scramblesuit exec " + fileObfsclient.getCanonicalPath()).append('\n');
+	            }
+	            
+	            boolean meekBridges = bridgeList.contains("meek");
+	            if (meekBridges)
+	            {
+	            	extraLines.append("ClientTransportPlugin meek_lite exec " + fileObfsclient.getCanonicalPath()).append('\n');
+	            }
+	            
+	            String[] bridgeListLines = bridgeList.split("\\r?\\n");
+
+	            for (String bridgeConfigLine : bridgeListLines)
+	            {
+	                if (!TextUtils.isEmpty(bridgeConfigLine))
+	                {
+	                	extraLines.append("Bridge ");
+	                	
+	                	//bridgeConfigLine = bridgeConfigLine.replace('�', ' ');
+	                	
+	                	StringTokenizer st = new StringTokenizer (bridgeConfigLine," ");
+	                	while (st.hasMoreTokens())
+	                		extraLines.append(st.nextToken()).append(' ');
+	                	
+	                	extraLines.append("\n");
+	                	
+	                }
+	
+	            }
+	            
+            }
+            else
+            {
+            	//time to do autobridges, aka meek
+
+            	debug ("Using meek bridges");
+                
+            //	String bridgeConfig = "meek exec " + fileMeekclient.getCanonicalPath();
+            	String bridgeConfig = "meek_lite exec " + fileObfsclient.getCanonicalPath();
+            	
+            	extraLines.append("ClientTransportPlugin" + ' ' + bridgeConfig).append('\n');
+            
+            	int meekIdx = 2; //let's use Azure by default
+            	
+            	if (bridgeList != null && bridgeList.length() == 1)
+            	{
+            	  try 
+            	  {
+            		  meekIdx = Integer.parseInt(bridgeList);
+            		  
+            		  if (meekIdx+1 > BRIDGES_MEEK.length)
+            			  throw new Exception("not valid meek idx");
+            	  }
+            	  catch (Exception e)
+            	  {
+            		  debug("invalid meek type; please enter 0=Google, 1=AWS, 2=Azure");
+            	  }
+            	}
+            	
+            	extraLines.append("Bridge " + BRIDGES_MEEK[meekIdx]).append('\n');            	
+            	
+            }
+ 
+        }
+        
+                  
+        //only apply GeoIP if you need it
+        File fileGeoIP = new File(appBinHome, GEOIP_ASSET_KEY);
+        File fileGeoIP6 = new File(appBinHome, GEOIP6_ASSET_KEY);
+            
+        if (fileGeoIP.exists())
+        {
+	        extraLines.append("GeoIPFile" + ' ' + fileGeoIP.getCanonicalPath()).append('\n');
+	        extraLines.append("GeoIPv6File" + ' ' + fileGeoIP6.getCanonicalPath()).append('\n');
+        }
+        
+        if (!TextUtils.isEmpty(entranceNodes))
+        	extraLines.append("EntryNodes" + ' ' + entranceNodes).append('\n');
+       
+        if (!TextUtils.isEmpty(exitNodes))
+        	extraLines.append("ExitNodes" + ' ' + exitNodes).append('\n');
+        
+        if (!TextUtils.isEmpty(excludeNodes))
+        	extraLines.append("ExcludeNodes" + ' ' + excludeNodes).append('\n');
+        
+        extraLines.append("StrictNodes" + ' ' + (enableStrictNodes ? "1" : "0")).append('\n');
+
+        try
+        {
+            if (ReachableAddresses)
+            {
+                String ReachableAddressesPorts =
+                    prefs.getString(OrbotConstants.PREF_REACHABLE_ADDRESSES_PORTS, "*:80,*:443");
+                
+                extraLines.append("ReachableAddresses" + ' ' + ReachableAddressesPorts).append('\n');
+
+            }
+            
+        }
+        catch (Exception e)
+        {
+           showToolbarNotification (getString(R.string.your_reachableaddresses_settings_caused_an_exception_),ERROR_NOTIFY_ID,R.drawable.ic_stat_notifyerr);
+
+           return false;
+        }
+
+        try
+        {
+            if (becomeRelay && (!useBridges) && (!ReachableAddresses))
+            {
+                int ORPort =  Integer.parseInt(prefs.getString(OrbotConstants.PREF_OR_PORT, "9001"));
+                String nickname = prefs.getString(OrbotConstants.PREF_OR_NICKNAME, "Orbot");
+
+                String dnsFile = writeDNSFile ();
+                
+                extraLines.append("ServerDNSResolvConfFile" + ' ' + dnsFile).append('\n');
+                extraLines.append("ORPort" + ' ' + ORPort).append('\n');
+                extraLines.append("Nickname" + ' ' + nickname).append('\n');
+                extraLines.append("ExitPolicy" + ' ' + "reject *:*").append('\n');
+
+            }
+        }
+        catch (Exception e)
+        {
+             showToolbarNotification (getString(R.string.your_relay_settings_caused_an_exception_),ERROR_NOTIFY_ID,R.drawable.ic_stat_notifyerr);
+
+          
+            return false;
+        }
+
+        if (enableHiddenServices)
+        {
+            logNotice("hidden services are enabled");
+            
+            //updateConfiguration("RendPostPeriod", "600 seconds", false); //possible feature to investigate
+            
+            String hsPorts = prefs.getString("pref_hs_ports","");
+            
+            StringTokenizer st = new StringTokenizer (hsPorts,",");
+            String hsPortConfig = null;
+            int hsPort = -1;
+            
+            while (st.hasMoreTokens())
+            {
+                try
+                {
+                    hsPortConfig = st.nextToken().trim();
+                    
+                    if (hsPortConfig.indexOf(":")==-1) //setup the port to localhost if not specifed
+                    {
+                        hsPortConfig = hsPortConfig + " 127.0.0.1:" + hsPortConfig;
+                    }
+                    
+                    hsPort = Integer.parseInt(hsPortConfig.split(" ")[0]);
+
+                    String hsDirPath = new File(appCacheHome,"hs" + hsPort).getCanonicalPath();
+                    
+                    debug("Adding hidden service on port: " + hsPortConfig);
+                    
+                    extraLines.append("HiddenServiceDir" + ' ' + hsDirPath).append('\n');
+                    extraLines.append("HiddenServicePort" + ' ' + hsPortConfig).append('\n');
+                    
+
+                } catch (NumberFormatException e) {
+                    Log.e(OrbotConstants.TAG,"error parsing hsport",e);
+                } catch (Exception e) {
+                    Log.e(OrbotConstants.TAG,"error starting share server",e);
+                }
+            }
+            
+            
+        }
+        
+        return true;
+    }
+    
+    public static String flattenToAscii(String string) {
+        char[] out = new char[string.length()];
+        string = Normalizer.normalize(string, Normalizer.Form.NFD);
+        int j = 0;
+        for (int i = 0, n = string.length(); i < n; ++i) {
+            char c = string.charAt(i);
+            if (c <= '\u007F') out[j++] = c;
+        }
+        return new String(out);
+    }
+
+    //using Google DNS for now as the public DNS server
+    private String writeDNSFile () throws IOException
+    {
+        File file = new File(appBinHome, "resolv.conf");
+
+        PrintWriter bw = new PrintWriter(new FileWriter(file));
+        bw.println("nameserver 8.8.8.8");
+        bw.println("nameserver 8.8.4.4");
+        bw.close();
+    
+        return file.getCanonicalPath();
+    }
+
+    @SuppressLint("NewApi")
+    @Override
+    public void onTrimMemory(int level) {
+        super.onTrimMemory(level);
+        
+        switch (level)
+        {
+        
+            case TRIM_MEMORY_BACKGROUND:
+                debug("trim memory requested: app in the background");
+            return;
+            
+        /**
+        public static final int TRIM_MEMORY_BACKGROUND
+        Added in API level 14
+        Level for onTrimMemory(int): the process has gone on to the LRU list. This is a good opportunity to clean up resources that can efficiently and quickly be re-built if the user returns to the app.
+        Constant Value: 40 (0x00000028)
+        */
+        
+            case TRIM_MEMORY_COMPLETE:
+
+                debug("trim memory requested: cleanup all memory");
+            return;
+        /**
+        public static final int TRIM_MEMORY_COMPLETE
+        Added in API level 14
+        Level for onTrimMemory(int): the process is nearing the end of the background LRU list, and if more memory isn't found soon it will be killed.
+        Constant Value: 80 (0x00000050)
+        */
+            case TRIM_MEMORY_MODERATE:
+
+                debug("trim memory requested: clean up some memory");
+            return;
+                
+        /**
+        public static final int TRIM_MEMORY_MODERATE
+        Added in API level 14
+        Level for onTrimMemory(int): the process is around the middle of the background LRU list; freeing memory can help the system keep other processes running later in the list for better overall performance.
+        Constant Value: 60 (0x0000003c)
+        */
+        
+            case TRIM_MEMORY_RUNNING_CRITICAL:
+
+                debug("trim memory requested: memory on device is very low and critical");
+            return;
+        /**
+        public static final int TRIM_MEMORY_RUNNING_CRITICAL
+        Added in API level 16
+        Level for onTrimMemory(int): the process is not an expendable background process, but the device is running extremely low on memory and is about to not be able to keep any background processes running. Your running process should free up as many non-critical resources as it can to allow that memory to be used elsewhere. The next thing that will happen after this is onLowMemory() called to report that nothing at all can be kept in the background, a situation that can start to notably impact the user.
+        Constant Value: 15 (0x0000000f)
+        */
+        
+            case TRIM_MEMORY_RUNNING_LOW:
+
+                debug("trim memory requested: memory on device is running low");
+            return;
+        /**
+        public static final int TRIM_MEMORY_RUNNING_LOW
+        Added in API level 16
+        Level for onTrimMemory(int): the process is not an expendable background process, but the device is running low on memory. Your running process should free up unneeded resources to allow that memory to be used elsewhere.
+        Constant Value: 10 (0x0000000a)
+        */
+            case TRIM_MEMORY_RUNNING_MODERATE:
+
+                debug("trim memory requested: memory on device is moderate");
+            return;
+        /**
+        public static final int TRIM_MEMORY_RUNNING_MODERATE
+        Added in API level 16
+        Level for onTrimMemory(int): the process is not an expendable background process, but the device is running moderately low on memory. Your running process may want to release some unneeded resources for use elsewhere.
+        Constant Value: 5 (0x00000005)
+        */
+            case TRIM_MEMORY_UI_HIDDEN:
+
+                debug("trim memory requested: app is not showing UI anymore");
+            return;
+                
+        /**
+        public static final int TRIM_MEMORY_UI_HIDDEN
+        Level for onTrimMemory(int): the process had been showing a user interface, and is no longer doing so. Large allocations with the UI should be released at this point to allow memory to be better managed.
+        Constant Value: 20 (0x00000014)
+        */
+        }
+        
+    }
+
+    @Override
+    public IBinder onBind(Intent arg0) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+    
+    private void setExitNode (String newExits)
+    {
+    	SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+        
+    	if (TextUtils.isEmpty(newExits))
+    	{
+    		prefs.edit().remove("pref_exit_nodes").apply();
+    		
+    		if (conn != null)
+        	{
+    	    	try
+    	    	{
+    	    		ArrayList<String> resetBuffer = new ArrayList<String>();
+    	    		resetBuffer.add("ExitNodes");
+    	    		resetBuffer.add("StrictNodes");
+    	    		conn.resetConf(resetBuffer);
+    	    		conn.setConf("DisableNetwork","1");
+    	    		conn.setConf("DisableNetwork","0");
+    	    		
+    	    	}
+    	    	catch (Exception ioe)
+    	    	{
+    	    		Log.e(OrbotConstants.TAG, "Connection exception occured resetting exits",ioe);
+    	    	}
+        	}
+    	}
+    	else
+    	{
+    		prefs.edit().putString("pref_exit_nodes", newExits).apply();
+    		
+    		if (conn != null)
+        	{
+    	    	try
+    	    	{
+                    File fileGeoIP = new File(appBinHome, GEOIP_ASSET_KEY);
+                    File fileGeoIP6 = new File(appBinHome, GEOIP6_ASSET_KEY);
+                        
+                    conn.setConf("GeoIPFile",fileGeoIP.getCanonicalPath());
+                    conn.setConf("GeoIPv6File",fileGeoIP6.getCanonicalPath());
+                    
+    	    		conn.setConf("ExitNodes", newExits);
+    	    		conn.setConf("StrictNodes","1");
+    	    		
+    	    		conn.setConf("DisableNetwork","1");
+    	    		conn.setConf("DisableNetwork","0");
+
+    	    	}
+    	    	catch (Exception ioe)
+    	    	{
+    	    		Log.e(OrbotConstants.TAG, "Connection exception occured resetting exits",ioe);
+    	    	}
+        	}
+    	}
+
+    }
+
+}
diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
new file mode 100644
index 0000000..e2f0964
--- /dev/null
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
@@ -0,0 +1,163 @@
+/* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - http://openideals.com/guardian */
+/* See LICENSE for licensing information */
+
+package org.torproject.android.service;
+
+import android.content.Intent;
+
+public interface TorServiceConstants {
+
+	public final static String TOR_APP_USERNAME = "org.torproject.android";
+	public final static String BROWSER_APP_USERNAME = "info.guardianproject.orfox";
+	
+	public final static String DIRECTORY_TOR_BINARY = "bin";
+	public final static String DIRECTORY_TOR_DATA = "data";
+	
+	//name of the tor C binary
+	public final static String TOR_ASSET_KEY = "tor";	
+	
+	//torrc (tor config file)
+	public final static String TORRC_ASSET_KEY = "torrc";
+	public final static String TORRCDIAG_ASSET_KEY = "torrcdiag";
+	public final static String TORRC_TETHER_KEY = "torrctether";
+	
+	public final static String TOR_CONTROL_COOKIE = "control_auth_cookie";
+	
+	//privoxy
+	public final static String POLIPO_ASSET_KEY = "polipo";
+	
+	//privoxy.config
+	public final static String POLIPOCONFIG_ASSET_KEY = "torpolipo.conf";
+	
+	//geoip data file asset key
+	public final static String GEOIP_ASSET_KEY = "geoip";
+	public final static String GEOIP6_ASSET_KEY = "geoip6";
+
+	//various console cmds
+	public final static String SHELL_CMD_CHMOD = "chmod";
+	public final static String SHELL_CMD_KILL = "kill -9";
+	public final static String SHELL_CMD_RM = "rm";
+	public final static String SHELL_CMD_PS = "toolbox ps";
+	public final static String SHELL_CMD_PS_ALT = "ps";
+    
+    
+	//public final static String SHELL_CMD_PIDOF = "pidof";
+	public final static String SHELL_CMD_LINK = "ln -s";
+	public final static String SHELL_CMD_CP = "cp";
+	
+
+	public final static String CHMOD_EXE_VALUE = "770";
+
+	public final static int FILE_WRITE_BUFFER_SIZE = 1024;
+
+	public final static String IP_LOCALHOST = "127.0.0.1";
+	public final static int UPDATE_TIMEOUT = 1000;
+	public final static int TOR_TRANSPROXY_PORT_DEFAULT = 9040;
+	
+	public final static int STANDARD_DNS_PORT = 53;
+	public final static int TOR_DNS_PORT_DEFAULT = 5400;
+	public final static String TOR_VPN_DNS_LISTEN_ADDRESS = "127.0.0.1";
+	
+	public final static int CONTROL_PORT_DEFAULT = 9051;
+    public final static int HTTP_PROXY_PORT_DEFAULT = 8118; // like Privoxy!
+    public final static int SOCKS_PROXY_PORT_DEFAULT = 9050;
+
+    
+	//path to check Tor against
+	public final static String URL_TOR_CHECK = "https://check.torproject.org";
+
+    //control port 
+    public final static String TOR_CONTROL_PORT_MSG_BOOTSTRAP_DONE = "Bootstrapped 100%";
+    public final static String LOG_NOTICE_HEADER = "NOTICE";
+    public final static String LOG_NOTICE_BOOTSTRAPPED = "Bootstrapped";
+    
+    /**
+     * A request to Orbot to transparently start Tor services
+     */
+    public final static String ACTION_START = "org.torproject.android.intent.action.START";
+    /**
+     * {@link Intent} send by Orbot with {@code ON/OFF/STARTING/STOPPING} status
+     */
+    public final static String ACTION_STATUS = "org.torproject.android.intent.action.STATUS";
+    /**
+     * {@code String} that contains a status constant: {@link #STATUS_ON},
+     * {@link #STATUS_OFF}, {@link #STATUS_STARTING}, or
+     * {@link #STATUS_STOPPING}
+     */
+    public final static String EXTRA_STATUS = "org.torproject.android.intent.extra.STATUS";
+    /**
+     * A {@link String} {@code packageName} for Orbot to direct its status reply
+     * to, used in {@link #ACTION_START} {@link Intent}s sent to Orbot
+     */
+    public final static String EXTRA_PACKAGE_NAME = "org.torproject.android.intent.extra.PACKAGE_NAME";
+    /**
+     * The SOCKS proxy settings in URL form.
+     */
+    public final static String EXTRA_SOCKS_PROXY = "org.torproject.android.intent.extra.SOCKS_PROXY";
+    public final static String EXTRA_SOCKS_PROXY_HOST = "org.torproject.android.intent.extra.SOCKS_PROXY_HOST";
+    public final static String EXTRA_SOCKS_PROXY_PORT = "org.torproject.android.intent.extra.SOCKS_PROXY_PORT";
+    /**
+     * The HTTP proxy settings in URL form.
+     */
+    public final static String EXTRA_HTTP_PROXY = "org.torproject.android.intent.extra.HTTP_PROXY";
+    public final static String EXTRA_HTTP_PROXY_HOST = "org.torproject.android.intent.extra.HTTP_PROXY_HOST";
+    public final static String EXTRA_HTTP_PROXY_PORT = "org.torproject.android.intent.extra.HTTP_PROXY_PORT";
+
+    public final static String LOCAL_ACTION_LOG = "log";
+    public final static String LOCAL_ACTION_BANDWIDTH = "bandwidth";
+    public final static String LOCAL_EXTRA_LOG = "log";
+
+    /**
+     * All tor-related services and daemons are stopped
+     */
+    public final static String STATUS_OFF = "OFF";
+    /**
+     * All tor-related services and daemons have completed starting
+     */
+    public final static String STATUS_ON = "ON";
+    public final static String STATUS_STARTING = "STARTING";
+    public final static String STATUS_STOPPING = "STOPPING";
+    /**
+     * The user has disabled the ability for background starts triggered by
+     * apps. Fallback to the old Intent that brings up Orbot.
+     */
+    public final static String STATUS_STARTS_DISABLED = "STARTS_DISABLED";
+
+    // actions for internal command Intents
+    public static final String CMD_SIGNAL_HUP = "signal_hup";
+    public static final String CMD_STATUS = "status";
+    public static final String CMD_FLUSH = "flush";
+    public static final String CMD_NEWNYM = "newnym";
+    public static final String CMD_VPN = "vpn";
+    public static final String CMD_VPN_CLEAR = "vpnclear";
+    public static final String CMD_UPDATE_TRANS_PROXY = "update";
+    public static final String CMD_SET_EXIT = "setexit";
+    
+    
+    
+    public static final String BINARY_TOR_VERSION = "0.2.7.5-020120160125";
+    public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED";
+    
+    //obfsproxy 
+    public static final String OBFSCLIENT_ASSET_KEY = "obfs4proxy";
+    
+   // public static final String MEEK_ASSET_KEY = "meek-client";
+    
+	//name of the iptables binary
+	public final static String IPTABLES_ASSET_KEY = "xtables";	
+
+	//DNS daemon for TCP DNS over TOr
+	public final static String PDNSD_ASSET_KEY = "pdnsd";
+
+	//EXIT COUNTRY CODES
+	public final static String[] COUNTRY_CODES = {"DE","AT","SE","CH","IS","CA","US","ES","FR","BG","PL","AU","BR","CZ","DK","FI","GB","HU","NL","JP","RO","RU","SG","SK"};
+	
+	//MEEK BRIDGEs	
+	public final static String[] BRIDGES_MEEK = 
+		{
+			"meek_lite 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com",
+			"meek_lite 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com",
+			"meek_lite 0.0.2.0:3 url=https://az668014.vo.msecnd.net/ front=ajax.aspnetcdn.com"
+		};
+
+}
diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorServiceUtils.java b/orbotservice/src/main/java/org/torproject/android/service/TorServiceUtils.java
new file mode 100644
index 0000000..fc48faa
--- /dev/null
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceUtils.java
@@ -0,0 +1,184 @@
+/* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - http://openideals.com/guardian */
+/* See LICENSE for licensing information */
+package org.torproject.android.service;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.ConnectException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.util.StringTokenizer;
+
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.util.Log;
+
+public class TorServiceUtils implements TorServiceConstants {
+
+	
+	
+	public static int findProcessId(String command) throws IOException 
+	{
+		int procId = findProcessIdWithPS(command);
+		return procId;
+	}
+	
+	//use 'pidof' command
+	/**
+	public static int findProcessIdWithPidOf(String command) throws Exception
+	{
+		
+		int procId = -1;
+		
+		Runtime r = Runtime.getRuntime();
+		    	
+		Process procPs = null;
+		
+		String baseName = new File(command).getName();
+		//fix contributed my mikos on 2010.12.10
+		procPs = r.exec(new String[] {SHELL_CMD_PIDOF, baseName});
+        //procPs = r.exec(SHELL_CMD_PIDOF);
+            
+        BufferedReader reader = new BufferedReader(new InputStreamReader(procPs.getInputStream()));
+        String line = null;
+
+        while ((line = reader.readLine())!=null)
+        {
+        
+        	try
+        	{
+        		//this line should just be the process id
+        		procId = Integer.parseInt(line.trim());
+        		break;
+        	}
+        	catch (NumberFormatException e)
+        	{
+        		Log.e("TorServiceUtils","unable to parse process pid: " + line,e);
+        	}
+        }
+            
+       
+        return procId;
+
+	}
+	 * @throws IOException */
+	
+	//use 'ps' command
+	public static int findProcessIdWithPS(String command) throws IOException 
+	{
+		
+		int procId = -1;
+		
+		Runtime r = Runtime.getRuntime();
+		    	
+		Process procPs = null;
+		
+        procPs = r.exec(SHELL_CMD_PS); // this is the android ps <name> command
+            
+        BufferedReader reader = new BufferedReader(new InputStreamReader(procPs.getInputStream()));
+        String line = null;
+        
+        while ((line = reader.readLine())!=null)
+        {
+        	if (line.contains("PID"))
+        		continue;
+        		
+        	if (line.contains(command))
+        	{
+        		
+        		String[] lineParts = line.split("\\s+");
+        		
+        	    try { 
+        	        
+        	        procId = Integer.parseInt(lineParts[1]); //for most devices it is the second number
+        	    } catch(NumberFormatException e) {
+        	    	procId = Integer.parseInt(lineParts[0]); //but for samsungs it is the first
+        	        
+        	    }
+        		
+        		
+        		break;
+        	}
+        }
+        
+        try { procPs.destroy(); } catch (Exception e) {} // try to destroy just to make sure we clean it up
+       
+        return procId;
+
+	}
+	
+	public static SharedPreferences getSharedPrefs (Context context)
+	{
+		if (Build.VERSION.SDK_INT>=Build.VERSION_CODES.HONEYCOMB)
+			return context.getSharedPreferences(OrbotConstants.PREF_TOR_SHARED_PREFS,0 | Context.MODE_MULTI_PROCESS);
+		else
+			return context.getSharedPreferences(OrbotConstants.PREF_TOR_SHARED_PREFS,Context.MODE_PRIVATE);
+		
+	}
+	
+	public static void killProcess(File fileProcBin) throws Exception {
+        killProcess(fileProcBin, "-9"); // this is -KILL
+    }
+
+    public static void killProcess(File fileProcBin, String signal) throws Exception {
+        int procId = -1;
+        int killAttempts = 0;
+
+        while ((procId = TorServiceUtils.findProcessId(fileProcBin.getCanonicalPath())) != -1) {
+            killAttempts++;
+            //logNotice("Found " + fileProcBin.getName() + " PID=" + procId + " - killing now...");
+            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.
+             */
+
+			/**
+            if (Prefs.useRoot() && killAttempts > 2) {
+                shell = Shell.startRootShell();
+                Log.i(OrbotApp.TAG, "using a root shell");
+            } else {
+                shell = Shell.startShell();
+            }*/
+
+            Runtime.getRuntime().exec("busybox killall " + signal + " " + fileProcBin.getName());
+			Runtime.getRuntime().exec("toolbox kill " + signal + " " + pidString);
+			Runtime.getRuntime().exec("busybox kill " + signal + " " + pidString);
+			Runtime.getRuntime().exec("kill " + signal + " " + pidString);
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                // ignored
+            }
+
+            if (killAttempts > 4)
+                throw new Exception("Cannot kill: " + fileProcBin.getAbsolutePath());
+        }
+    }
+
+    public static boolean isPortOpen(final String ip, final int port, final int timeout) {
+        try {
+            Socket socket = new Socket();
+            socket.connect(new InetSocketAddress(ip, port), timeout);
+            socket.close();
+            return true;
+        } 
+
+        catch(ConnectException ce){
+            //ce.printStackTrace();
+            return false;
+        }
+
+        catch (Exception ex) {
+            //ex.printStackTrace();
+            return false;
+        }
+    }
+}
diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorTransProxy.java b/orbotservice/src/main/java/org/torproject/android/service/TorTransProxy.java
new file mode 100644
index 0000000..5f2b29f
--- /dev/null
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorTransProxy.java
@@ -0,0 +1,753 @@
+package org.torproject.android.service;
+
+import java.io.File;
+import java.util.ArrayList;
+
+import android.content.Context;
+
+public class TorTransProxy implements TorServiceConstants {
+	
+	private String mSysIptables = null;
+	private TorService mTorService = null;
+	private File mFileXtables = null;
+	
+	private final static String ALLOW_LOCAL = " ! -d 127.0.0.1";
+
+	private int mTransProxyPort = TOR_TRANSPROXY_PORT_DEFAULT;
+	private int mDNSPort = TOR_DNS_PORT_DEFAULT;
+	
+	public TorTransProxy (TorService torService, File fileXTables)
+	{
+		mTorService = torService;
+		mFileXtables = fileXTables;	
+	}
+	
+	public void setTransProxyPort (int transProxyPort)
+	{
+		mTransProxyPort = transProxyPort;
+	}
+	
+	public void setDNSPort (int dnsPort)
+	{
+		mDNSPort = dnsPort;
+	}
+	
+	public String getIpTablesPath (Context context)
+	{
+
+		String ipTablesPath = null;
+
+		if (Prefs.useSystemIpTables())
+		{
+			ipTablesPath = findSystemIPTables();
+		}
+		else
+		{
+			ipTablesPath = mFileXtables.getAbsolutePath();
+			ipTablesPath += " iptables"; //append subcommand since we are using xtables now
+			
+		}
+			
+		return ipTablesPath;
+	}
+	
+	public String getIp6TablesPath (Context context)
+	{
+
+		String ipTablesPath = null;
+		
+		if (Prefs.useSystemIpTables())
+		{
+			ipTablesPath = findSystemIP6Tables();
+		}
+		else
+		{
+			ipTablesPath = mFileXtables.getAbsolutePath();
+			ipTablesPath += " ip6tables"; //append subcommand since we are using xtables now
+			
+		}
+			
+		return ipTablesPath;
+	
+	}
+	
+	private String findSystemIPTables ()
+	{
+		if (mSysIptables != null)
+		{
+			return mSysIptables;
+		}
+		else
+		{
+		
+			//if the user wants us to use the built-in iptables, then we have to find it
+			File fileIpt = new File("/system/xbin/iptables");
+			
+			if (fileIpt.exists())
+				mSysIptables = fileIpt.getAbsolutePath();
+			else
+			{
+			
+				fileIpt = new File("/system/bin/iptables");
+				
+				if (fileIpt.exists())
+					mSysIptables = fileIpt.getAbsolutePath();
+			}
+		}
+		
+		return mSysIptables;
+	}
+	
+
+	
+	private String findSystemIP6Tables ()
+	{
+		
+		//if the user wants us to use the built-in iptables, then we have to find it
+		File fileIpt = new File("/system/xbin/ip6tables");
+		
+		if (fileIpt.exists())
+			mSysIptables = fileIpt.getAbsolutePath();
+		else
+		{
+		
+			fileIpt = new File("/system/bin/ip6tables");
+			
+			if (fileIpt.exists())
+				mSysIptables = fileIpt.getAbsolutePath();
+		}
+		
+		
+		return mSysIptables;
+	}
+	
+	/*
+	public int flushIptablesAll(Context context) throws Exception {
+		
+		String ipTablesPath = getIpTablesPath(context);
+	
+    	final StringBuilder script = new StringBuilder();
+    	
+    	StringBuilder res = new StringBuilder();
+    	int code = -1;
+
+		script.append(ipTablesPath);
+		script.append(" -t nat");
+		script.append(" -F || exit\n");
+	
+		script.append(ipTablesPath);
+		script.append(" -t filter");
+		script.append(" -F || exit\n");
+    	
+    	String[] cmd = {script.toString()};	    	
+		code = TorServiceUtils.doShellCommand(cmd, res, true, true);		
+		String msg = res.toString();
+		
+		TorService.logMessage(cmd[0] + ";errCode=" + code + ";resp=" + msg);
+			
+		
+		return code;
+	
+	}*/
+	
+	/*
+	public static int purgeIptablesByApp(Context context, TorifiedApp[] apps) throws Exception {
+
+		//restoreDNSResolvConf(); //not working yet
+		
+		String ipTablesPath = new File(context.getDir("bin", 0),"iptables").getAbsolutePath();
+		
+    	final StringBuilder script = new StringBuilder();
+    	
+    	StringBuilder res = new StringBuilder();
+    	int code = -1;
+    	
+		for (int i = 0; i < apps.length; i++)
+		{
+			//flush nat for every app
+			script.append(ipTablesPath);
+			script.append(" -t nat -m owner --uid-owner ");
+			script.append(tApp.getUid());
+			script.append(" -F || exit\n");
+		
+			script.append(ipTablesPath);
+			script.append(" -t filter -m owner --uid-owner ");
+			script.append(tApp.getUid());
+			script.append(" -F || exit\n");
+				
+		}
+		
+    	
+    	String[] cmd = {script.toString()};	    	
+		code = TorServiceUtils.doShellCommand(cmd, res, true, true);		
+		String msg = res.toString();
+		logNotice(cmd[0] + ";errCode=" + code + ";resp=" + msg);
+			
+		
+		return code;
+		
+	}*/
+	
+	
+	/*
+	 // 9/19/2010 - NF This code is in process... /etc path on System partition
+	 // is read-only on Android for now.
+	public static int redirectDNSResolvConf () throws Exception
+	{
+    	StringBuilder script = new StringBuilder();
+    	StringBuilder res = new StringBuilder();
+    	int code = -1;
+    	
+		//mv resolv.conf to resolve.conf.bak
+		String cmd = "mv /etc/resolv.conf /etc/resolv.conf.bak";
+		script.append(cmd);
+		
+		//create new resolve.conf pointing to localhost/127.0.0.1
+		cmd = "echo \"nameserver 127.0.0.1\" > /etc/resolv.conf";
+		script.append(cmd);
+		
+		String[] cmdFlush = {script.toString()};
+		code = TorServiceUtils.doShellCommand(cmdFlush, res, true, true);
+		//String msg = res.toString(); //get stdout from command
+		
+		
+		return code;
+	}
+	
+	public static int restoreDNSResolvConf () throws Exception
+	{
+		StringBuilder script = new StringBuilder();
+    	StringBuilder res = new StringBuilder();
+    	int code = -1;
+    	
+		//mv resolv.conf to resolve.conf.bak
+		String cmd = "mv /etc/resolv.conf.bak /etc/resolv.conf";
+		script.append(cmd);
+		script.append(" || exit\n");
+		
+		String[] cmdFlush = {script.toString()};
+		code = TorServiceUtils.doShellCommand(cmdFlush, res, true, true);
+		//String msg = res.toString(); //get stdout from command
+		
+		return code;
+	}
+	*/
+	/*
+	public int testOwnerModule(Context context, String ipTablesPath) throws Exception
+	{
+
+		TorBinaryInstaller.assertIpTablesBinaries(context, false);
+		
+		boolean runRoot = true;
+    	boolean waitFor = true;
+    	
+    	int torUid = context.getApplicationInfo().uid;
+
+    	StringBuilder script = new StringBuilder();
+    	
+    	StringBuilder res = new StringBuilder();
+    	int code = -1;
+    	
+    	// Allow everything for Tor
+		script.append(ipTablesPath);
+		script.append(" -A OUTPUT");
+		script.append(" -t filter");
+		script.append(" -m owner --uid-owner ");
+		script.append(torUid);
+		script.append(" -j ACCEPT");
+		script.append(" || exit\n");
+		
+		script.append(ipTablesPath);
+		script.append(" -D OUTPUT");
+		script.append(" -t filter");
+		script.append(" -m owner --uid-owner ");
+		script.append(torUid);
+		script.append(" -j ACCEPT");
+		script.append(" || exit\n");
+		
+		String[] cmdAdd = {script.toString()};    	
+    	
+		code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor);
+		String msg = res.toString();
+		
+		if (mTorService != null)
+		logMessage(cmdAdd[0] + ";errCode=" + code + ";resp=" + msg);
+		
+		
+		return code;
+    }	
+	*/
+	
+	/*
+	public int clearTransparentProxyingByApp (Context context, ArrayList<TorifiedApp> apps) throws Exception
+	{
+		boolean runRoot = true;
+    	boolean waitFor = true;
+    	
+		String ipTablesPath = getIpTablesPath(context);
+		
+    	StringBuilder script = new StringBuilder();
+    	
+    	StringBuilder res = new StringBuilder();
+    	int code = -1;
+    	
+    	String chainName = "ORBOT";
+		String jumpChainName = "OUTPUT";
+		
+		script.append(ipTablesPath);
+    	script.append(" --flush ").append(chainName); //delete previous user-defined chain
+    	script.append(" || exit\n");
+    	
+		script.append(ipTablesPath);
+    	script.append(" -D ").append(jumpChainName);
+    	script.append(" -j ").append(chainName);
+    	script.append(" || exit\n");
+    	
+    	script.append(ipTablesPath);
+    	script.append(" -X ").append(chainName); //delete previous user-defined chain
+    	script.append(" || exit\n");
+
+		String[] cmdAdd = {script.toString()};    	
+    		
+		code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot, waitFor);
+		String msg = res.toString();
+		
+		logMessage(cmdAdd[0] + ";errCode=" + code + ";resp=" + msg);
+		
+		return code;
+	}*/
+	
+	public int setTransparentProxyingByApp(Context context, ArrayList<TorifiedApp> apps, boolean enableRule) throws Exception
+	{
+		String ipTablesPath = getIpTablesPath(context);
+		
+    	//StringBuilder script = new StringBuilder();
+    	
+		String action = " -A ";
+    	String srcChainName = "OUTPUT";
+
+		if (!enableRule)
+			action = " -D ";
+		
+    	//run the delete commands in a separate process as it might error out
+    	//String[] cmdExecClear = {script.toString()};    	    	
+		//code = TorServiceUtils.doShellCommand(cmdExecClear, res, runRoot, waitFor);
+		
+		//reset script
+		
+    	int lastExit = -1;
+    	StringBuilder script;    	
+    	
+
+		// Same for DNS
+		script = new StringBuilder();
+		script.append(ipTablesPath);
+		script.append(" -t nat");
+		script.append(action).append(srcChainName);
+		script.append(" -p udp");
+		//script.append(" -m owner --uid-owner ");
+		//script.append(tApp.getUid());
+		//script.append(" -m udp --dport "); 
+		script.append(" --dport ");
+		script.append(STANDARD_DNS_PORT);
+		script.append(" -j REDIRECT --to-ports ");
+		script.append(mDNSPort);
+		executeCommand (script.toString());
+		
+    	// Allow everything for Tor
+    	
+		//build up array of shell cmds to execute under one root context
+		for (TorifiedApp tApp:apps)
+		{
+
+			if (((!enableRule) || tApp.isTorified())
+					&& (!tApp.getUsername().equals(TOR_APP_USERNAME))
+					) //if app is set to true
+			{
+				
+				
+				logMessage("transproxy for app: " + tApp.getUsername() + " (" + tApp.getUid() + "): enable=" + enableRule);
+				
+				dropAllIPv6Traffic(context, tApp.getUid(),enableRule);
+				
+		    	script = new StringBuilder();
+
+				// Allow loopback
+		    	/**
+				script.append(ipTablesPath);
+				script.append(" -t filter");
+		        script.append(action).append(srcChainName);
+				script.append(" -m owner --uid-owner ");
+				script.append(tApp.getUid());
+				script.append(" -o lo");
+				script.append(" -j ACCEPT");
+
+				executeCommand (shell, script.toString());
+				script = new StringBuilder();
+				**/
+				
+				// Set up port redirection
+		    	script.append(ipTablesPath);
+		    	script.append(" -t nat");
+		    	script.append(action).append(srcChainName);				
+				script.append(" -p tcp");
+				script.append(ALLOW_LOCAL);
+				script.append(" -m owner --uid-owner ");
+				script.append(tApp.getUid());
+				script.append(" -m tcp --syn");
+				script.append(" -j REDIRECT --to-ports ");
+				script.append(mTransProxyPort);
+				
+				executeCommand (script.toString());
+				
+				
+				script = new StringBuilder();
+				
+				// Reject all other outbound packets
+				script.append(ipTablesPath);
+				script.append(" -t filter");
+		        script.append(action).append(srcChainName);
+				script.append(" -m owner --uid-owner ");
+				script.append(tApp.getUid());				
+				script.append(ALLOW_LOCAL);
+				script.append(" -j REJECT");
+
+				lastExit = executeCommand (script.toString());
+				
+		
+			}		
+		}		
+		
+		return lastExit;
+    }	
+	
+	private int executeCommand (String cmdString) throws Exception {
+
+		Process proc = Runtime.getRuntime().exec(cmdString);
+		proc.waitFor();
+		int exitCode = proc.exitValue();
+		//String output = cmd.getOutput();
+
+		
+		logMessage(cmdString + "; exit=" + exitCode);
+		
+		return exitCode;
+	}
+	
+	
+	public int enableTetheringRules (Context context) throws Exception
+	{
+		
+		String ipTablesPath = getIpTablesPath(context);
+		
+    	StringBuilder script = new StringBuilder();
+    
+    	String[] hwinterfaces = {"usb0","wl0.1"};
+    	
+    	
+    	int lastExit = -1;
+    	
+    	for (int i = 0; i < hwinterfaces.length; i++)
+    	{
+
+			script = new StringBuilder();
+	    	script.append(ipTablesPath);
+			script.append(" -t nat -A PREROUTING -i ");
+			script.append(hwinterfaces[i]);
+			script.append(" -p udp --dport 53 -j REDIRECT --to-ports ");
+			script.append(mDNSPort);
+			
+			executeCommand (script.toString());
+			script = new StringBuilder();
+			
+			
+			script = new StringBuilder();
+			script.append(ipTablesPath);
+			script.append(" -t nat -A PREROUTING -i ");
+			script.append(hwinterfaces[i]);
+			script.append(" -p tcp -j REDIRECT --to-ports ");
+			script.append(mTransProxyPort);
+			
+			lastExit = executeCommand (script.toString());
+			script = new StringBuilder();
+			
+			
+    	}
+    	
+		return lastExit;
+	}
+	
+	private void logMessage (String msg)
+	{
+		if (mTorService != null)
+			mTorService.debug(msg);
+	}
+	
+
+	
+	public int fixTransproxyLeak (Context context) throws Exception
+	{
+		String ipTablesPath = getIpTablesPath(context);
+		
+    	StringBuilder script = new StringBuilder();
+    	script.append(ipTablesPath);
+		script.append(" -I OUTPUT ! -o lo ! -d 127.0.0.1 ! -s 127.0.0.1 -p tcp -m tcp --tcp-flags ACK,FIN ACK,FIN -j DROP");
+		
+		executeCommand (script.toString());
+		script = new StringBuilder();
+		
+		script = new StringBuilder();
+		script.append(ipTablesPath);
+		script.append(" -I OUTPUT ! -o lo ! -d 127.0.0.1 ! -s 127.0.0.1 -p tcp -m tcp --tcp-flags ACK,RST ACK,RST -j DROP");
+		
+		int lastExit = executeCommand (script.toString());
+		script = new StringBuilder();
+		
+		return lastExit;
+		 
+	}
+	
+	public int dropAllIPv6Traffic (Context context, int appUid, boolean enableDrop) throws Exception {
+
+		String action = " -A ";
+		String chain = "OUTPUT";
+		
+		if (!enableDrop)
+			action = " -D ";
+		
+		String ip6tablesPath = getIp6TablesPath(context);
+    	
+    	StringBuilder script;
+
+		script = new StringBuilder();
+		script.append(ip6tablesPath);			
+		script.append(action);
+		script.append(chain);
+
+		if (appUid != -1)
+		{
+			script.append(" -m owner --uid-owner ");
+			script.append(appUid);	
+		}
+		
+		script.append(" -j DROP");
+		
+		int lastExit = executeCommand (script.toString());
+		
+		return lastExit;
+	}
+	
+	/*
+	public int clearAllIPv6Filters (Context context) throws Exception
+	{
+
+		String ip6tablesPath = getIp6TablesPath(context);
+		Shell shell = Shell.startRootShell();
+    	
+    	StringBuilder script;
+
+		script = new StringBuilder();
+		script.append(ip6tablesPath);			
+		script.append(" -t filter");
+		script.append(" -F OUTPUT");
+		int lastExit = executeCommand (shell, script.toString());
+		
+		shell.close();
+		
+		return lastExit;
+	}*/
+	
+	public int flushTransproxyRules (Context context) throws Exception {
+		int exit = -1;
+		
+		String ipTablesPath = getIpTablesPath(context);
+
+		StringBuilder script = new StringBuilder();
+		script.append(ipTablesPath);			
+		script.append(" -t nat ");
+		script.append(" -F ");
+		
+    	executeCommand (script.toString());
+		
+		script = new StringBuilder();
+		script.append(ipTablesPath);			
+		script.append(" -t filter ");
+		script.append(" -F ");
+		executeCommand (script.toString());
+		
+		dropAllIPv6Traffic(context,-1,false);
+		dropAllIPv6Traffic(context,-1,false);
+
+		
+		return exit;
+	}
+	
+	public int setTransparentProxyingAll(Context context, boolean enable) throws Exception
+	{
+	  	
+		String action = " -A ";
+    	String srcChainName = "OUTPUT";
+
+		if (!enable)
+			action = " -D ";
+
+		dropAllIPv6Traffic(context,-1,enable);
+		
+		String ipTablesPath = getIpTablesPath(context);
+		
+    	
+    	int torUid = context.getApplicationInfo().uid;
+    	
+    	StringBuilder script = new StringBuilder();
+    	
+		// Allow everything for Tor
+    	
+		script.append(ipTablesPath);			
+		script.append(" -t nat");
+		script.append(action).append(srcChainName);
+		script.append(" -m owner --uid-owner ");
+		script.append(torUid);
+		script.append(" -j ACCEPT");
+		
+		executeCommand (script.toString());
+		script = new StringBuilder();
+
+		// Allow loopback
+		
+		script.append(ipTablesPath);
+		script.append(" -t nat");
+		script.append(action).append(srcChainName);
+		script.append(" -o lo");
+		script.append(" -j ACCEPT");
+
+		executeCommand (script.toString());
+		script = new StringBuilder();
+		
+    	// Set up port redirection    	
+		script.append(ipTablesPath);		
+		script.append(" -t nat");
+		script.append(action).append(srcChainName);
+		script.append(" -p tcp");
+		script.append(ALLOW_LOCAL); //allow access to localhost
+		script.append(" -m owner ! --uid-owner ");
+		script.append(torUid);
+		script.append(" -m tcp --syn");
+		script.append(" -j REDIRECT --to-ports ");
+		script.append(mTransProxyPort);
+
+		executeCommand (script.toString());
+		script = new StringBuilder();
+		
+		// Same for DNS
+		script.append(ipTablesPath);
+		script.append(" -t nat");
+		script.append(action).append(srcChainName);
+		script.append(" -p udp");
+		script.append(ALLOW_LOCAL); //allow access to localhost
+		script.append(" -m owner ! --uid-owner ");
+		script.append(torUid);
+		//script.append(" -m udp --dport "); 
+		script.append(" --dport ");
+		script.append(STANDARD_DNS_PORT);
+		script.append(" -j REDIRECT --to-ports ");
+		script.append(mDNSPort);
+
+		executeCommand (script.toString());
+		script = new StringBuilder();
+		
+		
+		if (Prefs.useDebugLogging())
+		{
+			//XXX: Comment the following rules for non-debug builds
+			script.append(ipTablesPath);			
+			script.append(" -t filter");
+			script.append(action).append(srcChainName);
+			script.append(" -p udp");
+			script.append(" --dport ");
+			script.append(STANDARD_DNS_PORT);
+			script.append(" -j LOG");
+			script.append(" --log-prefix='ORBOT_DNSLEAK_PROTECTION'");
+			script.append(" --log-uid");
+
+			executeCommand (script.toString());
+			script = new StringBuilder();
+			
+			script.append(ipTablesPath);			
+			script.append(" -t filter");
+			script.append(action).append(srcChainName);
+	    	script.append(" -p tcp");
+			script.append(" -j LOG");
+			script.append(" --log-prefix='ORBOT_TCPLEAK_PROTECTION'");
+			script.append(" --log-uid");
+
+			executeCommand (script.toString());
+			script = new StringBuilder();
+			
+		}
+
+		//allow access to transproxy port
+		script.append(ipTablesPath);
+		script.append(" -t filter");
+		script.append(action).append(srcChainName);
+		script.append(" -p tcp");
+		script.append(" -m tcp");
+		script.append(" --dport ").append(mTransProxyPort);
+		script.append(" -j ACCEPT");
+
+		executeCommand (script.toString());
+		script = new StringBuilder();
+		
+		//allow access to local HTTP port
+		script.append(ipTablesPath);
+		script.append(" -t filter");
+		script.append(action).append(srcChainName);
+		script.append(" -p tcp");
+		script.append(" -m tcp");
+		script.append(" --dport ").append(mTorService.getHTTPPort());
+		script.append(" -j ACCEPT");
+
+		executeCommand (script.toString());
+		script = new StringBuilder();
+		
+		//allow access to local SOCKS port
+		script.append(ipTablesPath);
+		script.append(" -t filter");
+		script.append(action).append(srcChainName);
+		script.append(" -p tcp");
+		script.append(" -m tcp");
+		script.append(" --dport ").append(mTorService.getSOCKSPort());
+		script.append(" -j ACCEPT");
+
+		executeCommand (script.toString());
+		script = new StringBuilder();
+		
+		//allow access to local DNS port
+		script.append(ipTablesPath);
+		script.append(" -t filter");
+		script.append(action).append(srcChainName);
+		script.append(" -p udp");
+		script.append(" -m udp");
+		script.append(" --dport ").append(mDNSPort);
+		script.append(" -j ACCEPT");
+
+		executeCommand (script.toString());
+		script = new StringBuilder();
+		
+		// Reject all other packets
+		script.append(ipTablesPath);
+		script.append(" -t filter");
+		script.append(action).append(srcChainName);
+		script.append(" -m owner ! --uid-owner ");
+		script.append(torUid);
+		script.append(ALLOW_LOCAL); //allow access to localhost
+		script.append(" -j REJECT");
+
+		int lastExit = executeCommand (script.toString());
+		
+	//	fixTransproxyLeak (context);
+		
+    	return lastExit;
+	}	
+	
+
+}
diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorifiedApp.java b/orbotservice/src/main/java/org/torproject/android/service/TorifiedApp.java
new file mode 100644
index 0000000..bcadbae
--- /dev/null
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorifiedApp.java
@@ -0,0 +1,139 @@
+package org.torproject.android.service;
+
+import android.graphics.drawable.Drawable;
+
+public class TorifiedApp implements Comparable {
+
+	private boolean enabled;
+	private int uid;
+	private String username;
+	private String procname;
+	private String name;
+	private Drawable icon;
+	private String packageName;
+	
+	private boolean torified = false;
+	private boolean usesInternet = false;
+	
+	public boolean usesInternet() {
+		return usesInternet;
+	}
+	public void setUsesInternet(boolean usesInternet) {
+		this.usesInternet = usesInternet;
+	}
+	/**
+	 * @return the torified
+	 */
+	public boolean isTorified() {
+		return torified;
+	}
+	/**
+	 * @param torified the torified to set
+	 */
+	public void setTorified(boolean torified) {
+		this.torified = torified;
+	}
+	private int[] enabledPorts;
+	
+	/**
+	 * @return the enabledPorts
+	 */
+	public int[] getEnabledPorts() {
+		return enabledPorts;
+	}
+	/**
+	 * @param enabledPorts the enabledPorts to set
+	 */
+	public void setEnabledPorts(int[] enabledPorts) {
+		this.enabledPorts = enabledPorts;
+	}
+	/**
+	 * @return the enabled
+	 */
+	public boolean isEnabled() {
+		return enabled;
+	}
+	/**
+	 * @param enabled the enabled to set
+	 */
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+	/**
+	 * @return the uid
+	 */
+	public int getUid() {
+		return uid;
+	}
+	/**
+	 * @param uid the uid to set
+	 */
+	public void setUid(int uid) {
+		this.uid = uid;
+	}
+	/**
+	 * @return the username
+	 */
+	public String getUsername() {
+		return username;
+	}
+	/**
+	 * @param username the username to set
+	 */
+	public void setUsername(String username) {
+		this.username = username;
+	}
+	/**
+	 * @return the procname
+	 */
+	public String getProcname() {
+		return procname;
+	}
+	/**
+	 * @param procname the procname to set
+	 */
+	public void setProcname(String procname) {
+		this.procname = procname;
+	}
+	/**
+	 * @return the name
+	 */
+	public String getName() {
+		return name;
+	}
+	/**
+	 * @param name the name to set
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+
+	public Drawable getIcon() {
+		return icon;
+	}
+	
+	public void setIcon(Drawable icon) {
+		this.icon = icon;
+	}
+	
+	@Override
+	public int compareTo(Object another) {
+		
+		return this.toString().compareTo(another.toString());
+	}
+	
+	@Override
+	public String toString ()
+	{
+		return getName();
+	}
+	
+
+	public String getPackageName() {
+		return packageName;
+	}
+	public void setPackageName(String packageName) {
+		this.packageName = packageName;
+	}
+}
diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorrcConfig.java b/orbotservice/src/main/java/org/torproject/android/service/TorrcConfig.java
new file mode 100644
index 0000000..92bfb9b
--- /dev/null
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorrcConfig.java
@@ -0,0 +1,33 @@
+package org.torproject.android.service;
+
+public class TorrcConfig {
+
+}
+
+/*
+ * GeoIPFile
+ */
+/*
+HTTPProxy host[:port]
+Tor will make all its directory requests through this host:port (or host:80 if port is not specified), rather than connecting directly to any directory servers.
+
+HTTPProxyAuthenticator username:password
+If defined, Tor will use this username:password for Basic HTTP proxy authentication, as in RFC 2617. This is currently the only form of HTTP proxy authentication that Tor supports; feel free to submit a patch if you want it to support others.
+
+HTTPSProxy host[:port]
+Tor will make all its OR (SSL) connections through this host:port (or host:443 if port is not specified), via HTTP CONNECT rather than connecting directly to servers. You may want to set FascistFirewall to restrict the set of ports you might try to connect to, if your HTTPS proxy only allows connecting to certain ports.
+
+HTTPSProxyAuthenticator username:password
+If defined, Tor will use this username:password for Basic HTTPS proxy authentication, as in RFC 2617. This is currently the only form of HTTPS proxy authentication that Tor supports; feel free to submit a patch if you want it to support others.
+
+Socks4Proxy host[:port]
+Tor will make all OR connections through the SOCKS 4 proxy at host:port (or host:1080 if port is not specified).
+
+Socks5Proxy host[:port]
+Tor will make all OR connections through the SOCKS 5 proxy at host:port (or host:1080 if port is not specified).
+
+Socks5ProxyUsername username
+
+Socks5ProxyPassword password
+If defined, authenticate to the SOCKS 5 server using username and password in accordance to RFC 1929. Both username and password must be between 1 and 255 characters.
+*/
\ No newline at end of file
diff --git a/orbotservice/src/main/java/org/torproject/android/service/Utils.java b/orbotservice/src/main/java/org/torproject/android/service/Utils.java
new file mode 100644
index 0000000..a89e03f
--- /dev/null
+++ b/orbotservice/src/main/java/org/torproject/android/service/Utils.java
@@ -0,0 +1,100 @@
+/* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - http://openideals.com/guardian */
+/* See LICENSE for licensing information */
+
+
+package org.torproject.android.service;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+public class Utils {
+
+
+	 public static String readString (InputStream stream)
+	    {
+	    	String line = null;
+	    
+	    	StringBuffer out = new StringBuffer();
+	    	
+	    	try {
+		    	BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
+
+				while ((line = reader.readLine()) != null)
+				{
+					out.append(line);
+					out.append('\n');
+					
+				}
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			
+			return out.toString();
+	    	
+	    }
+	/*
+	 * Load the log file text
+	 */
+	 public static String loadTextFile (String path)
+	    {
+	    	String line = null;
+	    
+	    	StringBuffer out = new StringBuffer();
+	    	
+	    	try {
+		    	BufferedReader reader = new BufferedReader((new FileReader(new File(path))));
+
+				while ((line = reader.readLine()) != null)
+				{
+					out.append(line);
+					out.append('\n');
+					
+				}
+				
+				reader.close();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			
+			return out.toString();
+	    	
+	    }
+	 
+
+		/*
+		 * Load the log file text
+		 */
+		 public static boolean saveTextFile (String path, String contents)
+		    {
+			 	
+		    	try {
+		    		
+		    		 FileWriter writer = new FileWriter( path, false );
+                     writer.write( contents );
+                     
+                     writer.close();
+
+                     
+		    		
+		    		return true;
+			    	
+				} catch (IOException e) {
+				//	Log.d(TAG, "error writing file: " + path, e);
+						e.printStackTrace();
+					return false;
+				}
+				
+				
+		    	
+		    }
+	
+
+
+}
diff --git a/orbotservice/src/main/res/drawable-hdpi-v11/ic_stat_notifyerr.png b/orbotservice/src/main/res/drawable-hdpi-v11/ic_stat_notifyerr.png
new file mode 100644
index 0000000..1f97a9e
Binary files /dev/null and b/orbotservice/src/main/res/drawable-hdpi-v11/ic_stat_notifyerr.png differ
diff --git a/orbotservice/src/main/res/drawable-hdpi-v11/ic_stat_tor.png b/orbotservice/src/main/res/drawable-hdpi-v11/ic_stat_tor.png
new file mode 100644
index 0000000..b4d2e33
Binary files /dev/null and b/orbotservice/src/main/res/drawable-hdpi-v11/ic_stat_tor.png differ
diff --git a/orbotservice/src/main/res/drawable-hdpi-v11/ic_stat_tor_off.png b/orbotservice/src/main/res/drawable-hdpi-v11/ic_stat_tor_off.png
new file mode 100644
index 0000000..6df646e
Binary files /dev/null and b/orbotservice/src/main/res/drawable-hdpi-v11/ic_stat_tor_off.png differ
diff --git a/orbotservice/src/main/res/drawable-hdpi-v11/ic_stat_tor_xfer.png b/orbotservice/src/main/res/drawable-hdpi-v11/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..3d75721
Binary files /dev/null and b/orbotservice/src/main/res/drawable-hdpi-v11/ic_stat_tor_xfer.png differ
diff --git a/orbotservice/src/main/res/drawable-hdpi-v11/inverse.png b/orbotservice/src/main/res/drawable-hdpi-v11/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/orbotservice/src/main/res/drawable-hdpi-v11/inverse.png differ
diff --git a/orbotservice/src/main/res/drawable-hdpi-v9/ic_stat_notifyerr.png b/orbotservice/src/main/res/drawable-hdpi-v9/ic_stat_notifyerr.png
new file mode 100644
index 0000000..58fc5ae
Binary files /dev/null and b/orbotservice/src/main/res/drawable-hdpi-v9/ic_stat_notifyerr.png differ
diff --git a/orbotservice/src/main/res/drawable-hdpi-v9/ic_stat_tor.png b/orbotservice/src/main/res/drawable-hdpi-v9/ic_stat_tor.png
new file mode 100644
index 0000000..1dfdc09
Binary files /dev/null and b/orbotservice/src/main/res/drawable-hdpi-v9/ic_stat_tor.png differ
diff --git a/orbotservice/src/main/res/drawable-hdpi-v9/inverse.png b/orbotservice/src/main/res/drawable-hdpi-v9/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/orbotservice/src/main/res/drawable-hdpi-v9/inverse.png differ
diff --git a/orbotservice/src/main/res/drawable-hdpi/ic_action_settings.png b/orbotservice/src/main/res/drawable-hdpi/ic_action_settings.png
new file mode 100644
index 0000000..d57b290
Binary files /dev/null and b/orbotservice/src/main/res/drawable-hdpi/ic_action_settings.png differ
diff --git a/orbotservice/src/main/res/drawable-hdpi/ic_launcher.png b/orbotservice/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..e9954eb
Binary files /dev/null and b/orbotservice/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/orbotservice/src/main/res/drawable-hdpi/ic_stat_notifyerr.png b/orbotservice/src/main/res/drawable-hdpi/ic_stat_notifyerr.png
new file mode 100644
index 0000000..b65fa64
Binary files /dev/null and b/orbotservice/src/main/res/drawable-hdpi/ic_stat_notifyerr.png differ
diff --git a/orbotservice/src/main/res/drawable-hdpi/ic_stat_tor.png b/orbotservice/src/main/res/drawable-hdpi/ic_stat_tor.png
new file mode 100644
index 0000000..0f3b147
Binary files /dev/null and b/orbotservice/src/main/res/drawable-hdpi/ic_stat_tor.png differ
diff --git a/orbotservice/src/main/res/drawable-hdpi/ic_stat_tor_xfer.png b/orbotservice/src/main/res/drawable-hdpi/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..d222fb6
Binary files /dev/null and b/orbotservice/src/main/res/drawable-hdpi/ic_stat_tor_xfer.png differ
diff --git a/orbotservice/src/main/res/drawable-hdpi/inverse.png b/orbotservice/src/main/res/drawable-hdpi/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/orbotservice/src/main/res/drawable-hdpi/inverse.png differ
diff --git a/orbotservice/src/main/res/drawable-ldpi-v11/ic_stat_notifyerr.png b/orbotservice/src/main/res/drawable-ldpi-v11/ic_stat_notifyerr.png
new file mode 100644
index 0000000..b73292d
Binary files /dev/null and b/orbotservice/src/main/res/drawable-ldpi-v11/ic_stat_notifyerr.png differ
diff --git a/orbotservice/src/main/res/drawable-ldpi-v11/ic_stat_tor.png b/orbotservice/src/main/res/drawable-ldpi-v11/ic_stat_tor.png
new file mode 100644
index 0000000..0f24ee8
Binary files /dev/null and b/orbotservice/src/main/res/drawable-ldpi-v11/ic_stat_tor.png differ
diff --git a/orbotservice/src/main/res/drawable-ldpi-v11/inverse.png b/orbotservice/src/main/res/drawable-ldpi-v11/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/orbotservice/src/main/res/drawable-ldpi-v11/inverse.png differ
diff --git a/orbotservice/src/main/res/drawable-ldpi-v9/ic_stat_notifyerr.png b/orbotservice/src/main/res/drawable-ldpi-v9/ic_stat_notifyerr.png
new file mode 100644
index 0000000..2787bbb
Binary files /dev/null and b/orbotservice/src/main/res/drawable-ldpi-v9/ic_stat_notifyerr.png differ
diff --git a/orbotservice/src/main/res/drawable-ldpi-v9/ic_stat_tor.png b/orbotservice/src/main/res/drawable-ldpi-v9/ic_stat_tor.png
new file mode 100644
index 0000000..82d5446
Binary files /dev/null and b/orbotservice/src/main/res/drawable-ldpi-v9/ic_stat_tor.png differ
diff --git a/orbotservice/src/main/res/drawable-ldpi-v9/inverse.png b/orbotservice/src/main/res/drawable-ldpi-v9/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/orbotservice/src/main/res/drawable-ldpi-v9/inverse.png differ
diff --git a/orbotservice/src/main/res/drawable-ldpi/ic_action_settings.png b/orbotservice/src/main/res/drawable-ldpi/ic_action_settings.png
new file mode 100644
index 0000000..c3927fd
Binary files /dev/null and b/orbotservice/src/main/res/drawable-ldpi/ic_action_settings.png differ
diff --git a/orbotservice/src/main/res/drawable-ldpi/ic_launcher.png b/orbotservice/src/main/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 0000000..dd665db
Binary files /dev/null and b/orbotservice/src/main/res/drawable-ldpi/ic_launcher.png differ
diff --git a/orbotservice/src/main/res/drawable-ldpi/ic_stat_notifyerr.png b/orbotservice/src/main/res/drawable-ldpi/ic_stat_notifyerr.png
new file mode 100644
index 0000000..518e188
Binary files /dev/null and b/orbotservice/src/main/res/drawable-ldpi/ic_stat_notifyerr.png differ
diff --git a/orbotservice/src/main/res/drawable-ldpi/ic_stat_tor.png b/orbotservice/src/main/res/drawable-ldpi/ic_stat_tor.png
new file mode 100644
index 0000000..3cd399d
Binary files /dev/null and b/orbotservice/src/main/res/drawable-ldpi/ic_stat_tor.png differ
diff --git a/orbotservice/src/main/res/drawable-ldpi/inverse.png b/orbotservice/src/main/res/drawable-ldpi/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/orbotservice/src/main/res/drawable-ldpi/inverse.png differ
diff --git a/orbotservice/src/main/res/drawable-mdpi-v11/ic_stat_notifyerr.png b/orbotservice/src/main/res/drawable-mdpi-v11/ic_stat_notifyerr.png
new file mode 100644
index 0000000..935e209
Binary files /dev/null and b/orbotservice/src/main/res/drawable-mdpi-v11/ic_stat_notifyerr.png differ
diff --git a/orbotservice/src/main/res/drawable-mdpi-v11/ic_stat_tor.png b/orbotservice/src/main/res/drawable-mdpi-v11/ic_stat_tor.png
new file mode 100644
index 0000000..a34840d
Binary files /dev/null and b/orbotservice/src/main/res/drawable-mdpi-v11/ic_stat_tor.png differ
diff --git a/orbotservice/src/main/res/drawable-mdpi-v11/ic_stat_tor_xfer.png b/orbotservice/src/main/res/drawable-mdpi-v11/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..fe291e7
Binary files /dev/null and b/orbotservice/src/main/res/drawable-mdpi-v11/ic_stat_tor_xfer.png differ
diff --git a/orbotservice/src/main/res/drawable-mdpi-v11/inverse.png b/orbotservice/src/main/res/drawable-mdpi-v11/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/orbotservice/src/main/res/drawable-mdpi-v11/inverse.png differ
diff --git a/orbotservice/src/main/res/drawable-mdpi-v9/ic_stat_notifyerr.png b/orbotservice/src/main/res/drawable-mdpi-v9/ic_stat_notifyerr.png
new file mode 100644
index 0000000..b149031
Binary files /dev/null and b/orbotservice/src/main/res/drawable-mdpi-v9/ic_stat_notifyerr.png differ
diff --git a/orbotservice/src/main/res/drawable-mdpi-v9/ic_stat_tor.png b/orbotservice/src/main/res/drawable-mdpi-v9/ic_stat_tor.png
new file mode 100644
index 0000000..c150ced
Binary files /dev/null and b/orbotservice/src/main/res/drawable-mdpi-v9/ic_stat_tor.png differ
diff --git a/orbotservice/src/main/res/drawable-mdpi-v9/inverse.png b/orbotservice/src/main/res/drawable-mdpi-v9/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/orbotservice/src/main/res/drawable-mdpi-v9/inverse.png differ
diff --git a/orbotservice/src/main/res/drawable-mdpi/ic_action_settings.png b/orbotservice/src/main/res/drawable-mdpi/ic_action_settings.png
new file mode 100644
index 0000000..d90f125
Binary files /dev/null and b/orbotservice/src/main/res/drawable-mdpi/ic_action_settings.png differ
diff --git a/orbotservice/src/main/res/drawable-mdpi/ic_launcher.png b/orbotservice/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..e45ce29
Binary files /dev/null and b/orbotservice/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/orbotservice/src/main/res/drawable-mdpi/ic_stat_notifyerr.png b/orbotservice/src/main/res/drawable-mdpi/ic_stat_notifyerr.png
new file mode 100644
index 0000000..c4b3178
Binary files /dev/null and b/orbotservice/src/main/res/drawable-mdpi/ic_stat_notifyerr.png differ
diff --git a/orbotservice/src/main/res/drawable-mdpi/ic_stat_tor.png b/orbotservice/src/main/res/drawable-mdpi/ic_stat_tor.png
new file mode 100644
index 0000000..6649e14
Binary files /dev/null and b/orbotservice/src/main/res/drawable-mdpi/ic_stat_tor.png differ
diff --git a/orbotservice/src/main/res/drawable-mdpi/ic_stat_tor_xfer.png b/orbotservice/src/main/res/drawable-mdpi/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..73ab233
Binary files /dev/null and b/orbotservice/src/main/res/drawable-mdpi/ic_stat_tor_xfer.png differ
diff --git a/orbotservice/src/main/res/drawable-mdpi/inverse.png b/orbotservice/src/main/res/drawable-mdpi/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/orbotservice/src/main/res/drawable-mdpi/inverse.png differ
diff --git a/orbotservice/src/main/res/drawable-xhdpi-v11/ic_stat_notifyerr.png b/orbotservice/src/main/res/drawable-xhdpi-v11/ic_stat_notifyerr.png
new file mode 100644
index 0000000..bed9e21
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xhdpi-v11/ic_stat_notifyerr.png differ
diff --git a/orbotservice/src/main/res/drawable-xhdpi-v11/ic_stat_tor.png b/orbotservice/src/main/res/drawable-xhdpi-v11/ic_stat_tor.png
new file mode 100644
index 0000000..e742ae7
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xhdpi-v11/ic_stat_tor.png differ
diff --git a/orbotservice/src/main/res/drawable-xhdpi-v11/ic_stat_tor_xfer.png b/orbotservice/src/main/res/drawable-xhdpi-v11/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..27e8672
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xhdpi-v11/ic_stat_tor_xfer.png differ
diff --git a/orbotservice/src/main/res/drawable-xhdpi-v11/inverse.png b/orbotservice/src/main/res/drawable-xhdpi-v11/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xhdpi-v11/inverse.png differ
diff --git a/orbotservice/src/main/res/drawable-xhdpi-v9/ic_stat_notifyerr.png b/orbotservice/src/main/res/drawable-xhdpi-v9/ic_stat_notifyerr.png
new file mode 100644
index 0000000..7d1139c
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xhdpi-v9/ic_stat_notifyerr.png differ
diff --git a/orbotservice/src/main/res/drawable-xhdpi-v9/ic_stat_tor.png b/orbotservice/src/main/res/drawable-xhdpi-v9/ic_stat_tor.png
new file mode 100644
index 0000000..9e56f4f
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xhdpi-v9/ic_stat_tor.png differ
diff --git a/orbotservice/src/main/res/drawable-xhdpi-v9/inverse.png b/orbotservice/src/main/res/drawable-xhdpi-v9/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xhdpi-v9/inverse.png differ
diff --git a/orbotservice/src/main/res/drawable-xhdpi/ic_action_settings.png b/orbotservice/src/main/res/drawable-xhdpi/ic_action_settings.png
new file mode 100644
index 0000000..f2572c8
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xhdpi/ic_action_settings.png differ
diff --git a/orbotservice/src/main/res/drawable-xhdpi/ic_launcher.png b/orbotservice/src/main/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..13ee02b
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/orbotservice/src/main/res/drawable-xhdpi/ic_stat_notifyerr.png b/orbotservice/src/main/res/drawable-xhdpi/ic_stat_notifyerr.png
new file mode 100644
index 0000000..f48e8e8
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xhdpi/ic_stat_notifyerr.png differ
diff --git a/orbotservice/src/main/res/drawable-xhdpi/ic_stat_tor.png b/orbotservice/src/main/res/drawable-xhdpi/ic_stat_tor.png
new file mode 100644
index 0000000..11254d2
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xhdpi/ic_stat_tor.png differ
diff --git a/orbotservice/src/main/res/drawable-xhdpi/ic_stat_tor_xfer.png b/orbotservice/src/main/res/drawable-xhdpi/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..522d653
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xhdpi/ic_stat_tor_xfer.png differ
diff --git a/orbotservice/src/main/res/drawable-xhdpi/inverse.png b/orbotservice/src/main/res/drawable-xhdpi/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xhdpi/inverse.png differ
diff --git a/orbotservice/src/main/res/drawable-xxhdpi-v11/ic_stat_tor.png b/orbotservice/src/main/res/drawable-xxhdpi-v11/ic_stat_tor.png
new file mode 100644
index 0000000..1451c50
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xxhdpi-v11/ic_stat_tor.png differ
diff --git a/orbotservice/src/main/res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png b/orbotservice/src/main/res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..59e63d4
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png differ
diff --git a/orbotservice/src/main/res/drawable-xxhdpi/ic_launcher.png b/orbotservice/src/main/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..c2f2f45
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/orbotservice/src/main/res/drawable-xxhdpi/ic_stat_tor.png b/orbotservice/src/main/res/drawable-xxhdpi/ic_stat_tor.png
new file mode 100644
index 0000000..778cc1e
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xxhdpi/ic_stat_tor.png differ
diff --git a/orbotservice/src/main/res/drawable-xxhdpi/ic_stat_tor_xfer.png b/orbotservice/src/main/res/drawable-xxhdpi/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..eb8809c
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xxhdpi/ic_stat_tor_xfer.png differ
diff --git a/orbotservice/src/main/res/drawable-xxhdpi/inverse.png b/orbotservice/src/main/res/drawable-xxhdpi/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xxhdpi/inverse.png differ
diff --git a/orbotservice/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor.png b/orbotservice/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor.png
new file mode 100644
index 0000000..a78d290
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor.png differ
diff --git a/orbotservice/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png b/orbotservice/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..30fe589
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png differ
diff --git a/orbotservice/src/main/res/drawable-xxxhdpi/ic_launcher.png b/orbotservice/src/main/res/drawable-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..74a3130
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xxxhdpi/ic_launcher.png differ
diff --git a/orbotservice/src/main/res/drawable-xxxhdpi/ic_stat_tor.png b/orbotservice/src/main/res/drawable-xxxhdpi/ic_stat_tor.png
new file mode 100644
index 0000000..a2ff338
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xxxhdpi/ic_stat_tor.png differ
diff --git a/orbotservice/src/main/res/drawable-xxxhdpi/ic_stat_tor_xfer.png b/orbotservice/src/main/res/drawable-xxxhdpi/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..8f96779
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xxxhdpi/ic_stat_tor_xfer.png differ
diff --git a/orbotservice/src/main/res/drawable-xxxhdpi/inverse.png b/orbotservice/src/main/res/drawable-xxxhdpi/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/orbotservice/src/main/res/drawable-xxxhdpi/inverse.png differ
diff --git a/orbotservice/src/main/res/drawable/button.xml b/orbotservice/src/main/res/drawable/button.xml
new file mode 100644
index 0000000..9f44d24
--- /dev/null
+++ b/orbotservice/src/main/res/drawable/button.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_pressed="true" >
+    <shape>
+      <solid
+          android:color="@color/panel_background" />
+      <stroke
+          android:width="1dp"
+          android:color="#ffffff" />
+      <corners
+          android:radius="6dp" />
+      <padding
+          android:left="10dp"
+          android:top="10dp"
+          android:right="10dp"
+          android:bottom="10dp" />
+    </shape>
+  </item>
+  <item>
+    <shape>
+      <gradient
+          android:startColor="@color/panel_background_dark"
+          android:endColor="@color/panel_background_main"
+          android:angle="270" />
+      <stroke
+          android:width="2dp"
+          android:color="#aaaaaa" />
+      <corners
+          android:radius="6dp" />
+      <padding
+          android:left="10dp"
+          android:top="10dp"
+          android:right="10dp"
+          android:bottom="10dp" />
+    </shape>
+  </item>
+</selector>
\ No newline at end of file
diff --git a/orbotservice/src/main/res/drawable/button_off.xml b/orbotservice/src/main/res/drawable/button_off.xml
new file mode 100644
index 0000000..1304d1b
--- /dev/null
+++ b/orbotservice/src/main/res/drawable/button_off.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_pressed="true" >
+    <shape>
+      <solid
+          android:color="@color/panel_background" />
+      <stroke
+          android:width="1dp"
+          android:color="#ffffff" />
+      <corners
+          android:radius="6dp" />
+      <padding
+          android:left="10dp"
+          android:top="10dp"
+          android:right="10dp"
+          android:bottom="10dp" />
+    </shape>
+  </item>
+  <item>
+    <shape>
+      <gradient
+          android:startColor="@color/panel_background_dark"
+          android:endColor="@color/panel_background_main"
+          android:angle="270" />
+      <stroke
+          android:width="2dp"
+          android:color="#555555" />
+      <corners
+          android:radius="6dp" />
+      <padding
+          android:left="10dp"
+          android:top="10dp"
+          android:right="10dp"
+          android:bottom="10dp" />
+    </shape>
+  </item>
+</selector>
\ No newline at end of file
diff --git a/orbotservice/src/main/res/drawable/button_on.xml b/orbotservice/src/main/res/drawable/button_on.xml
new file mode 100644
index 0000000..27dc092
--- /dev/null
+++ b/orbotservice/src/main/res/drawable/button_on.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_pressed="true" >
+    <shape>
+      <solid
+          android:color="@color/bright_green" />
+      <stroke
+          android:width="1dp"
+          android:color="#ffffff" />
+      <corners
+          android:radius="6dp" />
+      <padding
+          android:left="10dp"
+          android:top="10dp"
+          android:right="10dp"
+          android:bottom="10dp" />
+    </shape>
+  </item>
+  <item>
+  <shape>
+      <solid
+          android:color="@color/dark_green" />
+      <stroke
+          android:width="1dp"
+          android:color="#ffffff" />
+      <corners
+          android:radius="6dp" />
+      <padding
+          android:left="10dp"
+          android:top="10dp"
+          android:right="10dp"
+          android:bottom="10dp" />
+    </shape>
+  </item>
+</selector>
\ No newline at end of file
diff --git a/orbotservice/src/main/res/drawable/classyfabric.png b/orbotservice/src/main/res/drawable/classyfabric.png
new file mode 100644
index 0000000..ca3d267
Binary files /dev/null and b/orbotservice/src/main/res/drawable/classyfabric.png differ
diff --git a/orbotservice/src/main/res/drawable/error.png b/orbotservice/src/main/res/drawable/error.png
new file mode 100644
index 0000000..42dc6d6
Binary files /dev/null and b/orbotservice/src/main/res/drawable/error.png differ
diff --git a/orbotservice/src/main/res/drawable/ic_chatsecure.png b/orbotservice/src/main/res/drawable/ic_chatsecure.png
new file mode 100644
index 0000000..aaddd88
Binary files /dev/null and b/orbotservice/src/main/res/drawable/ic_chatsecure.png differ
diff --git a/orbotservice/src/main/res/drawable/ic_duckduckgo.png b/orbotservice/src/main/res/drawable/ic_duckduckgo.png
new file mode 100644
index 0000000..696dcd6
Binary files /dev/null and b/orbotservice/src/main/res/drawable/ic_duckduckgo.png differ
diff --git a/orbotservice/src/main/res/drawable/ic_launcher.png b/orbotservice/src/main/res/drawable/ic_launcher.png
new file mode 100644
index 0000000..ea47373
Binary files /dev/null and b/orbotservice/src/main/res/drawable/ic_launcher.png differ
diff --git a/orbotservice/src/main/res/drawable/ic_menu_about.png b/orbotservice/src/main/res/drawable/ic_menu_about.png
new file mode 100644
index 0000000..866d4e0
Binary files /dev/null and b/orbotservice/src/main/res/drawable/ic_menu_about.png differ
diff --git a/orbotservice/src/main/res/drawable/ic_menu_exit.png b/orbotservice/src/main/res/drawable/ic_menu_exit.png
new file mode 100644
index 0000000..d301ea6
Binary files /dev/null and b/orbotservice/src/main/res/drawable/ic_menu_exit.png differ
diff --git a/orbotservice/src/main/res/drawable/ic_menu_goto.png b/orbotservice/src/main/res/drawable/ic_menu_goto.png
new file mode 100644
index 0000000..40183eb
Binary files /dev/null and b/orbotservice/src/main/res/drawable/ic_menu_goto.png differ
diff --git a/orbotservice/src/main/res/drawable/ic_play.png b/orbotservice/src/main/res/drawable/ic_play.png
new file mode 100644
index 0000000..a919794
Binary files /dev/null and b/orbotservice/src/main/res/drawable/ic_play.png differ
diff --git a/orbotservice/src/main/res/drawable/ic_stat_tor_off.png b/orbotservice/src/main/res/drawable/ic_stat_tor_off.png
new file mode 100644
index 0000000..6df646e
Binary files /dev/null and b/orbotservice/src/main/res/drawable/ic_stat_tor_off.png differ
diff --git a/orbotservice/src/main/res/drawable/ic_stat_tor_xfer.png b/orbotservice/src/main/res/drawable/ic_stat_tor_xfer.png
new file mode 100644
index 0000000..73ab233
Binary files /dev/null and b/orbotservice/src/main/res/drawable/ic_stat_tor_xfer.png differ
diff --git a/orbotservice/src/main/res/drawable/ic_twitter.png b/orbotservice/src/main/res/drawable/ic_twitter.png
new file mode 100644
index 0000000..1e61c0a
Binary files /dev/null and b/orbotservice/src/main/res/drawable/ic_twitter.png differ
diff --git a/orbotservice/src/main/res/drawable/icon_martus.png b/orbotservice/src/main/res/drawable/icon_martus.png
new file mode 100644
index 0000000..e72db19
Binary files /dev/null and b/orbotservice/src/main/res/drawable/icon_martus.png differ
diff --git a/orbotservice/src/main/res/drawable/icon_orfox.png b/orbotservice/src/main/res/drawable/icon_orfox.png
new file mode 100644
index 0000000..57ed1f0
Binary files /dev/null and b/orbotservice/src/main/res/drawable/icon_orfox.png differ
diff --git a/orbotservice/src/main/res/drawable/icon_story_maker.png b/orbotservice/src/main/res/drawable/icon_story_maker.png
new file mode 100644
index 0000000..9c54ca5
Binary files /dev/null and b/orbotservice/src/main/res/drawable/icon_story_maker.png differ
diff --git a/orbotservice/src/main/res/drawable/inverse.png b/orbotservice/src/main/res/drawable/inverse.png
new file mode 100644
index 0000000..65eff2c
Binary files /dev/null and b/orbotservice/src/main/res/drawable/inverse.png differ
diff --git a/orbotservice/src/main/res/drawable/n8fr8.jpg b/orbotservice/src/main/res/drawable/n8fr8.jpg
new file mode 100644
index 0000000..4939d5c
Binary files /dev/null and b/orbotservice/src/main/res/drawable/n8fr8.jpg differ
diff --git a/orbotservice/src/main/res/drawable/oldtoroff.png b/orbotservice/src/main/res/drawable/oldtoroff.png
new file mode 100644
index 0000000..4b23e0b
Binary files /dev/null and b/orbotservice/src/main/res/drawable/oldtoroff.png differ
diff --git a/orbotservice/src/main/res/drawable/oldtoron.png b/orbotservice/src/main/res/drawable/oldtoron.png
new file mode 100644
index 0000000..a99bec1
Binary files /dev/null and b/orbotservice/src/main/res/drawable/oldtoron.png differ
diff --git a/orbotservice/src/main/res/drawable/oldtorstarting.png b/orbotservice/src/main/res/drawable/oldtorstarting.png
new file mode 100644
index 0000000..a56844a
Binary files /dev/null and b/orbotservice/src/main/res/drawable/oldtorstarting.png differ
diff --git a/orbotservice/src/main/res/drawable/onion32.png b/orbotservice/src/main/res/drawable/onion32.png
new file mode 100644
index 0000000..7846760
Binary files /dev/null and b/orbotservice/src/main/res/drawable/onion32.png differ
diff --git a/orbotservice/src/main/res/drawable/tilebg.xml b/orbotservice/src/main/res/drawable/tilebg.xml
new file mode 100644
index 0000000..6f0d2a3
--- /dev/null
+++ b/orbotservice/src/main/res/drawable/tilebg.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/classyfabric"
+    android:tileMode="repeat" />
\ No newline at end of file
diff --git a/orbotservice/src/main/res/drawable/toggle.xml b/orbotservice/src/main/res/drawable/toggle.xml
new file mode 100644
index 0000000..0f9a36e
--- /dev/null
+++ b/orbotservice/src/main/res/drawable/toggle.xml
@@ -0,0 +1,8 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_checked="false"
+        android:drawable="@drawable/button_off" />
+    <item
+        android:state_checked="true"
+        android:drawable="@drawable/button_on" />
+</selector>
\ No newline at end of file
diff --git a/orbotservice/src/main/res/drawable/tor.png b/orbotservice/src/main/res/drawable/tor.png
new file mode 100644
index 0000000..0d63dd9
Binary files /dev/null and b/orbotservice/src/main/res/drawable/tor.png differ
diff --git a/orbotservice/src/main/res/drawable/tor25.png b/orbotservice/src/main/res/drawable/tor25.png
new file mode 100644
index 0000000..20b7666
Binary files /dev/null and b/orbotservice/src/main/res/drawable/tor25.png differ
diff --git a/orbotservice/src/main/res/drawable/toroff.png b/orbotservice/src/main/res/drawable/toroff.png
new file mode 100644
index 0000000..a72790b
Binary files /dev/null and b/orbotservice/src/main/res/drawable/toroff.png differ
diff --git a/orbotservice/src/main/res/drawable/toron.png b/orbotservice/src/main/res/drawable/toron.png
new file mode 100644
index 0000000..e3592b1
Binary files /dev/null and b/orbotservice/src/main/res/drawable/toron.png differ
diff --git a/orbotservice/src/main/res/drawable/torstarting.png b/orbotservice/src/main/res/drawable/torstarting.png
new file mode 100644
index 0000000..6e84a6f
Binary files /dev/null and b/orbotservice/src/main/res/drawable/torstarting.png differ
diff --git a/orbotservice/src/main/res/layout/layout_notification_expanded.xml b/orbotservice/src/main/res/layout/layout_notification_expanded.xml
new file mode 100644
index 0000000..c2a9c9e
--- /dev/null
+++ b/orbotservice/src/main/res/layout/layout_notification_expanded.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:internal="http://schemas.android.com/apk/prv/res/android"
+    android:id="@+id/status_bar_latest_event_content"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"    
+    >
+    <ImageView android:id="@+id/icon"
+        android:layout_width="@dimen/notification_large_icon_width"
+        android:layout_height="@dimen/notification_large_icon_height"
+        android:scaleType="center"
+        />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="fill_vertical"
+        android:layout_marginStart="@dimen/notification_large_icon_width"
+        android:minHeight="@dimen/notification_large_icon_height"
+        android:orientation="vertical"
+        android:paddingEnd="8dp"
+        android:paddingTop="2dp"
+        android:paddingBottom="2dp"
+        android:gravity="top"
+        >
+        <LinearLayout
+            android:id="@+id/line1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="6dp"
+            android:layout_marginStart="8dp"
+            android:orientation="horizontal"
+            >
+            <TextView android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"
+                android:layout_weight="1"
+                android:textStyle="bold"
+ 				android:textAppearance="@style/NotificationTitle"
+                 />
+            
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/line3"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"       
+            android:layout_marginStart="8dp"                
+            >
+            <TextView android:id="@+id/text"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_gravity="center"
+                android:singleLine="true"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"
+				android:textAppearance="@style/NotificationText"                
+                />
+            <TextView android:id="@+id/info"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="0"
+                android:singleLine="true"
+                android:gravity="center"
+                android:paddingStart="8dp"
+				android:textAppearance="@style/NotificationText"
+                />
+            <ImageView android:id="@+id/right_icon"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:layout_gravity="center"
+                android:layout_weight="0"
+                android:layout_marginStart="8dp"
+                android:scaleType="centerInside"
+                android:visibility="gone"
+                />
+            <!-- 
+            <ImageButton
+		    android:id="@+id/_tor_notificationBT"
+		    android:layout_width="24dp"
+		    android:layout_height="24dp"		   
+		    android:src="@drawable/nav_refresh" />
+		     -->
+        </LinearLayout>
+         <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:orientation="horizontal"       
+          	android:background="#999999"         
+          	android:layout_marginTop="3dp"    
+          	android:layout_marginBottom="3dp"    
+          	
+            />
+        <TextView android:id="@+id/text2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="-2dp"
+            android:layout_marginBottom="-2dp"
+            android:layout_marginStart="8dp"            
+            android:fadingEdge="horizontal"        
+            />
+    </LinearLayout>
+</FrameLayout>
diff --git a/orbotservice/src/main/res/layout/notification_template_part_chronometer.xml b/orbotservice/src/main/res/layout/notification_template_part_chronometer.xml
new file mode 100644
index 0000000..14a4758
--- /dev/null
+++ b/orbotservice/src/main/res/layout/notification_template_part_chronometer.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<Chronometer android:id="@+id/chronometer" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:layout_weight="0"
+    android:singleLine="true"
+    android:gravity="center"
+    android:paddingStart="8dp"
+    />
diff --git a/orbotservice/src/main/res/layout/notification_template_part_time.xml b/orbotservice/src/main/res/layout/notification_template_part_time.xml
new file mode 100644
index 0000000..e3b91fa
--- /dev/null
+++ b/orbotservice/src/main/res/layout/notification_template_part_time.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<DateTimeView android:id="@+id/time" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:layout_weight="0"
+    android:singleLine="true"
+    android:gravity="center"
+    android:paddingStart="8dp"
+    />
diff --git a/orbotservice/src/main/res/raw/pluto.properties b/orbotservice/src/main/res/raw/pluto.properties
new file mode 100644
index 0000000..74c0307
--- /dev/null
+++ b/orbotservice/src/main/res/raw/pluto.properties
@@ -0,0 +1,3 @@
+obfs2=obfsclient
+obfs3=obfsclient
+scramblesuit=obfsclient
diff --git a/orbotservice/src/main/res/raw/torpolipo.conf b/orbotservice/src/main/res/raw/torpolipo.conf
new file mode 100644
index 0000000..0aeaf63
--- /dev/null
+++ b/orbotservice/src/main/res/raw/torpolipo.conf
@@ -0,0 +1,23 @@
+proxyAddress = "127.0.0.1"
+proxyPort = 8118
+allowedClients = 127.0.0.1
+allowedPorts = 1-65535
+proxyName = "127.0.0.1"
+cacheIsShared = false
+socksParentProxy = "127.0.0.1:9050"
+socksProxyType = socks5
+diskCacheRoot = ""
+localDocumentRoot = ""
+disableLocalInterface = true
+disableConfiguration = true
+dnsUseGethostbyname = yes
+disableVia = true
+censoredHeaders = from,accept-language,x-pad,link
+censorReferer = maybe
+maxConnectionAge = 5m
+maxConnectionRequests = 120
+serverMaxSlots = 8
+serverSlots = 2
+tunnelAllowedPorts = 1-65535
+chunkHighMark = 512000
+objectHighMark = 128
\ No newline at end of file
diff --git a/orbotservice/src/main/res/raw/torrc b/orbotservice/src/main/res/raw/torrc
new file mode 100644
index 0000000..fd0223e
--- /dev/null
+++ b/orbotservice/src/main/res/raw/torrc
@@ -0,0 +1,8 @@
+RunAsDaemon 1
+AvoidDiskWrites 1
+ControlPort auto
+SOCKSPort 0
+DNSPort 0
+TransPort 0
+CookieAuthentication 1
+DisableNetwork 1
\ No newline at end of file
diff --git a/orbotservice/src/main/res/values-ach/strings.xml b/orbotservice/src/main/res/values-ach/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/orbotservice/src/main/res/values-ach/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-ar/strings.xml b/orbotservice/src/main/res/values-ar/strings.xml
new file mode 100644
index 0000000..0b2a1f6
--- /dev/null
+++ b/orbotservice/src/main/res/values-ar/strings.xml
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">اوربوت</string>
+  <string name="app_description">اوربوت هو تطبيق الوكيل-البروكسي الحر الذي يمكّن تطبيقات أخرى لاستخدام الإنترنت بأمان أكثر . يُستخدم اوربوت تور لتشفير تحركات مرورك على الإنترنت ، ثم يخفيك ويجعلك وهمي من خلال سلسلة من أجهزة الكمبيوتر في جميع أنحاء العالم . تور هو تطبيق حر وشبكة مفتوحة والتي تساعدك على حماية نفسك من مراقبة الشبكات التي تهدد الحرية الشخصية والخصوصية ، والأنشطة التجارية السرية والعلاقات ، وأمن الدولة والحكومات القمعيّة والتي تستخدم مايعرف باسم تحليل حركة مرور البيانات .</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">فعل و اوقف تور</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">جاري تشغيل اوربوت...</string>
+  <string name="status_activated">متصل بشبكة تور</string>
+  <string name="status_disabled">تم إيقاف اوربوت</string>
+  <string name="status_shutting_down">جاري ايقاف خدمة تور</string>
+  <string name="tor_process_starting">جاري تشغيل تور...</string>
+  <string name="tor_process_complete">كامل.</string>
+  <string name="tor_process_waiting">انتظار.</string>
+  <string name="not_anonymous_yet">تحذير: حركة مرورك ليست خفية حتي الآن! من فضلك قم بتكوين التطبيقات الخاصة بك لإستخدام بروكسي HTTP 127.0.0.1:8118 أو SOCK4A أو SOKS5 127.0.0.1:9050</string>
+  <string name="menu_home">القائمة الرئيسية</string>
+  <string name="menu_browse">تصفّح</string>
+  <string name="menu_settings">إعدادات</string>
+  <string name="menu_log">السجل</string>
+  <string name="menu_info">مساعدة</string>
+  <string name="menu_apps">في بي ان شبكة وهمية خاصة</string>
+  <string name="menu_start">بدء</string>
+  <string name="menu_stop">توقف</string>
+  <string name="menu_about">حول</string>
+  <string name="menu_promo_apps">حمل التطبيق ...</string>
+  <string name="main_layout_download">تحميل</string>
+  <string name="main_layout_upload">رفع</string>
+  <string name="button_help">مساعدة</string>
+  <string name="button_close">إغلاق</string>
+  <string name="button_about">حول</string>
+  <string name="button_clear_log">مسح السجل</string>
+  <string name="menu_verify">تحقق</string>
+  <string name="menu_exit">خروج</string>
+  <string name="menu_scan">فحص QR الجسر</string>
+  <string name="menu_share_bridge">مشاركة QR الجسر</string>
+  <string name="press_to_start">- اضغط لفترة طويلة للبدء -</string>
+  <string name="pref_trans_proxy_group">بروكسي ضمني (يتطلب اذن حساب رووت)</string>
+  <string name="pref_trans_proxy_title">بروكسي ضمني</string>
+  <string name="pref_trans_proxy_summary">عملية توريفاي أوتوماتيكية للتطبيقات</string>
+  <string name="pref_transparent_all_title">استخدم تور مع جميع التطبيقات</string>
+  <string name="pref_transparent_all_summary">مرر كل بيانات المرور الخاصة بالتطبيقات عبر تور</string>
+  <string name="pref_transparent_port_fallback_title">تراجع منفذ البروكسي</string>
+  <string name="pref_transparent_port_fallback_summary">تحذير: تتحايل علي المنافذ الشائعة  (80, 443, إلى آخره) *استخدم فقط* إذا كان وضع \'كل\' أو \'التطبيق\' لا يعمل.</string>
+  <string name="pref_transparent_port_title">قائمة المنافذ</string>
+  <string name="pref_transparent_port_summary">قائمة بجميع المنافذ إلي البروكسي. *استخدم فقط* إذا كان وضع \'كل\' أو \'التطبيق\' لا يعمل.</string>
+  <string name="pref_transparent_port_dialog">ادخل المناقذ للبروكسي</string>
+  <string name="pref_has_root">اطلب إذن رووت</string>
+  <string name="pref_has_root_summary">اطلب إذن رووت لتفعيل البروكسي الضمني</string>
+  <string name="status_install_success">تم تثبيت تور بنجاح!</string>
+  <string name="status_install_fail">غير قادر على تثبيت ملفات تور. يرجى مراجعة السجل وإعلامنا على البريد الإلكتروني tor-assistants at torproject.org</string>
+  <string name="title_error">خطأ في التطبيق</string>
+  <string name="wizard_title">اوربوت</string>
+  <string name="wizard_btn_tell_me_more">عن اوربوت</string>
+  <string name="btn_next">التالي</string>
+  <string name="btn_back">رجوع</string>
+  <string name="btn_finish">إنهاء</string>
+  <string name="btn_okay">موافق</string>
+  <string name="btn_cancel">إلغاء</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">بعض التفاصيل عن اوربوت</string>
+  <string name="wizard_details_msg">اوربوت تطبيق مفتوح المصدر يحتويه تور، \"ليب افنت\" و \"بوليبو\". 
+وهو يوفر الوكيل-البروكسي المحلي HTTP (8118) ووكيل SOCKS (9050) في شبكة تور. 
+ اوربوت أيضا قادر على الوصول لجذور الجهاز ، لإرسال كل تحركات الإنترنت من خلاله.</string>
+  <string name="wizard_permissions_root">تم منح الإذن</string>
+  <string name="wizard_permissions_stock">أذونات اوربوت</string>
+  <string name="wizard_premissions_msg_root">ممتاز! لقد وجدنا بأنه لديك صلاحية حساب رووت لتمكين اوربوت. سوف نستخدم هذه السلطة بحكمة.</string>
+  <string name="wizard_permissions_msg_stock">رغم أنه ليس ضروريا، يمكن ان يصبح أوربوت أداة قوية إذا كان لدى جهازك صلاحية حساب رووت. استخدم الزر بالأسفل لمنح اوربوت قوة أكبر!</string>
+  <string name="wizard_permissions_no_root">إذا لم يكن لديك صلاحية حساب رووت أو ليست لديك أدنى فكرة عما نتحدث عنه، تأكد فقط من استخدام تطبيقات تعمل مع اوربوت.</string>
+  <string name="wizard_permissions_consent">أفهم ذلك وأود أن أستمر بدون صلاحيات حساب رووت</string>
+  <string name="wizard_permission_enable_root">امنح اوربوت صلاحية حساب رووت</string>
+  <string name="wizard_configure">تكوين توريفاي</string>
+  <string name="wizard_configure_msg">اوربوت يعطيك الخيار لتوجيه جميع حركات مرور التطبيقات عبر تور او لإختيار التطبيقات بشكل فردي.</string>
+  <string name="wizard_configure_all">مرر جميع التطبيقات عبر تور</string>
+  <string name="wizard_configure_select_apps">اختر التطبيقات الفردية لتور</string>
+  <string name="wizard_tips_tricks">تطبيقات مهيئة لاوربوت</string>
+  <string name="wizard_tips_msg">التطبيقات التالية تم تطويرها حتي تعمل مع اوربوت. اضغط علي ما تريد تثبيتة علي جهازك الأن, أو يمكنك ان تجدهم لاحقاً علي جوجل بلاي, أو علي موقعنا GuardianProject.info أو من خلال F-Droid.org.</string>
+  <string name="wizard_tips_otrchat">الدردشة الآمنة - تأمين الرسائل الفورية لمستخدمي الاندرويد</string>
+  <string name="wizard_tips_proxy">إعدادات البروكسي - تعلم كيفية تكوين التطبيقات لتعمل مع اوربوت</string>
+  <string name="wizard_tips_duckgo">تطبيق محرك البحث DuckDuckGo</string>
+  <string name="wizard_tips_twitter">اضبط البروكسي الخاص بتويتر إلي مستضيف \"localhost\" و المنفذ إلي 8118</string>
+  <string name="wizard_tips_story_maker">صانع القصة - اصنع قصة واتركها لأمان تور !</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_proxy_help_msg">إذا كان تطبيق الاندرويد الذي تستخدمه يدعم استخدام وكيل - بروكسيHTTP أو SOCKS  إذاً يمكنك تكوينه للاتصال باوربوت واستخدام تور.  إعدادات المضيف 127.0.0.1 أو \"مضيف\". ل HTTP، إعداد المنفذ هو 8118. لSOCKS، الوكيل هو 9050. يجب عليك استخدام SOCKS4A أو SOCKS5 إذا أمكن \ N \ N \ N \ N يمكنك معرفة المزيد حول إنشاء الوكلاء على الروبوت من خلال التعليمات على: 
+HTTP: / /tinyurl.com/proxyandroid\n</string>
+  <string name="wizard_final">اوربوت جاهز للاستخدام!</string>
+  <string name="wizard_final_msg">الملايين من الناس في جميع أنحاء العالم تستخدم تور لمجموعة واسعة من الأسباب . الصحفيين والمدونين , المدافعين عن حقوق الإنسان ، وضباط تنفيذ القانون ، والجنود ، والشركات والمواطنين من الأنظمة القمعية ، وايضاً المواطنين العاديين ... والآن هل أنت جاهز ، هيا بنا !</string>
+  <string name="wizard_exit_at_first_screen_toast">يرجى تكوين اوربوت واعداده لتستطيع البدء بإستخدامه !</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">لديك اتصال ناجح بشبكة تور - ولكن هذا لا يعني أن جهازك آمن . يمكنك استخدام زر \"متصفح\" لاختبار اتصالك .
+  زرنا على https://guardianproject.info/apps/orbot أو ارسل بريد الكتروني الى help at guardianproject.info  لمعرفة المزيد.</string>
+  <string name="tor_check">سيؤدي هذا إلى فتح المتصفح الخاص بك لزيارة عنوان https://check.torproject.org من اجل التحقق إذا كان تكوين اوربوت يعمل بشكل صحيح ام لا وبأنك متصل بتور.</string>
+  <string name="pref_hs_group">استضافة الخدمة المخفية</string>
+  <string name="pref_general_group">عام</string>
+  <string name="pref_start_boot_title">شغل اوربوت عند فتح الجهاز</string>
+  <string name="pref_start_boot_summary">فعل اوربوت و اتصل بتور تلقائياً عندما يبدء جهاز الأندرويد الخاص بك بالعمل</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">اوربت يجعل تور ممكناً على نظام الأندرويد. يساعدك تور في الدفاع ضد عملية ترشيح المحتويات, تحليل مسارات المرور, ومراقبة الشبكة والتي تهدد خصوصيتك, المعلومات السرية والعلاقات الشخصية. هذه الأداة ستساعدك من تهيئة اوربت مع تور على جهازك</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">تحذير</string>
+  <string name="wizard_warning_msg">لن يقوم اوربت بأخفاء هوية مسارك بشكل اوتوماتيكي او آلي بمجرد تنصيبه. بل يجب عليك ان تقوم بتهيئته مع جهازك بالأضافة الى تهيئة تطبيقات اخرى لتستطيع استخدام تور بنجاح.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">الصلاحيات</string>
+  <string name="wizard_permissions_root_msg1">يمكنك اعطاء اوربوت صلاحيات حساب رووت لتشغيل المميزات المتقدمة مثل البروكسي الضمني.</string>
+  <string name="wizard_permissions_root_msg2">إذا كنت لا تريد أن تفعل هذا, الرجاء إستخدام برامج معدة للعمل مع اوربوت</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title"> برامج معدة للعمل مع اوربوت</string>
+  <string name="wizard_tips_gibberbot">جات سكيور: هو تطبيق للدردشة بشكل آمن مع تشفير عالي جداً</string>
+  <string name="wizard_tips_orweb">اورفوكس: متصفح ذو خصوصية متقدمة يعمل ظمن او من خلال تور</string>
+  <string name="wizard_tips_play">يمكنك الحصول علي جميع تطبيقات مشروع الجاردين على جوجل بلاي</string>
+  <string name="wizard_tips_fdroid">اكتشف كل تطبيقات مشروع الجارديان على اف-درويد</string>
+  <string name="wizard_tips_fdroid_org">اكتشف كل تطبيقات مشروع الجارديان على https://f-droid.org </string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">بروكسي ضمني</string>
+  <string name="wizard_transproxy_msg">هذه ستسمح للبرامج بالاتصال بشبكة تور تلقائياً دون اعداد مسبق.</string>
+  <string name="wizard_transproxy_hint">(اختر هذا المربع إذا كنت لا تعلم عما نتحدث)</string>
+  <string name="wizard_transproxy_none">لا شيء</string>
+  <string name="pref_transparent_tethering_title">الربط بتور</string>
+  <string name="pref_transparent_tethering_summary">اسمح بالبروكسي الضمني للواي فاي و اجهزة اليو اس بي  (تحتاج لإعادة تشغيل الجهاز)</string>
+  <string name="button_grant_superuser">اطلب صلاحيات حساب رووت</string>
+  <string name="pref_select_apps">حدد البرامج</string>
+  <string name="pref_select_apps_summary">اختر البرامح التي تريد تمريرها إلي شبكة تور</string>
+  <string name="pref_node_configuration">تكوين نقطة الاتصال</string>
+  <string name="pref_node_configuration_summary">هذه الإعدادات متقدمة و قد تقلل من حماية هويتك</string>
+  <string name="pref_entrance_node">نقاط الدخول</string>
+  <string name="pref_entrance_node_summary">بصمات، اسماء مستعارة، البلدان و العناوين لأول نقطة اتصال</string>
+  <string name="pref_entrance_node_dialog">أدخل نقاط الدخول</string>
+  <string name="pref_allow_background_starts_title">إسمح للخلفية بألبدأ</string>
+  <string name="pref_allow_background_starts_summary">إسمح لأي تطبيق بأن يُخبِر اوربت بأن يفعل تور مع الخدمات المرتبطة به</string>
+  <string name="button_proxy_all">اُخوِّل الكل</string>
+  <string name="button_proxy_none">بدون تخويل</string>
+  <string name="button_invert_selection">اعكس المُحدد</string>
+  <string name="pref_proxy_title">بروكسي الشبكة الصادرة (اختياري)</string>
+  <string name="pref_proxy_type_title">نوع البروكسي الصادر</string>
+  <string name="pref_proxy_type_summary">البروتوكول المستخدم لخادم البروكسي: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">أدخل نوع البروكسي</string>
+  <string name="pref_proxy_host_title">عنوان البروكسي الصادر</string>
+  <string name="pref_proxy_host_summary">اسم مضيف خادم البروكسي</string>
+  <string name="pref_proxy_host_dialog">أدخل مضيف البروكسي</string>
+  <string name="pref_proxy_port_title">منفذ البروكسي الصادر</string>
+  <string name="pref_proxy_port_summary">منفذ خادم البروكسي</string>
+  <string name="pref_proxy_port_dialog">أدخل منفذ البروكسي</string>
+  <string name="pref_proxy_username_title">اسم مستخدم البروكسي الصادر</string>
+  <string name="pref_proxy_username_summary">اسم مستخدم البروكسي (اختياري)</string>
+  <string name="pref_proxy_username_dialog">ادخل اسم مستخدم البروكسي</string>
+  <string name="pref_proxy_password_title">كلمة مرور بروكسي الشبكة الصادرة</string>
+  <string name="pref_proxy_password_summary">كلمة مرور البروكسي (اختياري)</string>
+  <string name="pref_proxy_password_dialog">ادخل كلمة مرور البروكسي</string>
+  <string name="status">الحالة</string>
+  <string name="setting_up_full_transparent_proxying_">يتم إعداد بروكسي ضمني كامل...</string>
+  <string name="setting_up_app_based_transparent_proxying_">يتم إعداد البروكسي الضمني حسب البرامج...</string>
+  <string name="transparent_proxying_enabled">البروكسي الضمني مُفعل</string>
+  <string name="transproxy_enabled_for_tethering_">البروكسي الضمني جاهز للربط!</string>
+  <string name="warning_error_starting_transparent_proxying_">تحذير: حصل خطأ بتشغيل البروكسي الضمني!</string>
+  <string name="transproxy_rules_cleared">تم مسح قواعد البروكسي الضمني</string>
+  <string name="couldn_t_start_tor_process_">لقد تعذر بدء تشغيل تور:</string>
+  <string name="privoxy_is_running_on_port_">بوليبو يعمل على  المحمول </string>
+  <string name="setting_up_port_based_transparent_proxying_">يتم إعداد البروكسي الضمني حسب المنفذ...</string>
+  <string name="bridge_error">خطأ بالجسر</string>
+  <string name="bridge_requires_ip">حتي تستطيع إستخدم ميزة الجسور، يجب عليك ادخال عنوان انترنت لجسر واحد علي الأقل.</string>
+  <string name="send_email_for_bridges">أرسل بريد إلكتروني إلى bridges at torproject.org مع عبارة \"get bridges\" بداخل الرسالة من حساب بريد gmail.</string>
+  <string name="error">خطأ</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">إعدادات العنوان القابل للاتصال لديك تسببت بخطأ!</string>
+  <string name="your_relay_settings_caused_an_exception_">إعدادات المرحلات لديك تسببت بخطأ!</string>
+  <string name="exit_nodes">نقاط الخروج</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">البصمات، الاسماء المستعارة، البلدان و العناوين لآخر نقطة اتصال</string>
+  <string name="enter_exit_nodes">أدخل نقاط الخروج</string>
+  <string name="exclude_nodes">استثني النقاط</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">بصمات، الأسماء المستعارة، البلدان و العناوين ليتم استثنائها</string>
+  <string name="enter_exclude_nodes">أدخل النقاط المستثناه</string>
+  <string name="strict_nodes">النقاط المشددة</string>
+  <string name="use_only_these_specified_nodes">استخدم فقط تلك النقاط المحددة</string>
+  <string name="bridges">الجسور</string>
+  <string name="use_bridges">استخدم الجسور</string>
+  <string name="bridges_obfuscated">الجسور الغامضة</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">اسمح باستخدام نقاط دخول بديلة إلي شبكة تور</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">فعل هذا الخيار إذا كانت الجسور المحددة جسور غامضة</string>
+  <string name="ip_address_and_port_of_bridges">عنوان الانترنت و المنفذ للجسور</string>
+  <string name="enter_bridge_addresses">أدخل عناوين الجسور</string>
+  <string name="relays">المرحلات</string>
+  <string name="relaying">يرحل</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">اسمح لجهازك ليكون مرحل غير نهائي</string>
+  <string name="relay_port">منفذ المرحل</string>
+  <string name="listening_port_for_your_tor_relay">المنفذ المصغي لمُرحل تور الخاص بك</string>
+  <string name="enter_or_port">أدخل منفذ OR</string>
+  <string name="relay_nickname">الاسم المستعار للمُرحل</string>
+  <string name="the_nickname_for_your_tor_relay">الاسم المستعار لمُرحل تور الخاص بك</string>
+  <string name="enter_a_custom_relay_nickname">أدخل اسم مستعار للمُرحل</string>
+  <string name="reachable_addresses">العناوين التي يمكن الوصول إليها</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">العمل كخدمة من وراء جدار ناري بسياسات تقيدية</string>
+  <string name="reachable_ports">المنافذ التي يمكن الوصول إليها</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">منافذ مفتوحة عبر جدار ناري تقيدي</string>
+  <string name="enter_ports">أدخل المنافذ</string>
+  <string name="enable_hidden_services">استضافة الخدمة المخفية</string>
+  <string name="run_servers_accessible_via_the_tor_network">السماح للخادم الذي علي جهازك بأمكانية الوصول إليه من خلال شبكة تور</string>
+  <string name="enter_localhost_ports_for_hidden_services">أدخل المنافذ المحلية للخدمات المخفية</string>
+  <string name="hidden_service_ports">منافذ الخدمات المخفية</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">اسم العنوان لخدمتك المخفية (يتم انشائه تلقائياً)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">شغل سجل الـdebug ( للمراجعة يجب استخدام adb أو LogCat)</string>
+  <string name="project_home">الموقع الرسمي للمشروع (المشاريع):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">رخصة استخدام تور</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">برامج من الطرف الثالث:</string>
+  <string name="tor_version">تور: https://www.torproject.org</string>
+  <string name="libevent_version">لب إيفينت النسخة http://www.monkey.org/~provos/libevent/ :v2.0.21</string>
+  <string name="polipo_version">بوليبو النسخة 1.1.9 : https://github.com/jech/polipo</string>
+  <string name="iptables_version">آي بي تايبلز النسخة 1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">اوبن اس اس ال النسخة: http://www.openssl.org 1.0.1q</string>
+  <string name="hidden_service_request">هناك برنامج يحاول فتح منفذ لخادم مخفي %S إلي شبكة تور. هذا السلوك آمن إذا كنت تثق بهذا البرنامج.</string>
+  <string name="found_existing_tor_process">عُثر علي عملية تور سابقة تعمل...</string>
+  <string name="something_bad_happened">حصل خطأ ما. افحص السجل</string>
+  <string name="hidden_service_on">الخدمات المخفية التي تعمل حالياً:</string>
+  <string name="unable_to_read_hidden_service_name">غير قادر على قراءة اسم الخدمة المخفية</string>
+  <string name="unable_to_start_tor">غير قادر على بدء تور:</string>
+  <string name="unable_to_reset_tor">أعِد تشغيل جهازك, غير قادر على اعادة تشغيل تور</string>
+  <string name="pref_use_sys_iptables_title">استخدم الـiptables التلقائية</string>
+  <string name="pref_use_sys_iptables_summary">استخدم مكونات الـiptables الموجودة ضمناً بالجهاز بدل النسخة المرفقة مع اوربوت</string>
+  <string name="error_installing_binares">غير قادرة على تثبيت أو تحديث تور</string>
+  <string name="pref_use_persistent_notifications">دائما ضع الأيقونة في شريط الأدوات عندما يكون اوربوت متصلاً</string>
+  <string name="pref_use_persistent_notifications_title">تنبيهات دائمة</string>
+  <string name="pref_use_expanded_notifications">قم بأظهار التنبيه بشكل موسع بأستخدام تور. أخرج من البلد ورقم الآي بي رقم العنوان على الشبكة</string>
+  <string name="pref_use_expanded_notifications_title">تنبيه موسّع</string>
+  <string name="notification_using_bridges">تم تفعيل الجسور!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">اللغة</string>
+  <string name="set_locale_summary">اختار  الإعدادات المحلية و اللغة لاوربوت</string>
+  <string name="wizard_locale_title">اختار اللغة</string>
+  <string name="wizard_locale_msg">إما ان تترك اللغة الافتراضية او إما ان تغير اللغة</string>
+  <string name="powered_by">مدعومة من قبل تور</string>
+  <string name="btn_save_settings">حفظ الإعدادات</string>
+  <string name="no_internet_connection_tor">لا يوجد ارتباط بألانترنيت: تور في وضع الوقف المؤقت</string>
+  <string name="bandwidth_">عرض النطاق</string>
+  <string name="down">اسفل</string>
+  <string name="up">أعلى</string>
+  <string name="pref_disable_network_title">لاتوجد شبكة نوم-آلي</string>
+  <string name="pref_disable_network_summary">ضع تور في وضع النوم عند عدم وجود الأنترنيت</string>
+  <string name="newnym">لقد تحولت الى هوية تور جديدة</string>
+  <string name="menu_verify_browser">متصفح</string>
+  <string name="menu_use_chatsecure">استخدم جات سكيور </string>
+  <string name="permission_manage_tor_label">أدارة تور</string>
+  <string name="permission_manage_tor_description">قم بتمكين هذا التطبيق من التحكم بخدمات تور</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">لا يبدو بأن لديك اورفوكس منصباً. هل تريد مساعدتاً في ذلك او لنقم فقط بتشغيل المتصفح؟</string>
+  <string name="install_apps_">هل ترغب بتنصيب التطبيقات؟</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">لا يوجد اتصال بألشبكة. سيدخل تور الى وضع النوم</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">الاتصال بألشبكة جيد. تنبيه تور من النوم</string>
+  <string name="updating_settings_in_tor_service">تحديث الاعدادات في خدمات تور</string>
+  <string name="pref_socks_title">تور  سوكس</string>
+  <string name="pref_socks_summary">منفذ الشبكات الحاسوبية او بورت الذي يقدمه تور الى وحدة الخدمة النائبة البروكسي في سوكس. (التقصير 9050 او 0 عدم القدرة)</string>
+  <string name="pref_socks_dialog">تهيئة منفذ الشبكات الحاسوبية  بورت في سوكس</string>
+  <string name="pref_transport_title">منفذ الشبكات الحاسوبية في وحدة الخدمة النائبة البروكسي في تور</string>
+  <string name="pref_transport_summary">منفذ الشبكات الحاسوبية او بورت الذي يقدمه تور الى البروكسي الشفاف (التقصير 9040 او 0 عدم القدرة)</string>
+  <string name="pref_transport_dialog">تهيئة بورت البروكسي الشفاف</string>
+  <string name="pref_dnsport_title">تور, نظام اسماء النطاقات, بورت</string>
+  <string name="pref_dnsport_summary">منفذ الشبكات الحاسوبية او بورت الذي يقدمه تور الى خدمة اسماء النطاق دي ان اس. (التقصير 5400 او 0 لعدم القدرة)</string>
+  <string name="pref_dnsport_dialog">إعدادات بورت خادم اسماء النطاق</string>
+  <string name="menu_vpn">في بي ان شبكة وهمية خاصة</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-az/strings.xml b/orbotservice/src/main/res/values-az/strings.xml
new file mode 100644
index 0000000..0a84a25
--- /dev/null
+++ b/orbotservice/src/main/res/values-az/strings.xml
@@ -0,0 +1,297 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Pulsuz proksi tətbiqetməsi olan Orbot başqa tətbiqetmələrə internetdən daha təhlükəsiz istifadə etmək imkanı verir. Orbot sizin internet trafikinizi şifrələmək üçün Tordan istifadə edir və dünyanın hər yerində kompüterlərin birindən o birinə sıçramaqla bunu gizlədir. Tor pulsuz proqram təminatıdır, eyni zamanda sizin şəxsi azadlığınız və təhlükəsizliyinizə, gizli biznes fəaliyyəti və əlaqələrə, o cümlədən trafik analiz adlanan dövlət təhlükəsizliyinə xələl gətirə biləcək şəbəkə nəzarəti formalarından müdafiə olunmağa yardım edən açıq şəbəkədir.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">Toru başlat və dayandır
+</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot başlayır...</string>
+  <string name="status_activated">Tor şəbəkəsinə bağlandı</string>
+  <string name="status_disabled">Orbot deaktivasiya edildi</string>
+  <string name="status_shutting_down">Tor xidməti işini başa vurur</string>
+  <string name="tor_process_starting">Tor xidməti başlayır...</string>
+  <string name="tor_process_complete">tamamla.</string>
+  <string name="tor_process_waiting">gözləyirik.</string>
+  <string name="not_anonymous_yet">TƏHLÜKƏ: Sənin trafikin hələ anonim deyil! Lütfən, aplikasiyanı ya HTTP proksi 127.0.0.1:8118, ya SOCKS4A, ya da SOCKS5 proksi 127.0.0.1:9050 istifadə etmək üçün quraşdır.</string>
+  <string name="menu_home">Ev</string>
+  <string name="menu_browse">Bax</string>
+  <string name="menu_settings">Quraşdırmalar</string>
+  <string name="menu_log">Jurnal</string>
+  <string name="menu_info">Kömək</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Başla</string>
+  <string name="menu_stop">Dur</string>
+  <string name="menu_about">Haqqında</string>
+  <string name="menu_promo_apps">Tətbiqetmələri əldə edin...</string>
+  <string name="main_layout_download">Endir</string>
+  <string name="main_layout_upload">Yüklə</string>
+  <string name="button_help">Kömək</string>
+  <string name="button_close">Bağla</string>
+  <string name="button_about">Haqqında</string>
+  <string name="button_clear_log">Jurnalı Təmizlə</string>
+  <string name="menu_verify">Yoxla</string>
+  <string name="menu_exit">Çıx</string>
+  <string name="menu_scan">KörpüQR kodu skan edin</string>
+  <string name="menu_share_bridge">KörpüQR kodu paylaşın</string>
+  <string name="press_to_start">- başlamaq üçün uzun klik -</string>
+  <string name="pref_trans_proxy_group">Şəffaf Proksiləmə (Root Tələb Edir)</string>
+  <string name="pref_trans_proxy_title">Şəffaf Proksiləmə</string>
+  <string name="pref_trans_proxy_summary">Aplikasiyaların Avtomatik Torlanması</string>
+  <string name="pref_transparent_all_title">Hər şeyi Torla</string>
+  <string name="pref_transparent_all_summary">Tor vasitəsilə bütün aplikasiyaların proksi trafiki</string>
+  <string name="pref_transparent_port_fallback_title">Port Proksi Ehtiyatı</string>
+  <string name="pref_transparent_port_fallback_summary">TƏHLÜKƏ: Ümumi alt portlar (80, 443 və s.). \'Hamısı\' və ya \'Tətbiqetmə\' işləmirsə, *YALNIZ İSTİFADƏ ET*.</string>
+  <string name="pref_transparent_port_title">Port Siyahısı</string>
+  <string name="pref_transparent_port_summary">Proksiyə port siyahısı. \'Hamısı\' və ya \'Tətbiqetmə\' işləmirsə, *YALNIZ İSTİFADƏ ET*.</string>
+  <string name="pref_transparent_port_dialog">Proksiyə port daxil et</string>
+  <string name="pref_has_root">Root Giriş Tələb Et</string>
+  <string name="pref_has_root_summary">Şəffaf proksiləmə üçün mənbə tələb et</string>
+  <string name="status_install_success">Tor ikilisi müvəffəqiyyətlə yükləndi!</string>
+  <string name="status_install_fail">Tor ikili fayllarının quraşdırılması mümkün olmadı. Lütfən girişi yoxla və assistants at torproject.org-a xəbər ver.</string>
+  <string name="title_error">Tətbiq Səhvi</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Orbot Haqqında</string>
+  <string name="btn_next">Sonrakı</string>
+  <string name="btn_back">Geri</string>
+  <string name="btn_finish">Bitir</string>
+  <string name="btn_okay">Okey</string>
+  <string name="btn_cancel">Ləğv et</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Bəzi Orbot Detalları</string>
+  <string name="wizard_details_msg">Orbot Tor, LibEvent və Polipodan ibarət olan açıq mənbəli tətbiqetmədir. O, Tor şəbəkəsini yerli HTTP proksi (8118) və SOCKS proksi (9050) ilə təmin edir. Orbot həm də bütün internet trafikləri köklü mexanizm əsasında Tor vasitəsiylə göndərmək qabiliyyətinə malikdir. </string>
+  <string name="wizard_permissions_root">İcazə Verilir</string>
+  <string name="wizard_permissions_stock">Orbot İcazələri</string>
+  <string name="wizard_premissions_msg_root">Əla! Sənin Orbot üçün mənbə icazələrinə malik olmanı müəyyən etmişik. Biz bu gücü ağılla istifadə edəcəyik.</string>
+  <string name="wizard_permissions_msg_stock">Bu tələb edilmədiyi halda sənin qurğunun mənbə girişi varsa, Orbot daha güclü işləyəcək. Orbota super gücü vermək üçün aşağıdakı düyməni istifadə et!</string>
+  <string name="wizard_permissions_no_root">Əgər sənin mənbə girişinə icazən yoxdursa, ya da nə haqqında danışdığımızı anlamırsansa, əmin ol ki, istifadə etdiyin aplikasiyalar Orbotla işləyə biləndirlər.</string>
+  <string name="wizard_permissions_consent">Superistifadəçisiz davam etməyi anlayır və istəyirəm</string>
+  <string name="wizard_permission_enable_root">Orbot üçün Mənbə Ver</string>
+  <string name="wizard_configure">Torifikasiyanı Quraşdır</string>
+  <string name="wizard_configure_msg">Orbot sənə bütün və ya seçilmiş aplikasiyalarını Tor vasitəsilə istifadə etməyə imkan yaradır.</string>
+  <string name="wizard_configure_all">Bütün Aplikasiyaları Tor Vasitəsilə Proksi Et</string>
+  <string name="wizard_configure_select_apps">Tor üçün Müəyyən Aplikasiyaları Seç</string>
+  <string name="wizard_tips_tricks">Orbota-açıq Aplikasiyalar</string>
+  <string name="wizard_tips_msg">Aşağıdakı aplikasiyalar Orbotla işləmək üçün quraşdırılmışdır. İndi quraşdırmaq üçün hər düyməni kliklə, ya da başqa vaxt onları Google Play, GuardianProject.info saytı və ya F-Doid.org-da tap.</string>
+  <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="wizard_tips_twitter">\"Yerlihost\" və 8118 portuna sahiblik üçün Twitter proksini quraşdır</string>
+  <string name="wizard_tips_story_maker">StoryMaker--Yazı yaz, təhlükəsizlik məsələsini torun öhdəsinə burax!</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>
+  <string name="wizard_proxy_help_msg">İstifadə etdiyiniz Android tətbiqetməsi HTTP və SOCKS proksinin istifadəsini dəstəkləyə bilirsə, siz onu Orbotla birləşdirmək üçün tənzimləyə və Tor.\n\n\n-dən istifadə edə bilərsiniz.   Host quraşdırmaları 127.0.0.1-dir, yaxud \"yerlihost\"dur. HTTP üçün port quraşdırması 8118-dir. SOCKS üçün proksi  9050-dir. Siz SOCKS4A, yaxud mümkünsə, SOCKS5-dən istifadə etməlisiniz.\n \n\n\n FAQ vasitəsiylə siz Androiddə proksiləmə haqda daha çox məlumat ala bilərsiniz: http://tinyurl.com/proxyandroid\n</string>
+  <string name="wizard_final">Orbot hazırdır!</string>
+  <string name="wizard_final_msg">Dünyanın müxtəlif yerlərində milyonlarla insan Tordan müxtəlif məqsədlərlə istifadə edir. \n\n Jurnalistlər, blogerlər, insan haqları müdafiəçiləri, hüquq-mühafizə orqanlarının işçiləri, əsgərlər, korporasiyalar, repressiv rejimlərin vətəndaşları, ya da adi vətəndaşlar...İndi buna siz də hazırsınız!</string>
+  <string name="wizard_exit_at_first_screen_toast">Zəhmət olmasa, istifadəyə başlamazdan əvvəl Orbotu tənzimləyin!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Siz Tor şəbəkəsinə uğurla qoşuldunuz. Ancaq bu o demək deyil ki, sizin cihazınız təhlükəsizdir. Əlqəni yoxlamaq üçün  \'Browser\' düyməsindən istifadə edə bilərsiniz. \n\n Bizə https://guardianproject.info/apps/orbot səhifəsində qonaq ola bilərsiniz. Daha çox məlumat əldə etmək üçün help at guardianproject.info ünvanına məktub yazmaq olar. </string>
+  <string name="tor_check">Orbotun konfiqurasiya edilməsini və sənin Tor-a qoşulduğunu dəqiqləşdirmək üçün bu sənin brauzerini https://check.torproject.org saytı ilə açacaq.</string>
+  <string name="pref_hs_group">Gizli Xidmət Hostinqi</string>
+  <string name="pref_general_group">Əsas</string>
+  <string name="pref_start_boot_title">Android Açıldıqda Orbotu Başlat</string>
+  <string name="pref_start_boot_summary">Android cihazın işə başladıqda avtomatik olaraq Orbot başlansın və Tor-a qoşulsun</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot Toru Androidə gətirir!\n\nTor məxfiliyə, gizli informasiya və şəxsi münasibətlərə xələl gətirə biləcək şəbəkə nəzarəti, məzmunun süzgəcdən keçirilməsi və trafik analizindən müdafiə olunmaqda sizə yardım edir.\n\nBu sehrbaz Orbot və Toru sizin cihazınıza quraşdırmağa kömək edəcək.  </string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Xəbərdarlıq</string>
+  <string name="wizard_warning_msg">Sadəcə Orbotun quraşdırılması mobil trafikinizi avtomatik olaraq anonimləşdirə bilməz.\n\nTordan uğurla istifadə etmək üçün siz Orbotu, cihazınızı və başqa tətbiqetmələri bir-birinə uyğunlaşdırmalısınız.  </string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">İcazə</string>
+  <string name="wizard_permissions_root_msg1">Sən istəsən Orbot-un \'Superistifadəçi\' girişini əldə edib Şəffaf Proksiləmə kimi əlavə seçimlər qazana bilərsən.</string>
+  <string name="wizard_permissions_root_msg2">Bunu etmək istəmirsənsə, yalnız Orbot-la işləməsi mümkün aplikasiyalara sahib olduğuna əmin ol</string>
+  <string name="wizard_permissions_no_root_msg">Sizin cihazınız yəqin ki, rout olunmayıb, ya da rout və ya \"Superistifadəçi\" keçidi ilə təmin etmir.\n\nXahiş edirik, bunun əvəzinə əsas ekranda \'Tətbiqetmələr\' rejimindən istifadə etməyə çalışın. </string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox: Tor vasitəsiylə işləyən və məxfiliyi artıran brauzer</string>
+  <string name="wizard_tips_play">Google Play-də bütün Guardian Layihə aplikasiyaları tap</string>
+  <string name="wizard_tips_fdroid">F-Droiddəki bütün Guardian Project tətbiqetmələrini tapın </string>
+  <string name="wizard_tips_fdroid_org">https://f-droid.org-də bütün Guardian Project tətbiqetmələrini tapın</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Şəffaf Proksiləmə</string>
+  <string name="wizard_transproxy_msg">Bu heç bir konfiqurasiyaya ehtiyac olmadan aplikasiyalarının avtomatik olaraq Tor şəbəkəsi vasitəsilə işləməsini təmin edir.</string>
+  <string name="wizard_transproxy_hint">(Dediklərimizdən heç biri haqqında xəbərin yoxdursa, qutunu işarələ)</string>
+  <string name="wizard_transproxy_none">Heç biri</string>
+  <string name="pref_transparent_tethering_title">Tor-un Son Həddi</string>
+  <string name="pref_transparent_tethering_summary">Wifi və USB ilə Bağlanan Cihazlar üçün Tor Şəffaf Proksiləməni Aktivləşdir (cihazın yenidən yüklənməsini tələb edir)</string>
+  <string name="button_grant_superuser">Superistifadəçi Giriş Tələbi</string>
+  <string name="pref_select_apps">Aplikasiya Seç</string>
+  <string name="pref_select_apps_summary">Tor vasitəsilə açılması üçün Aplikasiya seç</string>
+  <string name="pref_node_configuration">Kəsişmə Konfiqurasiyası</string>
+  <string name="pref_node_configuration_summary">Bunlar sənin anonimliyini azalda biləcək ətraflı seçimlərdir</string>
+  <string name="pref_entrance_node">Giriş Kəsişmələri</string>
+  <string name="pref_entrance_node_summary">Birinci sıçrayış üçün barmaq izləri, nişanlar, ölkələr və ünvanlar</string>
+  <string name="pref_entrance_node_dialog">Giriş Kəsişmələrini Əlavə et</string>
+  <string name="pref_allow_background_starts_title">Arxa fonun işə başlamasına icazə verin</string>
+  <string name="pref_allow_background_starts_summary">Qoy hər-hansı tətbiqetmə Orbota Tor və əlaqəli xidmətləri işə salmalı olduğunu desin</string>
+  <string name="button_proxy_all">Hər şeyi proksilə
+</string>
+  <string name="button_proxy_none">Heç nəyi proksiləmə</string>
+  <string name="button_invert_selection">Seçiminin yerini dəyiş</string>
+  <string name="pref_proxy_title">İxrac Edilən Şəbəkə Proksisi (istəyə bağlı)</string>
+  <string name="pref_proxy_type_title">İxrac Edilən Proksi Növü</string>
+  <string name="pref_proxy_type_summary">Proksi serveri istifadə etmək üçün protokol: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Proksi Növünü Daxil Et</string>
+  <string name="pref_proxy_host_title">İxrac Edilən Proksi Hostu</string>
+  <string name="pref_proxy_host_summary">Proksi Server host adı</string>
+  <string name="pref_proxy_host_dialog">Proksi Hostu Daxil Et</string>
+  <string name="pref_proxy_port_title">İxrac Edilən Proksi Port</string>
+  <string name="pref_proxy_port_summary">Proksi Server portu</string>
+  <string name="pref_proxy_port_dialog">Proksi portu daxil et</string>
+  <string name="pref_proxy_username_title">İxrac Edilən Proxy İstifadəçi Adı</string>
+  <string name="pref_proxy_username_summary">Proksi İstifadəçi Adı (istəyə bağlı)</string>
+  <string name="pref_proxy_username_dialog">Proksi İstifadəçi Adı Daxil Et</string>
+  <string name="pref_proxy_password_title">İxrac Edilən Proksi Şifrə</string>
+  <string name="pref_proxy_password_summary">Proksi Şifrə (istəyə bağlı)</string>
+  <string name="pref_proxy_password_dialog">Proksi Şifrə Daxil et</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Tam şəffaf proksiləmənin quraşdırılması...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Aplikasiya əsaslı şəffaf proksiləmənin quraşdırılması...</string>
+  <string name="transparent_proxying_enabled">Şəffaf proksiləmə AKTİVLƏŞDİRİLDİ</string>
+  <string name="transproxy_enabled_for_tethering_">Bağlanma üçün TransProksi aktivləşdirildi!</string>
+  <string name="warning_error_starting_transparent_proxying_">TƏHLÜKƏ: şəffaf proksiləmənin başlanmasında xəta!</string>
+  <string name="transproxy_rules_cleared">TransProksi qaydalar təmizləndi</string>
+  <string name="couldn_t_start_tor_process_">Tor prosesi başlana bilmədi:</string>
+  <string name="privoxy_is_running_on_port_">Polipo portda işləyir</string>
+  <string name="setting_up_port_based_transparent_proxying_">Porta əsaslanmış proksiləmənin quraşdırılması...</string>
+  <string name="bridge_error">Körpü Xətası</string>
+  <string name="bridge_requires_ip">Körpü funksiyasını istifadə etmək üçün ən azı bir körpü IP ünvanı əlavə etməlisən.</string>
+  <string name="send_email_for_bridges">Gmail hesabından bridges at torproject.org ünvanına mətn hissəsində \"körpü əldə et\" sözləri yazılmaqla məktub göndər.</string>
+  <string name="error">Xəta</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Sənin ƏlçatanÜnvanlar seçimin istisnaya səbəb oldu!</string>
+  <string name="your_relay_settings_caused_an_exception_">Sənin keçid seçimlərin istisnaya səbəb oldu!</string>
+  <string name="exit_nodes">Kəsişmələri Xaric Et</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Son sıçrayış üçün barmaq izləri, nişanlar, ölkələr və ünvanlar</string>
+  <string name="enter_exit_nodes">Çıxış Kəsişmələrini Daxil Et</string>
+  <string name="exclude_nodes">Kəsişmələri Xaric Et</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">İxrac üçün barmaq izləri, nişanlar, ölkələr və ünvanlar</string>
+  <string name="enter_exclude_nodes">İxrac Kəsişmələrini Daxil Et</string>
+  <string name="strict_nodes">Kəskin Kəsişmələr</string>
+  <string name="use_only_these_specified_nodes">*Yalnız* bu xüsusi kəsişmələri istifadə et</string>
+  <string name="bridges">Körpülər</string>
+  <string name="use_bridges">Körpü İstifadə Et</string>
+  <string name="bridges_obfuscated">Çaşdırıcı Körpülər</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Tor Şəbəkəsinə alternativ giriş kəsişmələrini aktivləşdir</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Quraşdırılmış körpülər çaşdırıcı körpülər olsa, aktivləşdir</string>
+  <string name="ip_address_and_port_of_bridges">Körpülərin IP ünvanı və portu</string>
+  <string name="enter_bridge_addresses">Körpü Ünvanlarını Daxil et</string>
+  <string name="relays">Keçidlər</string>
+  <string name="relaying">Keçidləmə</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Cihazının son-keçid funksiyasını aktivləşdir</string>
+  <string name="relay_port">Keçid Portu</string>
+  <string name="listening_port_for_your_tor_relay">Tor keçidin üçün portun dinlənməsi</string>
+  <string name="enter_or_port">OR port daxil et</string>
+  <string name="relay_nickname">Keçid adı</string>
+  <string name="the_nickname_for_your_tor_relay">Tor keçidin üçün ad</string>
+  <string name="enter_a_custom_relay_nickname">İlkin keçidə ad daxil et</string>
+  <string name="reachable_addresses">Əlçatan Ünvanlar</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Məhdudlaşmış siyasətlə qoruyucu divar arxasındakı müştəri kimi işlət</string>
+  <string name="reachable_ports">Əlçatan portlar</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Məhdudlaşdırılmış qoruyucu divar arxasında əlçatan portlar</string>
+  <string name="enter_ports">Port daxil et</string>
+  <string name="enable_hidden_services">Gizli Xidmət Hostinqi</string>
+  <string name="run_servers_accessible_via_the_tor_network">cihaz serverinin Tor şəbəkəsi tərəfindənəldə edilən olmasına icazə ver</string>
+  <string name="enter_localhost_ports_for_hidden_services">gizli xidmətlər üçün yerlihost portlarını daxil et</string>
+  <string name="hidden_service_ports">Gizli Xidmət Portları</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">gizli xidmətin üçün ünvanlanan ad (avtomatik hazırlanmış)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">məhsul üçün sazlama girişi daxil et (baxmaq üçün adb və ya aLogCat istifadə etməlisən)</string>
+  <string name="project_home">Layihə Evi(ləri):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor Lisenziyası</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Xidməti Quraşdırma:</string>
+  <string name="tor_version">
+Tor: https://www.torproject.org</string>
+  <string name="libevent_version">
+LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">SSL-i aç v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Aplikasiya Tor şəbəkəsinə %S gizli server portu açmaq istəyir. Aplikasiyaya inandığın halda bu təhlükəsizdir.</string>
+  <string name="found_existing_tor_process">mövcud Tor prosesi tapıldı...</string>
+  <string name="something_bad_happened">Nə isə pis bir şey oldu. Girişi yoxla</string>
+  <string name="hidden_service_on">burada gizli xidməti:</string>
+  <string name="unable_to_read_hidden_service_name">gizli xidmət adını oxumağı deaktivləşdir</string>
+  <string name="unable_to_start_tor">Tor-un başlanmasını dayandır:</string>
+  <string name="unable_to_reset_tor">Cihazınızı yenidən yükləyin, Toru bərpa etmək olmur!</string>
+  <string name="pref_use_sys_iptables_title">Mövcud Ipstol İstifadə Et</string>
+  <string name="pref_use_sys_iptables_summary">Orbotla bağlanmış ipstol əvəzinə daxili cüt ipstol istifadə et</string>
+  <string name="error_installing_binares">Tor cütlükləri quraşdırıla və ya təkmilləşdirilə bilmədi.</string>
+  <string name="pref_use_persistent_notifications">Həmişə Orbot qoşulduğu hallarda nişanı alətlət panelində saxla</string>
+  <string name="pref_use_persistent_notifications_title">Həmişə Açıq Xəbərdarlıqlar</string>
+  <string name="pref_use_expanded_notifications">Torla birlikdə ətraflı bildirişi göstərib ölkə və IP-dən çıxın. </string>
+  <string name="pref_use_expanded_notifications_title">Ətraflı bildirişlər</string>
+  <string name="notification_using_bridges">Körpülər aktivləşdirildi!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Dil</string>
+  <string name="set_locale_summary">Orbot üçün dil standartlarını və dili seç</string>
+  <string name="wizard_locale_title">Dil Seç</string>
+  <string name="wizard_locale_msg">Olduğu kimi saxla, ya da mövcud dilə keç</string>
+  <string name="powered_by">Tor tərəfindən yaradılmış</string>
+  <string name="btn_save_settings">Seçimləri Saxla</string>
+  <string name="no_internet_connection_tor">İnternet yoxdur; Tor gözləyir</string>
+  <string name="bandwidth_">Ötürmə qabiliyyəti:</string>
+  <string name="down">aşağı</string>
+  <string name="up">yuxarı</string>
+  <string name="pref_disable_network_title">Avto-Yuxu Şəbəkəsi Yoxdur</string>
+  <string name="pref_disable_network_summary">İnternet olmadıqda icazə ver Tor yatsın</string>
+  <string name="newnym">Yeni Tor oxşarına qoşuldun!</string>
+  <string name="menu_verify_browser">Bax</string>
+  <string name="menu_use_chatsecure">ChatSecure istifadə et</string>
+  <string name="permission_manage_tor_label">Toru İdarə Et</string>
+  <string name="permission_manage_tor_description">Tor xidmətini idarə etməsi üçün aplikasiyanı aktivləşdir</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Deyəsən Orfoxu quraşdırmamısınız. Yardıma ehtiyacınız var, yoxsa yalnız brauzeri açmalıyıq?</string>
+  <string name="install_apps_">Aplikasiya quraşdırılsın?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">İnternetlə əlaqə yoxdur. Tor gözləmə rejiminə keçir...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">İnternetlə əlaqə yaxşıdır. Tor iş rejiminə keçir...</string>
+  <string name="updating_settings_in_tor_service">Tor xidmətində quraşdırmalar yüklənir</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Torun təklif etdiyi Port SOCKS proksi işləyir (standart: 9050, yaxud söndürmək üçün 0) </string>
+  <string name="pref_socks_dialog">SOCKS Port Config</string>
+  <string name="pref_transport_title">Tor TransProxy Port</string>
+  <string name="pref_transport_summary">Torun təklif etdiyi Port Transparent proksi işləyir (standart: 9040, yaxud söndürmək üçün 0) </string>
+  <string name="pref_transport_dialog">TransProxy Port Config</string>
+  <string name="pref_dnsport_title">Tor DNS Port</string>
+  <string name="pref_dnsport_summary">Torun təklif etdiyi Port DNS işləyir (standart: 5400, yaxud söndürmək üçün 0)</string>
+  <string name="pref_dnsport_dialog">DNS Port Config</string>
+  <string name="pref_torrc_title">Torrc Custom Config</string>
+  <string name="pref_torrc_summary">YALNIZ EKSPERTLƏR: birbaşa torrc config xətlərini daxil edin</string>
+  <string name="pref_torrc_dialog">Custom Torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus - Benetech İnsan haqları Sənədləri tətbiqetməsi</string>
+  <string name="your_tor_public_ips_">Sizin ictimai Tor İP-ləriniz</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Orbotla bağlı probleminiz varsa, lütfən, Android->Settings->Apps-də bu tətbiqetməni söndürün;</string>
+  <string name="app_conflict">Tətbiqetmə konflikti</string>
+  <string name="pref_transproxy_refresh_title">Transproxy avtomatik yeniləmə</string>
+  <string name="pref_transproxy_refresh_summary">Şəbəkə vəziyyəti dəyişəndə Transproxy qaydalarını yenidən tətbiq edin</string>
+  <string name="pref_transproxy_flush_title">Transproxy MƏCBURİ POZMA</string>
+  <string name="pref_transproxy_flush_summary">Bütün transproxy şəbəkə qaydalarını elə İNDİ ləğv etmək üçün bura klikləyin</string>
+  <string name="transparent_proxy_rules_flushed_">Transparent proksi qaydaları ləğv edildi</string>
+  <string name="you_do_not_have_root_access_enabled">Root girişiniz yoxdur</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Quraşdırma dəyişikliklərinin tətbiq edilməsi üçün Orbota başlamağa və ya onu dayandırmağa ehtiyacınız ola bilər. </string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Körpülər yeniləndi</string>
+  <string name="restart_orbot_to_use_this_bridge_">Lütfən, Orbotu söndürün və yenidən yandırın ki, dəyişikliklər tətbiq edilsin.</string>
+  <string name="menu_qr">QR kodlar</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Sənin mobil şəbəkən Toru aktiv şəkildə əngəlləyirsə,  şəbəkəyə daxil olmaq üçün Körpüdən istifadə edə bilərsən. Körpüləri aktivləşdirmək üçün yuxarıdakı körpü növlərindən birini SEÇ.</string>
+  <string name="bridge_mode">Körpü rejimi</string>
+  <string name="get_bridges_email">Emeyl</string>
+  <string name="get_bridges_web">Veb</string>
+  <string name="activate">Aktivləşdir</string>
+  <string name="apps_mode">Tətbiqetmələr VPN Rejimi</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Tor şəbəkəsi vasitəsiylə qoşulmaq üçün Android.\n\n*WARNING*-in VPN funksiyasından istifadə edərək öz qurğunda bütün tətbiqetmələri aktivləşdirə bilərsən. Bu, yeni, eksperimental funksiyadır və bəzən avtomatik olaraq başlamaya, yaxud dayana bilər. Bundan anonimlik məqsədiylə istifadə etmək OLMAZ, bundan YALNIZ  süzgəc və qoruma divarlarından keçmək üçün istifadə etmək lazımdır. </string>
+  <string name="send_email">Emeyl göndərin</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Körpü ünvanını siz emeyl və veb vasitəsiylə, ya da körpünün QR kodunu skan etməklə əldə edə bilərsiniz. Körpü ünvanı haqda sorğunun altında  \'Email\'i, yaxud \'Web\'i seçin.\n\nÜnvanı əldə edəndən sonra  &amp-i nüsxələyin və onu Orbot quraşdırmasındakı \"Bridges\" parametrinə qoyun və cihazı yenidən yükləyin.</string>
+  <string name="install_orweb">Orfoxu quraşdırın</string>
+  <string name="standard_browser">Standart Brauzer</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">QEYD: Intel X86/ATOM cihazlarında yalnız standart Tor körpülər işləyir.</string>
+  <string name="vpn_default_world">Dünya</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-bg/strings.xml b/orbotservice/src/main/res/values-bg/strings.xml
new file mode 100644
index 0000000..22aff36
--- /dev/null
+++ b/orbotservice/src/main/res/values-bg/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Орбот</string>
+  <string name="app_description">Orbot е безплатна прокси програма, която дава възможноста на други програми да използват интерент по-сигурно. Orbot използва Tor, за да криптира Интернет трафика и след това го скрива като препраща през няколко компютъра по целия свят. Tor е безплатен софтуер и отворена мрежа, която ти помага да се предпазиш от шпиониране по мрежата, което заплашва твоята свобода и лично пространство, конфиденциални бизнес отношение и връзки, и от вид правителствено следене наречено трафик анализ.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">стартирай и стопирай Тор</string>
+  <string name="tor_proxy_service_process">Tor прокси</string>
+  <string name="status_starting_up">Орбот стартира...</string>
+  <string name="status_activated">Свързан към Тор мрежата</string>
+  <string name="status_disabled">Орбот е деактивиран</string>
+  <string name="status_shutting_down">TorService спира</string>
+  <string name="tor_process_starting">Стартиране на Тор клиент...</string>
+  <string name="tor_process_complete">завършено.</string>
+  <string name="tor_process_waiting">изчакване.</string>
+  <string name="not_anonymous_yet">ВНИМАНИЕ: Трафикът Ви не е анонимен! Моля конфигурирайте приложенията си да използват HTTP proxy 127.0.0.1:8118 или SOCKS4A или SOCKS5 proxy 127.0.0.1:9050</string>
+  <string name="menu_home">Начало</string>
+  <string name="menu_browse">Прелисти</string>
+  <string name="menu_settings">Настройки</string>
+  <string name="menu_log">Лог</string>
+  <string name="menu_info">Помощ</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Старт</string>
+  <string name="menu_stop">Стоп</string>
+  <string name="menu_about">Относно</string>
+  <string name="menu_promo_apps">Изтегли приложения...</string>
+  <string name="main_layout_download">Изтегли</string>
+  <string name="main_layout_upload">Качи</string>
+  <string name="button_help">Помощ</string>
+  <string name="button_close">Затвори</string>
+  <string name="button_about">Относно</string>
+  <string name="button_clear_log">Изчисти лог</string>
+  <string name="menu_verify">Check</string>
+  <string name="menu_exit">Изход</string>
+  <string name="menu_scan">Сканирай BridgeQR</string>
+  <string name="menu_share_bridge">Сподели BridgeQR</string>
+  <string name="press_to_start">- за старт натисни и задръж -</string>
+  <string name="pref_trans_proxy_group">Прозрачно прокси (Изисква Root)</string>
+  <string name="pref_trans_proxy_title">Прозрачно прокси</string>
+  <string name="pref_trans_proxy_summary">Автоматично прекарване на приложенията през Тор</string>
+  <string name="pref_transparent_all_title">Всичко през Тор</string>
+  <string name="pref_transparent_all_summary">Прехвърляй през Тор трафика на всички приложения</string>
+  <string name="pref_transparent_port_fallback_title">Тор прокси услугата смени порта</string>
+  <string name="pref_transparent_port_fallback_summary">ВНИМАНИЕ: Заобикаля стандартните портове(80, 443, т.н.). *ИЗПОЛЗВАЙ САМО* ако режимиете \'Всички\' или \'Програма\' не работят.</string>
+  <string name="pref_transparent_port_title">Списък портове</string>
+  <string name="pref_transparent_port_summary">Списък с портовете, на които да се ползва прокси. *ИЗПОЛЗВАЙ САМО* ако режимиете \'Всички\' или \'Програма\' не работят.</string>
+  <string name="pref_transparent_port_dialog">Въведи портове на прокси</string>
+  <string name="pref_has_root">Изисквай Root достъп</string>
+  <string name="pref_has_root_summary">Изисквай root достъп за прозрачно прокси</string>
+  <string name="status_install_success">Тор е успешно инсталиран!</string>
+  <string name="status_install_fail">Двуичните файлове на Тор не са инсталирани. Моля проверете лога и уведомете tor-assistants at torproject.org</string>
+  <string name="title_error">Грешка в приложението</string>
+  <string name="wizard_title">Орбот</string>
+  <string name="wizard_btn_tell_me_more">Относно Орбот</string>
+  <string name="btn_next">Следващ</string>
+  <string name="btn_back">Обратно</string>
+  <string name="btn_finish">Край</string>
+  <string name="btn_okay">ОК</string>
+  <string name="btn_cancel">Откажи</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Някои Орбот детайли</string>
+  <string name="wizard_details_msg">Orbot е приложение с отворен код, което съдържа Tor, LibEvent и Polipo. То предлага локално HTTP прокси (8118) и SOCKS прокси (9050) към Tor мрежата. Orbot също така има възможноста, на усройства с root достъп, да препраща целият интернет трафик през Tor.</string>
+  <string name="wizard_permissions_root">Правата дадени</string>
+  <string name="wizard_permissions_stock">Orbot Permissions</string>
+  <string name="wizard_premissions_msg_root">Отлично! Засякохме, че имате root права достъпни за Орбот. Ще използваме тази сила разумно.</string>
+  <string name="wizard_permissions_msg_stock"> Въпреки че не е задължително, Орбот може да стане по-мощно приложение ако има root достъп. Използвайте бутона долу за да дадете на Орбот суперсили!</string>
+  <string name="wizard_permissions_no_root">Ако нямате root достъп или не знаете за какво става въпрос, просто използвайте приложения направени да работят с Орбот.</string>
+  <string name="wizard_permissions_consent">Разбирам и искам да продължа без Суперпотребител</string>
+  <string name="wizard_permission_enable_root">Разреши Root за Орбот</string>
+  <string name="wizard_configure">Настрой Торификацията</string>
+  <string name="wizard_configure_msg">Орбот Ви дава възможност да прекарате всичкия трафик през Тор или да изберете приложения по отделно.</string>
+  <string name="wizard_configure_all">Прекарай всички приложения през Тор</string>
+  <string name="wizard_configure_select_apps">Избери отделни приложения за Тор</string>
+  <string name="wizard_tips_tricks">Поддържани от Орбот приложения</string>
+  <string name="wizard_tips_msg">Приложенията по-долу са създадени така, че да работят с Орбот. Цъкни на всеки бутон, за да инсталираш сега или може да ги намериш по-късно в Андроид маркет.</string>
+  <string name="wizard_tips_otrchat">ChatSecure - Криптиран чат програма за Андроид</string>
+  <string name="wizard_tips_proxy">Proxy Settings - Научете как да конфигурирате приложения да работят през Орбот</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo Търсачка</string>
+  <string name="wizard_tips_twitter">Нагласете проксито на Twitter на \"localhost\" и порт 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Създай история и остави сигурноста на tor!</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_proxy_help_msg">Ако Андроид приложението, което използваш поддържа HTTP или SOCKS прокси, тогава мжоеш да го конфигурираш да се свързва с Orbot и да използва Tor.\n\n\nНастойките са host 127.0.0.1 или \"localhost\". За HTTP, портът е 8118. За SOCKS проксито е 9050. Най-добре е по възможност да се използва SOCKS4A или SOCKS5.\n\n\n\nМожеш да научиш повече за прокситата в Андроид през странцита с въпроси и отговори: http://tinyurl.com/proxyandroid\n </string>
+  <string name="wizard_final">Орбот е готов!</string>
+  <string name="wizard_final_msg">Милиони хора по света използват Tor по голям брой причини.\n\nЖурналисти и блогъри, защитници на човешките права, органите на реда, войници, корпорации, граждани на държави с репресивни режими, и най-обикновени граждани... а сега и ти!</string>
+  <string name="wizard_exit_at_first_screen_toast">Моля, настрой Orbot преди да почнеш да го използваш!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Успешн се свързахте с Tor мрежата - това НЕ значи, че устройството Ви е предпазено. Може да използвате \'Браузър\' бутона да тествате връзката. \n\nОтидете на https://guardianproject.info/apps/orbot или изпратете имейл на help at guardianproject.info, за да научите повече.</string>
+  <string name="tor_check">Това ще те заведе на https://check.torproject.org, за да провери дали Orbot е правилно настроен и дали си свързан с Tор.</string>
+  <string name="pref_hs_group">Скрити услуги</string>
+  <string name="pref_general_group">Главни</string>
+  <string name="pref_start_boot_title">Стартирай Орбот при стартиране на устройството</string>
+  <string name="pref_start_boot_summary">Автоматично стартирай Орбот и се свържи към Тор когато твоето Андроид устройство стартира</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Орбот дава достъп до Tor през Android!\n\nTor ти помага да се предпазиш от филтриране на интернетът, анализ на трафика и подслушване по интернет всички, от които заплашват личното ти пространство, конфиденциалната ти информация и личните ти връзки.\n\nТози стъпка по стъпка наръчни ще ти помогне да настроиш Orbot и Tor на устройството си.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Внимание</string>
+  <string name="wizard_warning_msg">Самото инсталиране на Orbot няма автоматично да анонимизира мобилния ти трафик.\n\nТрябва да настроиш Orbot, устройството ти и други приложения, за да ползваш Tor успешно.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Права</string>
+  <string name="wizard_permissions_root_msg1">Ако желаеш може да разрешиш на Orbot \'Superuser\' права, за да включиш допълнителни функиции, като Прозрачно Проксифициране.</string>
+  <string name="wizard_permissions_root_msg2">Ако не желаеш това се увери, че програмите, които ще използваш са съвместими с Orbot </string>
+  <string name="wizard_permissions_no_root_msg">Устройството ти не изглежда да има или предлага root или така наречения \'Суперпотребителски\' достъп.\n\nМоля, използвай режидъмът \'Приложения\' на главния екран.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Приложения през Орбот</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: Криптирана чат програма с подръжка на Off-the-Record енкрипция.</string>
+  <string name="wizard_tips_orweb">Orfox: Браузър с насоченост към осигуряване на личното пространство, който работи през Tor</string>
+  <string name="wizard_tips_play">Намери всики Guardin Project програми в Google Play</string>
+  <string name="wizard_tips_fdroid">Намери всички приложения на Guardian Project в F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Намери всички Guardian Project приложения на https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Прозрачно прокси</string>
+  <string name="wizard_transproxy_msg">Това позволява на приложенията Ви автоматично да използват мрежата на Тор без никаква конфигурация.</string>
+  <string name="wizard_transproxy_hint">(Избери тази опция ако нямаш представа за какво става въпрос)</string>
+  <string name="wizard_transproxy_none">Нищо</string>
+  <string name="pref_transparent_tethering_title">Тетъринг през Тор</string>
+  <string name="pref_transparent_tethering_summary">Включи Прозрачно Тор Проксифициране през Wifi и USB (изисква рестартирване)</string>
+  <string name="button_grant_superuser">Изискай достъп на Суперпотребител</string>
+  <string name="pref_select_apps">Избери приложения</string>
+  <string name="pref_select_apps_summary">Избрери приложения за използване през Тор</string>
+  <string name="pref_node_configuration">Настройки на node-а</string>
+  <string name="pref_node_configuration_summary">Това са допълнителни настройки, които могат да намалят Вашата анонимност</string>
+  <string name="pref_entrance_node">Входящи точки</string>
+  <string name="pref_entrance_node_summary">Отпечатъци, никсове, държави и адреси за първия скок</string>
+  <string name="pref_entrance_node_dialog">Въведи входящи точки</string>
+  <string name="pref_allow_background_starts_title">Разреши тихо стартиране</string>
+  <string name="pref_allow_background_starts_summary">Разреши на всяко приложение да иска от Orbot да стартира Tor услуги</string>
+  <string name="button_proxy_all">Прокси за всички</string>
+  <string name="button_proxy_none">Прокси за нито една</string>
+  <string name="button_invert_selection">Обърни селекцията</string>
+  <string name="pref_proxy_title">Изходящо Мрежово Прокси (Незадължително)</string>
+  <string name="pref_proxy_type_title">Тип прокси</string>
+  <string name="pref_proxy_type_summary">Протокол за прокси сървър: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Тип на входящо прокси</string>
+  <string name="pref_proxy_host_title">Прокси хост</string>
+  <string name="pref_proxy_host_summary">Адреса на Прокси Сървърът</string>
+  <string name="pref_proxy_host_dialog">Въведи прокси хост</string>
+  <string name="pref_proxy_port_title">Порт на прокси</string>
+  <string name="pref_proxy_port_summary">Порта на Прокси Сървърът</string>
+  <string name="pref_proxy_port_dialog">Въведи прокси порт</string>
+  <string name="pref_proxy_username_title">Изходящ Прокси Потребителско Име</string>
+  <string name="pref_proxy_username_summary">Прокси Потребителско Име (Незадължително)</string>
+  <string name="pref_proxy_username_dialog">Въведи Прокси Потребителско Име</string>
+  <string name="pref_proxy_password_title">Изходяща Прокси Парола</string>
+  <string name="pref_proxy_password_summary">Прокси Парола (Незадължително)</string>
+  <string name="pref_proxy_password_dialog">Въведи Прокси Парола</string>
+  <string name="status">Статус</string>
+  <string name="setting_up_full_transparent_proxying_">Конфигуриране на напълно прозрачно прокси...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Конфигуриране на прозрачно прокси на база приложение...</string>
+  <string name="transparent_proxying_enabled">Прозрачно прокси АКТИВНО</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy е включен за Тетъринг!</string>
+  <string name="warning_error_starting_transparent_proxying_">ВНИМАНИЕ: грешка при стартиране на прозрачно проски!</string>
+  <string name="transproxy_rules_cleared">TransProxy правила изчистени</string>
+  <string name="couldn_t_start_tor_process_">Неуспешно стартиране на Тор процес: </string>
+  <string name="privoxy_is_running_on_port_">Polipo работи на порт:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Конфигуриране на прозрачно прокси на база порт...</string>
+  <string name="bridge_error">Бридж грешка</string>
+  <string name="bridge_requires_ip">За да използвате бридж функционалността трябва да въведете поне един IP адрес на бридж.</string>
+  <string name="send_email_for_bridges">Изпрати и-мейл до bridges at torproject.org със съдържание \"get bridges\" в  и-мейл от акаунт в gmail.</string>
+  <string name="error">Грешка</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Твоята ReachableAddresses настройка предизвика грешка!</string>
+  <string name="your_relay_settings_caused_an_exception_">Твоите настройки за препращане предизвикаха изключение!</string>
+  <string name="exit_nodes">Изходни точки</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Отпечатъци, никсове, държави и адреси за последния скок</string>
+  <string name="enter_exit_nodes">Въведи изходни точки</string>
+  <string name="exclude_nodes">Не ползвай Node-ве</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Отпечатъци, никсове, държави и адреси, които да не бъдат ползвани</string>
+  <string name="enter_exclude_nodes">Край</string>
+  <string name="strict_nodes">Задължителни Node-we</string>
+  <string name="use_only_these_specified_nodes">Използвай *само* изброените node-ве</string>
+  <string name="bridges">Бриджове</string>
+  <string name="use_bridges">Използвай Бриджове</string>
+  <string name="bridges_obfuscated">Скрити Мостове</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Включи алтернативени входящи node-ве в Tor Мрежата</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Включи ако настроените мостове са скрити мостове</string>
+  <string name="ip_address_and_port_of_bridges">IP адрес и порт на бриджове</string>
+  <string name="enter_bridge_addresses">Въведи адреси на бриджове</string>
+  <string name="relays">Препращачи(Relays)</string>
+  <string name="relaying">Препращане</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Разреши устройството ти да бъде не изходен препращач</string>
+  <string name="relay_port">Порт за Препращане</string>
+  <string name="listening_port_for_your_tor_relay">Порт за слушане на твоя Тор препращач</string>
+  <string name="enter_or_port">Въведи OR порт</string>
+  <string name="relay_nickname">Прякор на препращача</string>
+  <string name="the_nickname_for_your_tor_relay">Прякор за твоя Tor препращач</string>
+  <string name="enter_a_custom_relay_nickname">Въведи прякор за препращача</string>
+  <string name="reachable_addresses">Достижими адреси</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Стартирай като клиент зад firewall с рестриктивни политики</string>
+  <string name="reachable_ports">Достъпни портове</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Портове достъпни зад firewall с рестриктивни политики</string>
+  <string name="enter_ports">Въведи портове</string>
+  <string name="enable_hidden_services">Включи скрити услуги</string>
+  <string name="run_servers_accessible_via_the_tor_network">стартирай сървъри достъпни през Тор мрежата</string>
+  <string name="enter_localhost_ports_for_hidden_services">въведи локални портове за скрити услуги</string>
+  <string name="hidden_service_ports">Портове на скрити услуги</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Автоматично генериран адрес за твоята скрита услуга(hidden service)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">включи запис на дебъг доклади (трябва да ползвате aLogCat или adb, за да ги разглеждаш)</string>
+  <string name="project_home">Начални Станици на Проектите:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Тор лиценз</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Софтуер на трети страни: </string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Приложение иска да отвори порт на скрит сървър %S към Тор мрежата. Безопасно е да се доверите на приложението.</string>
+  <string name="found_existing_tor_process">намерил си съвместим Tor проект...</string>
+  <string name="something_bad_happened">Нещо лошо се случи. Проверете лога</string>
+  <string name="hidden_service_on">Скрита услуга включена:</string>
+  <string name="unable_to_read_hidden_service_name">не може да прочете име на скрита услуга</string>
+  <string name="unable_to_start_tor">Не може да стартира Тор:</string>
+  <string name="unable_to_reset_tor">Рестартирай устройството си, неуспешно рестариване на Tor!</string>
+  <string name="pref_use_sys_iptables_title">Използвай Iptables по подразбиране</string>
+  <string name="pref_use_sys_iptables_summary">използвай вградените двуични iptables вместо тези идващи с Orbot</string>
+  <string name="error_installing_binares">Двуичните файлове на Тор не бяха инсталирани или обновени.</string>
+  <string name="pref_use_persistent_notifications">Винаги показвай икона в тулбара когато Орбот е свързан</string>
+  <string name="pref_use_persistent_notifications_title">Уведомления винаги включени</string>
+  <string name="pref_use_expanded_notifications">Покажи разширена информация за Tor изходната държава и IP в лентата за известия</string>
+  <string name="pref_use_expanded_notifications_title">Разширени известия</string>
+  <string name="notification_using_bridges">Мостове включени!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Език</string>
+  <string name="set_locale_summary">Избери местоположение и език за Орбот</string>
+  <string name="wizard_locale_title">Избери език</string>
+  <string name="wizard_locale_msg">Остави по подразбиране или смени наличния език</string>
+  <string name="powered_by">базиран на Tor</string>
+  <string name="btn_save_settings">Запази настройки</string>
+  <string name="no_internet_connection_tor">Няма интернет връзка; Tor е в режим на изчакване...</string>
+  <string name="bandwidth_">Скорост:</string>
+  <string name="down">теглене</string>
+  <string name="up">изпращане</string>
+  <string name="pref_disable_network_title">Лиспва Автоматичен Режим на Изчакване</string>
+  <string name="pref_disable_network_summary">Сложи Tor в режим на изчакване, когато няма интернет</string>
+  <string name="newnym">Сменихте своята Тор идентичност!</string>
+  <string name="menu_verify_browser">Браузър</string>
+  <string name="menu_use_chatsecure">Използвай ChatSecure</string>
+  <string name="permission_manage_tor_label">Настрой Tor</string>
+  <string name="permission_manage_tor_description">Разреши тази програма да контролира Tor</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Не изглежда да имате Orfox инсталиран. Желаете ли помощ с това, или просто да отворим браузъра?</string>
+  <string name="install_apps_">Инсталирай програми?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Няма интернет връзка. Преминаване в режим на изчкаване...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Добра интернет връзка. Събуждане на Tor...</string>
+  <string name="updating_settings_in_tor_service">обновяване на настройките в Tor услугата</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Порт, на който Tor предлага своето SOCKS прокси(подразбиране: 9050 или 0, за да забраниш)</string>
+  <string name="pref_socks_dialog">SOCKS Port Config</string>
+  <string name="pref_transport_title">Tor TransProxy Port</string>
+  <string name="pref_transport_summary">Порт, на който Tor предлага своето Transparent прокси прокси(подразбиране: 9040 или 0, за да забраниш)</string>
+  <string name="pref_transport_dialog">TransProxy Port Config</string>
+  <string name="pref_dnsport_title">Tor DNS Port</string>
+  <string name="pref_dnsport_summary">Порт, на който Tor предлага своят DNS (подразбиране: 5400 или 0, за да забраниш)</string>
+  <string name="pref_dnsport_dialog">DNS Port Config</string>
+  <string name="pref_torrc_title">Torrc Custom Config</string>
+  <string name="pref_torrc_summary">САМО ЗА ЕКСПЕРТИ: въведи директно torrc конфигурационният код</string>
+  <string name="pref_torrc_dialog">Ръчно настроен Torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</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_">Моля, забрани тази програма в  Android->Настройки->Приложения ако имаш проблеми с Orbot:</string>
+  <string name="app_conflict">Конфликт с друго приложение</string>
+  <string name="pref_transproxy_refresh_title">Транспрокси автоматично освежаване</string>
+  <string name="pref_transproxy_refresh_summary">Приложи повторно транспрокси правилата при промяна на състоянието на мрежата</string>
+  <string name="pref_transproxy_flush_title">Транспроски ПРИНУДИТЕЛНО ПРЕМАХВАНЕ</string>
+  <string name="pref_transproxy_flush_summary">Натисни тук, за да изтриеш всички транспркси мрежови правила ВЕДНАГА</string>
+  <string name="transparent_proxy_rules_flushed_">Транспрокси правилата изтрити!</string>
+  <string name="you_do_not_have_root_access_enabled">Нямаш ROOT достъп до устройството</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Може да се наложи да спреш и стартираш Orbot, за да могат някои настройки да влязат в действие.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Мостове включени!</string>
+  <string name="restart_orbot_to_use_this_bridge_">Моля, рестартирай Orbot, за да влязат в действие промените</string>
+  <string name="menu_qr">QR Кодове</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Ако вашата мрежа целенасочено блирва Tor, може да използвате Мост, за да се свържете. ИЗБЕРЕТЕ един от видовете мостове изброени по-горе, за да включите тази функционалност.</string>
+  <string name="bridge_mode">Режим мост</string>
+  <string name="get_bridges_email">Имейл</string>
+  <string name="get_bridges_web">Уеб</string>
+  <string name="activate">Активирай</string>
+  <string name="apps_mode">Приложения във VPN режим</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Можеш да настроиш всички приложения да минават през Tor мрежата използвайки VPN функцията на Андроид.\n\n*ПРЕДУПРЕЖДЕНИЕ* Това е нова, експериментална функция и в някои случаи може да не стартира автоматично, или да спре. НЕ бива да се използва за анонимност, а САМО за преминаване през файъруоли и филтри.</string>
+  <string name="send_email">Изпрати имейл</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Можеш да получиш адреса на мост по имейл, интернет или като сканираш QR kod. Избери \'Имейл\' или \'Интернет\' по-долу, за да поискаш адрес на мост.\n\nВеднъж щом получиш адреса го копирай в \"Мостове\", в настройките на Orbot и рестартирай приложението.</string>
+  <string name="install_orweb">Инсталирай Orfox</string>
+  <string name="standard_browser">Нормален Браузър</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">БЕЛЕЖКА: Само стандартни Tor мостове работя на Intel X86/ATOM устройства</string>
+  <string name="vpn_default_world">Свят</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-bn-rBD/strings.xml b/orbotservice/src/main/res/values-bn-rBD/strings.xml
new file mode 100644
index 0000000..d179a61
--- /dev/null
+++ b/orbotservice/src/main/res/values-bn-rBD/strings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">অরবট</string>
+  <string name="app_description">Orbot একটি ফ্রি প্রক্সি অ্যাপ্লিকেশন যা অন্যান্য Apps কে আরও নিরাপদভাবে ইন্টারনেট ব্যবহার করার ক্ষমতাপ্রদান করে।  Orbot আপনার ইন্টারনেট ট্রাফিক এনক্রিপ্ট করতে টর ব্যবহার এবং তারপর সারা বিশ্বের কম্পিউটারের সিরিজের moddho diye porichalito kore gopon kore. টর ফ্রি সফটওয়্যার এবং আপনি ট্রাফিক বিশ্লেষণ হিসেবে পরিচিত ব্যক্তিগত স্বাধীনতা ও গোপনীয়তা, গোপনীয় বাণিজ্যিক কার্যক্রম এবং সম্পর্ক, এবং রà¦
 ¾à¦·à§à¦Ÿà§à¦°à§€à¦¯à¦¼ নিরাপত্তা হুমকির মুখে পড়ে নেটওয়ার্ক নজরদারি একটি ফর্ম বিরুদ্ধে রক্ষা করতে সাহায্য করে যে একটি খোলা নেটওয়ার্ক.</string>
+  <string name="tor_proxy_service_process">টর প্রক্সি সার্ভিস</string>
+  <string name="status_starting_up">অরবট চালু হচ্ছে . . . </string>
+  <string name="status_activated">টর নেটওয়ার্কের সাথে সংযুক্ত হয়েছে</string>
+  <string name="status_disabled">অরবট নিষ্ক্রিয় করা হয়েছে</string>
+  <string name="tor_process_starting">টর ক্লায়েন্ট চালু করা হচ্ছে</string>
+  <string name="tor_process_complete">সম্পূর্ণ</string>
+  <string name="tor_process_waiting">অপেক্ষা করা হচ্ছে</string>
+  <string name="menu_home">হোম</string>
+  <string name="menu_settings">নিয়ম বিন্যাস</string>
+  <string name="menu_info">সাহায্য</string>
+  <string name="menu_start">শুরু</string>
+  <string name="menu_stop">শেষ</string>
+  <string name="button_help">সাহায্য</string>
+  <string name="button_close">বন্ধ</string>
+  <string name="press_to_start">চালু করার জন্য ধরে থাকুন</string>
+  <string name="pref_transparent_all_title">সব কিছু টরের মাধ্যমে করুন </string>
+  <string name="wizard_title">অরবট</string>
+  <string name="btn_next">পরবর্তী</string>
+  <string name="btn_back">পেছনে</string>
+  <string name="btn_finish">শেষ</string>
+  <string name="btn_okay">ঠিক আছে</string>
+  <string name="btn_cancel">বাদ</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_permissions_stock">অরবট এর অনুমতিসমূহ </string>
+  <string name="wizard_permissions_consent">আমি বুঝতে পেরেছি এবং এগিয়ে যেতে চাই Superuser ছাড়া।</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">সাধারণ</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">অনুমতিসমূহ</string>
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-bn-rIN/strings.xml b/orbotservice/src/main/res/values-bn-rIN/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/orbotservice/src/main/res/values-bn-rIN/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-bn/strings.xml b/orbotservice/src/main/res/values-bn/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/orbotservice/src/main/res/values-bn/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-brx/strings.xml b/orbotservice/src/main/res/values-brx/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/orbotservice/src/main/res/values-brx/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-bs/strings.xml b/orbotservice/src/main/res/values-bs/strings.xml
new file mode 100644
index 0000000..bcef347
--- /dev/null
+++ b/orbotservice/src/main/res/values-bs/strings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_info">Pomoć</string>
+  <string name="button_help">Pomoć</string>
+  <string name="button_close">Zatvori</string>
+  <string name="btn_back">Nazad</string>
+  <string name="btn_cancel">Otkaži</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Proksi postavke</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-ca/strings.xml b/orbotservice/src/main/res/values-ca/strings.xml
new file mode 100644
index 0000000..709b1e4
--- /dev/null
+++ b/orbotservice/src/main/res/values-ca/strings.xml
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">https://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">Inicia i atura Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">L\'Orbot s\'està iniciant...</string>
+  <string name="status_activated">Esteu connectat a la xarxa Tor</string>
+  <string name="status_disabled">L\'Orbot està desactivat</string>
+  <string name="tor_process_starting">S\'està iniciant el client Tor...</string>
+  <string name="tor_process_complete">fet.</string>
+  <string name="tor_process_waiting">s\'està esperant.</string>
+  <string name="not_anonymous_yet">ATENCIÓ: El trànsit de la vostra connexió encara no és anònim! Heu de configurar les vostres aplicacions per utilitzar un proxy HTTP a 127.0.0.1:8118, o un proxy SOCKS4A o SOCKS5 a 127.0.0.1:9050</string>
+  <string name="menu_home">Inici</string>
+  <string name="menu_browse">Navega</string>
+  <string name="menu_settings">Preferències</string>
+  <string name="menu_log">Registre</string>
+  <string name="menu_info">Ajuda</string>
+  <string name="menu_start">Inicia</string>
+  <string name="menu_stop">Atura</string>
+  <string name="menu_about">Quant a...</string>
+  <string name="main_layout_download">Baixada</string>
+  <string name="main_layout_upload">Pujada</string>
+  <string name="button_help">Ajuda</string>
+  <string name="button_close">Tanca</string>
+  <string name="button_about">Quant a...</string>
+  <string name="button_clear_log">Esborra el registre</string>
+  <string name="menu_verify">Prova</string>
+  <string name="menu_exit">Surt</string>
+  <string name="press_to_start">- mantén-lo premut per iniciar -</string>
+  <string name="pref_trans_proxy_group">Proxy transparent (requereix Root)</string>
+  <string name="pref_trans_proxy_title">Utilitza un proxy transparent</string>
+  <string name="pref_trans_proxy_summary">Torificació automàtica de les apps</string>
+  <string name="pref_transparent_all_title">Tor per a tot</string>
+  <string name="pref_transparent_all_summary">Canalitza el trànsit de totes les aplicacions a través de Tor</string>
+  <string name="pref_transparent_port_fallback_title">Port alternatiu per al proxy </string>
+  <string name="pref_transparent_port_fallback_summary">ATENCIÓ: Això trampeja els ports habituals (80, 443, etc.) *UTILITZEU-HO NOMÉS* si el mode «Totes» o «App» no funcionen.</string>
+  <string name="pref_transparent_port_title">Llista de ports</string>
+  <string name="pref_transparent_port_summary">Llista de ports a canalitzar per proxy. *UTILITZEU-HO NOMÉS* si el mode «Totes» o «App» no funcionen.</string>
+  <string name="pref_transparent_port_dialog">Introduïu els ports a canalitzar per proxy</string>
+  <string name="pref_has_root">Demana l\'accés root</string>
+  <string name="pref_has_root_summary">Demana l\'accés root per a la canalització a través de proxy transparent</string>
+  <string name="status_install_success">Els binaris de Tor s\'han instal·lat correctament.</string>
+  <string name="status_install_fail">Els fitxers binaris de Tor no s\'han pogut instal·lar. Comproveu el registre i notifiqueu-ho a tor-assistants at torproject.org</string>
+  <string name="title_error">Error de l\'aplicació</string>
+  <string name="wizard_title">Us donem la benvinguda a l\'Orbot</string>
+  <string name="wizard_btn_tell_me_more">Quant a Orbot...</string>
+  <string name="btn_next">Següent</string>
+  <string name="btn_back">Enrere</string>
+  <string name="btn_finish">Fi</string>
+  <string name="btn_okay">D\'acord</string>
+  <string name="btn_cancel">Cancel·la</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Alguns detalls de l\'Orbot...</string>
+  <string name="wizard_permissions_root">Permís concedit</string>
+  <string name="wizard_permissions_stock">Permisos de l\'Orbot</string>
+  <string name="wizard_premissions_msg_root">Perfecte! Hem detectat que teniu els permisos root activats per a l\'Orbot. Utilitzarem aquesta capacitat amb sensatesa.</string>
+  <string name="wizard_permissions_msg_stock">Encara que no és imprescindible, l\'Orbot pot esdevenir una eina molt més potent si el vostre terminal té accés root. Utilitzeu el botó d\'aquí sota per concedir superpoders a l\'Orbot!</string>
+  <string name="wizard_permissions_no_root">Si no teniu accés root, o no teniu ni idea del què us estem parlant, simplement assegureu-vos d\'utilitzar aplicacions dissenyades per funcionar amb l\'Orbot.</string>
+  <string name="wizard_permissions_consent">Ho entenc i vull continuar sense accés de superusuari</string>
+  <string name="wizard_permission_enable_root">Concedeix accés root a l\'Orbot</string>
+  <string name="wizard_configure">Configura la connexió a Tor</string>
+  <string name="wizard_configure_msg">L\'Orbot us ofereix l\'opció de canalitzar el trànsit de totes les aplicacions a través de Tor o bé escollir quines aplicacions voleu que utilitzin Tor.</string>
+  <string name="wizard_configure_all">Canalitza totes les aplicacions a través de Tor.</string>
+  <string name="wizard_configure_select_apps">Selecciona les aplicacions individualment</string>
+  <string name="wizard_tips_tricks">Aplicacions per utilitzar amb l\'Orbot</string>
+  <string name="wizard_tips_msg">Les aplicacions d\'aquí sota s\'han dissenyat per funcionar amb l\'Orbot. Feu clic a cada botó per instalar-les ara, o busqueu-les després a Google Play Store, al lloc web de GuardianProject.info o a F-Droid.org.</string>
+  <string name="wizard_tips_otrchat">ChatSecure - Client de missatgeria instantània segura per a Android</string>
+  <string name="wizard_tips_proxy">Proxy Settings - Aprèn a configurar aplicacions per a què funcionin amb l\'Orbot</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo - Aplicació de cerca al web</string>
+  <string name="wizard_tips_twitter">Estableix el proxy de Twitter a l\'amfitrió «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">Ajustaments del proxy</string>
+  <string name="wizard_final">L\'Orbot és a punt!</string>
+  <string name="wizard_exit_at_first_screen_toast">Configureu l\'Orbot abans d\'utilitzar-lo!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">S\'obrirà el vostre navegador web a https://check.torproject.org per tal de comprovar si l\'Orbot està ben configurat i estàs connectat a Tor.</string>
+  <string name="pref_hs_group">Serveis ocults</string>
+  <string name="pref_general_group">General</string>
+  <string name="pref_start_boot_title">Inicia l\'Obot a l\'arrencada</string>
+  <string name="pref_start_boot_summary">Inicia l\'Orbot i connecta a Tor automàticament quan el vostre dispositiu Android arrenca.</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Advertència</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permisos</string>
+  <string name="wizard_permissions_root_msg1">Opcionalment podeu concedir accés «superusuari» a l\'Orbot per activar funcions avançades, com el servidor intermediari transparent.</string>
+  <string name="wizard_permissions_root_msg2">Si no voleu fer això assegureu-vos de fer servir aplicacions dissenyades per funcionar amb l\'Orbot.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Trobareu totes les aplicacions de Guardian Project a Google Play Store</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Servidor intermediari transparent</string>
+  <string name="wizard_transproxy_msg">Això permet que les vostres aplicacions es connectin a través de la xarxa Tor sense haver de configurar res.</string>
+  <string name="wizard_transproxy_hint">(Marqueu aquesta casella si no teniu ni idea del que estem parlant)</string>
+  <string name="wizard_transproxy_none">Cap</string>
+  <string name="pref_transparent_tethering_title">Compartició de xarxa amb Tor</string>
+  <string name="pref_transparent_tethering_summary">Activa el servidor intermediari transparent de Tor pels dispositius connectats a través de la compartició de xarxa via Wifi o USB (cal reiniciar)</string>
+  <string name="button_grant_superuser">Petició d\'accés de superusuari</string>
+  <string name="pref_select_apps">Selecciona les apps</string>
+  <string name="pref_select_apps_summary">Trieu quines apps s\'han de canalitzar a través de Tor</string>
+  <string name="pref_node_configuration">Configuració de node</string>
+  <string name="pref_node_configuration_summary">Aquests són paràmetres avançats que poden reduir el vostre anonimat</string>
+  <string name="pref_entrance_node">Node d\'entrada</string>
+  <string name="pref_entrance_node_summary">Empremtes, àlies, països i adreces pel primer salt</string>
+  <string name="pref_entrance_node_dialog">Introduïu els nodes d\'entrada</string>
+  <string name="button_proxy_all">Totes via proxy</string>
+  <string name="button_proxy_none">Cap via proxy</string>
+  <string name="button_invert_selection">Inverteix selecció</string>
+  <string name="pref_proxy_title">Servidor intermediari de sortida a la xarxa (opcional)</string>
+  <string name="pref_proxy_type_title">Tipus de servidor intermediari de sortida</string>
+  <string name="pref_proxy_type_summary">Protocol a utilitzar pel servidor intermediari: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Introduïu el tipus de servidor intermediari</string>
+  <string name="pref_proxy_host_title">Amfitrió del servidor intermediari de sortida</string>
+  <string name="pref_proxy_host_summary">Nom de l\'amfitrió del servidor intermediari</string>
+  <string name="pref_proxy_host_dialog">Introduïu l\'amfitrió del servidor intermediari</string>
+  <string name="pref_proxy_port_title">Port del servidor intermediari de sortida</string>
+  <string name="pref_proxy_port_summary">Port del servidor intermediari</string>
+  <string name="pref_proxy_port_dialog">Introduïu el port del servidor intermediari</string>
+  <string name="pref_proxy_username_title">Nom d\'usuari del servidor intermediari de sortida</string>
+  <string name="pref_proxy_username_summary">Nom d\'usuari del servidor intermediari (opcional)</string>
+  <string name="pref_proxy_username_dialog">Introduïu el nom d\'usuari del servidor intermediari</string>
+  <string name="pref_proxy_password_title">Contrasenya del servidor intermediari de sortida</string>
+  <string name="pref_proxy_password_summary">Contrasenya del servidor intermediari (opcional)</string>
+  <string name="pref_proxy_password_dialog">Introduïu la contrasenya del servidor intermediari</string>
+  <string name="status">Estat</string>
+  <string name="setting_up_full_transparent_proxying_">S\'està configurant el servidor intermediari transparent complet...</string>
+  <string name="setting_up_app_based_transparent_proxying_">S\'està configurant el servidor intermediari transparent per apps...</string>
+  <string name="transparent_proxying_enabled">S\'ha ACTIVAT el servidor intermediari transparent</string>
+  <string name="transproxy_enabled_for_tethering_">S\'ha activat el servidor intermediari per la compartició de xarxa</string>
+  <string name="warning_error_starting_transparent_proxying_">ATENCIÓ: hi ha hagut un error en iniciar el servidor intermediari transparent</string>
+  <string name="transproxy_rules_cleared">S\'han esborrat les regles del servidor intermediari transparent</string>
+  <string name="couldn_t_start_tor_process_">No s\'ha pogut iniciar el procés Tor:</string>
+  <string name="setting_up_port_based_transparent_proxying_">S\'està configurant el servidor intermediari transparent per ports...</string>
+  <string name="bridge_error">Hi ha hagut un error de pont</string>
+  <string name="bridge_requires_ip">Per poder utilitzar la funcionalitat de pont, cal que introduïu almenys una adreça IP de pont.</string>
+  <string name="send_email_for_bridges">Envieu un correu a bridges at torproject.org amb la línia «get bridges» sola al cos del missatge des d\'un compte de gmail.</string>
+  <string name="error">Error</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Els paràmetres d\'adreces accessibles han provocat una excepció.</string>
+  <string name="your_relay_settings_caused_an_exception_">Els paràmetres de reemissió han causat una excepció.</string>
+  <string name="exit_nodes">Nodes de sortida</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Empremtes, àlies, països i adreces per l\'últim salt</string>
+  <string name="enter_exit_nodes">Introduïu els nodes de sortida</string>
+  <string name="exclude_nodes">Nodes per excloure</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Empremtes, àlies, països i adreces per excloure</string>
+  <string name="enter_exclude_nodes">Introduïu nodes per excloure</string>
+  <string name="strict_nodes">Nodes estrictes</string>
+  <string name="use_only_these_specified_nodes">Utilitza *només* aquests nodes especificats</string>
+  <string name="bridges">Ponts</string>
+  <string name="use_bridges">Utilitza ponts</string>
+  <string name="bridges_obfuscated">Ponts ofuscats</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Activa nodes alternatius d\'entrada a la xarxa Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Activeu-ho si els ponts configurats són ponts ofuscats</string>
+  <string name="ip_address_and_port_of_bridges">Adreça IP i port dels ponts</string>
+  <string name="enter_bridge_addresses">Introduïu les adreces del pont</string>
+  <string name="relays">Reemissors</string>
+  <string name="relaying">Reemissió</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Activa el vostre dispositiu per ser un reemissor sense sortida</string>
+  <string name="relay_port">Port de reemissió</string>
+  <string name="listening_port_for_your_tor_relay">Port d\'escolta per la vostra reemissió de Tor</string>
+  <string name="enter_or_port">Introduïu el port OR</string>
+  <string name="relay_nickname">Àlies del reemissor</string>
+  <string name="the_nickname_for_your_tor_relay">L\'àlies pel vostre reemissor de Tor</string>
+  <string name="enter_a_custom_relay_nickname">Introduïu un àlies personalitzat pel vostre reemissor</string>
+  <string name="reachable_addresses">Adreces accessibles</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">S\'executa com a client darrera d\'un tallafocs amb normes restrictives</string>
+  <string name="reachable_ports">Ports accessibles</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Ports que es poden accedir darrera d\'un tallafocs restrictiu</string>
+  <string name="enter_ports">Introduïu els ports</string>
+  <string name="enable_hidden_services">Allotjament de servei ocult</string>
+  <string name="run_servers_accessible_via_the_tor_network">Permet que un servidor al dispositiu sigui accessible des de la xarxa Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">introduïu els ports de l\'amfitrió local pels serveis ocults</string>
+  <string name="hidden_service_ports">Ports del servei coult</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">el nom adreçable pel vostre servei ocult (generat automàticament)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">activa la sortida del registre de depuració (cal utilitzar l\'adb o l\'aLogCat per veure\'l)</string>
+  <string name="project_home">Lloc(s) web del projecte:</string>
+  <string name="the_tor_license">La llicència Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Programari de terceres parts:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Una aplicació vol obrir el port %S de servei ocult a la xarxa Tor. Això és segur si confieu en l\'aplicació.</string>
+  <string name="found_existing_tor_process">s\'ha trobat un procés Tor existent...</string>
+  <string name="something_bad_happened">Ha fallat alguna cosa. Comproveu el registre</string>
+  <string name="hidden_service_on">servei ocult a:</string>
+  <string name="unable_to_read_hidden_service_name">ha estat impossible llegir el nom del servei ocult</string>
+  <string name="unable_to_start_tor">Ha estat impossible iniciar Tor:</string>
+  <string name="pref_use_sys_iptables_title">Utilitza les Iptables per defecte</string>
+  <string name="pref_use_sys_iptables_summary">utilitza el binari incorporat amb l\'Iptables enlloc del que porta l\'Orbot</string>
+  <string name="error_installing_binares">Els binaris de Tor no s\'han pogut instal·lar o actualitzar.</string>
+  <string name="pref_use_persistent_notifications">Manté la icona sempre a la barra d\'eines mentre l\'Orbot està connectat</string>
+  <string name="pref_use_persistent_notifications_title">Notificacions sempre activades</string>
+  <string name="notification_using_bridges">Ponts activats.</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Trieu la localització i la llengua per l\'Orbot</string>
+  <string name="wizard_locale_title">Tria la llengua</string>
+  <string name="wizard_locale_msg">Deixa-ho per defecte o canvia la llengua actual</string>
+  <string name="powered_by">funciona amb Tor</string>
+  <string name="btn_save_settings">Desa els paràmetres</string>
+  <string name="bandwidth_">Ample de banda:</string>
+  <string name="down">baixada</string>
+  <string name="up">pujada</string>
+  <string name="pref_disable_network_title">No hi ha autodesconnexió de xarxa</string>
+  <string name="pref_disable_network_summary">Posa el Tor en pausa mentre no hi ha connexió a internet</string>
+  <string name="newnym">Heu canviat a una nova identitat Tor.</string>
+  <string name="menu_use_chatsecure">Utilitza ChatSecure</string>
+  <string name="permission_manage_tor_label">Gestiona Tor</string>
+  <string name="permission_manage_tor_description">Activa aquesta app per controlar el servei Tor</string>
+  <string name="install_apps_">Voleu instal·lar les apps?</string>
+  <string name="your_tor_public_ips_">Les vostres IP públiques de Tor:</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="get_bridges_email">Correu-e</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Activa</string>
+  <string name="standard_browser">Navegador estàndard</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-cs-rCZ/strings.xml b/orbotservice/src/main/res/values-cs-rCZ/strings.xml
new file mode 100644
index 0000000..468e0b4
--- /dev/null
+++ b/orbotservice/src/main/res/values-cs-rCZ/strings.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">spustit a vypnout Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot se spouští...</string>
+  <string name="status_activated">Připojen k síti Tor</string>
+  <string name="status_disabled">Orbot je deaktivován</string>
+  <string name="tor_process_starting">Startuji Tor klienta...</string>
+  <string name="tor_process_complete">hotovo.</string>
+  <string name="tor_process_waiting">čekám.</string>
+  <string name="not_anonymous_yet">VAROVÁNÍ: Vaše komunikace ještě není anonymní! Prosím nastavte vašim aplikacím HTTP proxy 127.0.0.1:8118 nebo SOCKS4A či SOCKS5 proxy 172.0.0.1:9050</string>
+  <string name="menu_home">Domů</string>
+  <string name="menu_browse">Prohlížet</string>
+  <string name="menu_settings">Nastavení</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Pomoc</string>
+  <string name="menu_start">Zapnout</string>
+  <string name="menu_stop">Vypnout</string>
+  <string name="menu_about">O aplikaci</string>
+  <string name="main_layout_download">Stáhnout</string>
+  <string name="main_layout_upload">Nahrát</string>
+  <string name="button_help">Nápověda</string>
+  <string name="button_close">Zavřít</string>
+  <string name="button_about">O aplikaci</string>
+  <string name="button_clear_log">Vyčistit log</string>
+  <string name="menu_verify">Ověřit</string>
+  <string name="menu_exit">Konec</string>
+  <string name="press_to_start">- podržte pro spuštění -</string>
+  <string name="pref_trans_proxy_group">Transparentní proxy (vyžaduje roota)</string>
+  <string name="pref_trans_proxy_title">Transparentní proxy</string>
+  <string name="pref_trans_proxy_summary">Automatické Torování aplikací</string>
+  <string name="pref_transparent_all_title">Torovat všechno</string>
+  <string name="pref_transparent_all_summary">Proxynovat všechny aplikace skrz Tor</string>
+  <string name="pref_transparent_port_fallback_title">Záložní port pro proxy</string>
+  <string name="pref_transparent_port_fallback_summary">VAROVÁNÍ: Obchází běžné porty (80, 443, etc). *POUŽIJTE JEN* pokud módy \'All\' nebo \'App\' nefungují.</string>
+  <string name="pref_transparent_port_title">Seznam portů</string>
+  <string name="pref_transparent_port_summary">Seznam portů co proxynovat. *POUŽIJTE JEN* pokud módy \'All\' nebo \'App\' nefungují</string>
+  <string name="pref_transparent_port_dialog">Zadejte porty pro proxynování</string>
+  <string name="pref_has_root">Vyžaduje root přístup</string>
+  <string name="pref_has_root_summary">Požádat o práva roota kvůli transparentnímu proxy</string>
+  <string name="status_install_success">Binárky toru byly úspěšně nainstalovány!</string>
+  <string name="status_install_fail">Nebylo možno nainstalovat binárky Toru. Prosím zkontrolujte log a upozorněte tor-assistants at torproject.org</string>
+  <string name="title_error">Chyba aplikace</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">O Orbotovi</string>
+  <string name="btn_next">Další</string>
+  <string name="btn_back">Zpět</string>
+  <string name="btn_finish">Dokončit</string>
+  <string name="btn_okay">Budiž</string>
+  <string name="btn_cancel">Zrušit</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Pár detailů o Orbot</string>
+  <string name="wizard_permissions_root">Práva udělena</string>
+  <string name="wizard_permissions_stock">Oprávnění Orbota</string>
+  <string name="wizard_premissions_msg_root">Výborně! Bylo detekováno, že root oprávnění bylo Orbotu uděleno. Budeme tuto sílu užívat moudře.</string>
+  <string name="wizard_permissions_msg_stock">I když to není nutné, Orbot může pracovat lépe, pokud má vaše zařízení root. Použijte tlačítko dole pro udělení supersíly Orbotovi. </string>
+  <string name="wizard_permissions_no_root">Pokud nemáte přístup roota, nebo nevíte, o co se jedná, ujistěte se, že používáte aplikace, které s Orbotem spolupracují.</string>
+  <string name="wizard_permissions_consent">Rozumín a přeji si pokračovat bez roota (superuživatelských oprávnění)</string>
+  <string name="wizard_permission_enable_root">Udělit Orbotovi root oprávnění</string>
+  <string name="wizard_configure">Nastavení Torování</string>
+  <string name="wizard_configure_msg">Orbot umožňuje směrovat datový provoz všech aplikací přes Tor NEBO zvolit aplikace individuálně.</string>
+  <string name="wizard_configure_all">Tor Proxy pro všechny aplikace</string>
+  <string name="wizard_configure_select_apps">Zvolit aplikace pro Tor individuálně</string>
+  <string name="wizard_tips_tricks">Aplikace povolené pro Orbota</string>
+  <string name="wizard_tips_msg">Aplikace níže byly vyvinuty tak, aby spolupracovaly s Orbotem. Klikněte na každé tlačítko pro instalaci, aplikace můžete najít i v Obchodu Play nebo na webu GuardianProject.info či F-Droid.org.</string>
+  <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="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>
+  <string name="wizard_final">Orbot je připraven!</string>
+  <string name="wizard_exit_at_first_screen_toast">Orbot musíte nejdříve nastavit, než ho začnete používat!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Tato volba otevře ve webovém prohlížeči stránku https://check.torproject.org pro kontrolu, jestli je Orbot správně nastaven a jste připojen k Tor.</string>
+  <string name="pref_hs_group">Skrytý hosting služby</string>
+  <string name="pref_general_group">Obecné</string>
+  <string name="pref_start_boot_title">Spustit Orbot při startu systému</string>
+  <string name="pref_start_boot_summary">Automaticky spustit Orbot a připojit se k Tor po startu zařízení</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Varování</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Oprávnění</string>
+  <string name="wizard_permissions_root_msg1">Volitelně můžete Orbotu udělit \'siperuýivatelský\' (root) přístup pto povolení rozšířených funkcí, například transparentní proxy.</string>
+  <string name="wizard_permissions_root_msg2">Pokud si to nepřejete, používejte prosím aplikace napsané tak, aby spolupracovaly s Orbotem</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Najděte všechny aplikace Guardian Projektu na Obchodu Play</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparentní proxy</string>
+  <string name="wizard_transproxy_msg">Toto povolí aplikacím automaticky běžet přes Tor síť bez jakéhokoliv nastavování.</string>
+  <string name="wizard_transproxy_hint">(Povolte tuto volbu, pokud nemáte ponětí, o co se jedná)</string>
+  <string name="wizard_transproxy_none">Žádné</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Povolit Tor transparentní proxy pro zařízení připojená přes Wifi a USB tethering (vyžaduje restart)</string>
+  <string name="button_grant_superuser">Požadavek na Superuživatelský přístup</string>
+  <string name="pref_select_apps">Vybrat aplikace</string>
+  <string name="pref_select_apps_summary">Zvolte aplikace používající směrováni přes Tor</string>
+  <string name="pref_node_configuration">Konfigurace uzlu (nodu)</string>
+  <string name="pref_node_configuration_summary">Tato rozšířená nastavení mohou snížit vaši anonymitu</string>
+  <string name="pref_entrance_node">Vstupní nody</string>
+  <string name="pref_entrance_node_summary">Otisky (fingerprints), přezdívky serveru (nicks), státy a adresy pro první skok (hop)</string>
+  <string name="pref_entrance_node_dialog">Zadejte vstupní nody</string>
+  <string name="button_invert_selection">Převrátit výběr</string>
+  <string name="pref_proxy_title">Odchozí síťová proxy (volitelné)</string>
+  <string name="pref_proxy_type_title">Typ odchozí proxy</string>
+  <string name="pref_proxy_type_summary">Protokol pro proxy server: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Zadejte typ proxy</string>
+  <string name="pref_proxy_host_title">Hostitel odchozí proxy</string>
+  <string name="pref_proxy_host_summary">Jméno hostitele proxy serveru</string>
+  <string name="pref_proxy_host_dialog">Zadejte hostitele proxy</string>
+  <string name="pref_proxy_port_title">Port odchozí proxy</string>
+  <string name="pref_proxy_port_summary">Port proxy serveru</string>
+  <string name="pref_proxy_port_dialog">Zadejte proxy port</string>
+  <string name="pref_proxy_username_title">Uživatelské jméno odchozí proxy</string>
+  <string name="pref_proxy_username_summary">Proxy uživatelské jméno (volitelné)</string>
+  <string name="pref_proxy_username_dialog">Zadejte Proxy uživatelské jméno</string>
+  <string name="pref_proxy_password_title">Heslo odchozí proxy</string>
+  <string name="pref_proxy_password_summary">Proxy heslo (volitelné)</string>
+  <string name="pref_proxy_password_dialog">Zadejte Proxy heslo</string>
+  <string name="status">Stav</string>
+  <string name="setting_up_full_transparent_proxying_">Nastavuji transparentní proxy…</string>
+  <string name="setting_up_app_based_transparent_proxying_">Nastavení na aplikacích založené transparentní proxy...</string>
+  <string name="transparent_proxying_enabled">Transparentní proxy POVOLENA</string>
+  <string name="transproxy_enabled_for_tethering_">Transparentní proxy povolena pro Tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">VAROVÁNÍ: chyba při startu transparentní proxy!</string>
+  <string name="transproxy_rules_cleared">Pravidla TransProxy vymazána</string>
+  <string name="couldn_t_start_tor_process_">Nelze spustit Tor proces:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Nastavení na portu založené transparentní proxy...</string>
+  <string name="bridge_error">Chyba bridge</string>
+  <string name="bridge_requires_ip">Pro použití bridge musíte zadat minimálné jednu IP adresu bridge.</string>
+  <string name="send_email_for_bridges">Zašlete email pouze s řádkem \"get bridges\" v obsahu zprávy z vašeho gmail účtu na adresu bridges at torproject.org</string>
+  <string name="error">Chyba</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Vaše nastavení dostupných adres (ReachableAddresses) způsobilo chybu!</string>
+  <string name="your_relay_settings_caused_an_exception_">Vaše nastavení relace způsobilo výjimku!</string>
+  <string name="exit_nodes">Výstupní nody</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Otisky (fingerprints), přezdívky serveru (nicks), státy a adresy pro poslední skok (hop)</string>
+  <string name="enter_exit_nodes">Zadejte výstupní nody</string>
+  <string name="exclude_nodes">Vyloučené nody</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Otisky (fingerprints), přezdívky serveru (nicks), státy a adresy pro vyloučené nody</string>
+  <string name="enter_exclude_nodes">Zadejte nody k vyloučení</string>
+  <string name="strict_nodes">Striktní nody</string>
+  <string name="use_only_these_specified_nodes">Použít *pouze* tyto specifické nody</string>
+  <string name="bridges">Bridge</string>
+  <string name="use_bridges">Použít bridge</string>
+  <string name="bridges_obfuscated">Matoucí bridge (Obfuscated Bridges)</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Povolit alternativní vstupní nody do sítě Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Povolte, pokud jsou nastavené bridge matoucí bridge</string>
+  <string name="ip_address_and_port_of_bridges">IP adresy a porty bridgů</string>
+  <string name="enter_bridge_addresses">Zadejte adresy bridgů</string>
+  <string name="relays">Relé</string>
+  <string name="relaying">Používání relé</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Spuštění zařízení jako neodchozího relé</string>
+  <string name="relay_port">Port relé</string>
+  <string name="listening_port_for_your_tor_relay">Naslouchání Vašeho Tor relé</string>
+  <string name="enter_or_port">Zadejte OR port</string>
+  <string name="relay_nickname">Přezdívka relé</string>
+  <string name="the_nickname_for_your_tor_relay">Přezdívka Vašeho Tor relé</string>
+  <string name="enter_a_custom_relay_nickname">Zadejte klientskou přezdívku relé</string>
+  <string name="reachable_addresses">Dostupné adresy</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Běžet jako klient za firewallem s restriktivní politikou</string>
+  <string name="reachable_ports">Dostupné porty</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Porty dostupné za restriktivním firewallem</string>
+  <string name="enter_ports">Zadejte porty</string>
+  <string name="enable_hidden_services">Skrytý hosting služby</string>
+  <string name="run_servers_accessible_via_the_tor_network">umožnit serveru na zařízení být přístupné skrze síť Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">vložte porty localhostu pro skryté služby</string>
+  <string name="hidden_service_ports">Skryté porty služby</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">adresovatelné jméno pro vaši skrytou službu (generováno automaticky)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">umožnit ladicí informace na výstup (musí používat adb nebo aLogCat k prohlížení)</string>
+  <string name="project_home">Domovské(á) umístění projektu</string>
+  <string name="the_tor_license">Tor Licence</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Software třetích stran:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Aplikace požaduje otevření skrytého portu serveru %S k síti Tor. Toto je bezpečně, pokud aplikaci důvěřujete.</string>
+  <string name="found_existing_tor_process">nalezev existující Tor proces…</string>
+  <string name="something_bad_happened">Stalo se něco špatného. Zkontrolujte log</string>
+  <string name="hidden_service_on">skrytá služba na:</string>
+  <string name="unable_to_read_hidden_service_name">nelze číst název skryté služby</string>
+  <string name="unable_to_start_tor">Nelze spustit Tor:</string>
+  <string name="unable_to_reset_tor">Restartujte vaše zařízení, nejsme schopni resetovat Tor!</string>
+  <string name="pref_use_sys_iptables_title">Použít defaultní Iptables</string>
+  <string name="pref_use_sys_iptables_summary">použít vestavěné iptables binárky místo těch dodávaných s Orbotem</string>
+  <string name="error_installing_binares">Nelze nainstalovat nebo aktualizovat Tor binárky.</string>
+  <string name="pref_use_persistent_notifications">Vždy zobrazit ikonu ve stavovém řádku, pokud je Orbot připojen.</string>
+  <string name="pref_use_persistent_notifications_title">Notifikace vždy zapnuté</string>
+  <string name="notification_using_bridges">Bridge povoleny!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Jazyk</string>
+  <string name="set_locale_summary">Zvolte jazyk pro Orbot</string>
+  <string name="wizard_locale_title">Zvolte jazyk</string>
+  <string name="wizard_locale_msg">Ponechat standartní, nebo přepnout stávající jazyk</string>
+  <string name="btn_save_settings">Uložit nastavení</string>
+  <string name="bandwidth_">Šířka pásma:</string>
+  <string name="down">stahování</string>
+  <string name="up">nahrávání</string>
+  <string name="pref_disable_network_title">Vypnout uspávání sítě</string>
+  <string name="pref_disable_network_summary">Uspat Tor když není k dispozici přístup k Internetu</string>
+  <string name="newnym">Vaše identita na Toru byla změněna!</string>
+  <string name="menu_use_chatsecure">Použít ChatSecure</string>
+  <string name="permission_manage_tor_label">Spravovat Tor</string>
+  <string name="permission_manage_tor_description">Umožnit této aplikaci ovládat službu Tor</string>
+  <string name="install_apps_">Nainstalovat aplikace?</string>
+  <string name="restart_orbot_to_use_this_bridge_">Pro projevení změn restartujte Orbot</string>
+  <string name="menu_qr">QR kódy</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Aktivovat</string>
+  <string name="send_email">Pošli email</string>
+  <string name="standard_browser">Standartní prohlížeč</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-cs/strings.xml b/orbotservice/src/main/res/values-cs/strings.xml
new file mode 100644
index 0000000..65e386f
--- /dev/null
+++ b/orbotservice/src/main/res/values-cs/strings.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">spustit a vypnout Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot se spouští…</string>
+  <string name="status_activated">Připojen k síti Tor</string>
+  <string name="status_disabled">\"Orbot je deaktivován</string>
+  <string name="status_shutting_down">Orbot se vypíná</string>
+  <string name="tor_process_starting">Startuji Tor klienta…</string>
+  <string name="tor_process_complete">hotovo.</string>
+  <string name="tor_process_waiting">čekám.</string>
+  <string name="not_anonymous_yet">VAROVÁNÍ: Vaše komunikace ještě není anonymní! Prosím nastavte vašim aplikacím HTTP proxy 127.0.0.1:8118 nebo SOCKS4A či SOCKS5 proxy 172.0.0.1:9050</string>
+  <string name="menu_home">Domů</string>
+  <string name="menu_browse">Prohlížet</string>
+  <string name="menu_settings">Nastavení</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Pomoc</string>
+  <string name="menu_apps">Aplikace</string>
+  <string name="menu_start">Zapnout</string>
+  <string name="menu_stop">Vypnout</string>
+  <string name="menu_about">O aplikaci</string>
+  <string name="button_help">Pomoc</string>
+  <string name="button_close">Zavřít</string>
+  <string name="button_about">O aplikaci</string>
+  <string name="button_clear_log">Vyčistit log</string>
+  <string name="menu_verify">Ověřit</string>
+  <string name="menu_exit">Konec</string>
+  <string name="press_to_start">- podržte pro spuštění -</string>
+  <string name="pref_trans_proxy_group">Transparentní proxy (vyžaduje roota)</string>
+  <string name="pref_trans_proxy_title">Transparentní proxy</string>
+  <string name="pref_trans_proxy_summary">Automatické Torování aplikací</string>
+  <string name="pref_transparent_all_title">Torovat všechno</string>
+  <string name="pref_transparent_all_summary">Proxynovat všechny aplikace skrz Tor</string>
+  <string name="pref_transparent_port_fallback_title">Záložní port pro proxy</string>
+  <string name="pref_transparent_port_fallback_summary">VAROVÁNÍ: Obchází časté porty (80, 443, etc). *POUŽIJTE JEN* pokud módy \'All\' nebo \'App\' nefungují.</string>
+  <string name="pref_transparent_port_title">Seznam portů</string>
+  <string name="pref_transparent_port_summary">Seznam portů co proxynovat. *POUŽIJTE JEN* pokud módy \'All\' nebo \'App\' nefungují</string>
+  <string name="pref_transparent_port_dialog">Zadejte porty pro proxynování</string>
+  <string name="pref_has_root">Vyžaduje root přístup</string>
+  <string name="pref_has_root_summary">Požádat o práva roota kvůli transparentnímu proxy</string>
+  <string name="status_install_success">Binárky toru byly úspěšně nainstalovány!</string>
+  <string name="title_error">Chyba aplikace</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">O Orbotovi</string>
+  <string name="btn_next">Další</string>
+  <string name="btn_back">Zpět</string>
+  <string name="btn_finish">Dokončit</string>
+  <string name="btn_cancel">Zrušit</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_permissions_root">Práva udělena</string>
+  <string name="wizard_proxy_help_info">Nastavení Proxy</string>
+  <string name="wizard_final">Orbot je připraven!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Hlavní</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Varování</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparentní proxy</string>
+  <string name="wizard_transproxy_none">Není</string>
+  <string name="status">Status</string>
+  <string name="error">Chyba</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Uloz nastaveni</string>
+  <string name="menu_vpn">Aplikace</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-cy/strings.xml b/orbotservice/src/main/res/values-cy/strings.xml
new file mode 100644
index 0000000..a48a10a
--- /dev/null
+++ b/orbotservice/src/main/res/values-cy/strings.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">cychwyn a stopio Tor</string>
+  <string name="tor_proxy_service_process">gwasanaethdirpwrytor</string>
+  <string name="status_starting_up">Mae Orbot yn cychwyn...</string>
+  <string name="status_activated">Wedi cysylltu â rhwydwaith Tor</string>
+  <string name="tor_process_starting">Yn cychwyn cleient Tor</string>
+  <string name="tor_process_complete">Wedi ei gwblhau.</string>
+  <string name="tor_process_waiting">yn aros.</string>
+  <string name="not_anonymous_yet">RHYBUDD: Nid yw eich traffig yn ddienw eto! Os gwelwch yn dda ffurfweddu eich ceisiadau at arfer HTTP proxy 127.0.0.1:8118 neu SOCKS4A neu ddirprwy SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Hafan</string>
+  <string name="menu_browse">Pori</string>
+  <string name="menu_settings">Gosodiadau</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Help</string>
+  <string name="menu_start">Cychwyn</string>
+  <string name="menu_stop">Stop</string>
+  <string name="menu_about">Amdanom ni</string>
+  <string name="main_layout_download">Llwytho i lawr</string>
+  <string name="main_layout_upload">Llwytho i fyny</string>
+  <string name="button_help">Help</string>
+  <string name="button_close">Cau</string>
+  <string name="button_about">Amdanom ni</string>
+  <string name="button_clear_log">Clirio log</string>
+  <string name="menu_verify">Gwirio</string>
+  <string name="menu_exit">Gadael</string>
+  <string name="press_to_start">- pwyswch yn hir i gychwyn -</string>
+  <string name="pref_trans_proxy_group">Dirprwyo tryloyw (angen Gwreiddyn)</string>
+  <string name="pref_trans_proxy_title">Dirprwyo tryloyw</string>
+  <string name="pref_trans_proxy_summary">\'Torifying\' o Apps yn awtomatig</string>
+  <string name="pref_transparent_all_title">Popeth Tor</string>
+  <string name="pref_transparent_all_summary">Traffig dirprwy i\'r holl apps drwy Tor</string>
+  <string name="pref_transparent_port_title">Rhestr Porthau</string>
+  <string name="pref_transparent_port_summary">Rhestr o borthau i\'w dirprwyo. *DEFNYDDIER YN UNIG* os nad yw modd \'Popeth\' neu \'App\' yn gweithio</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Am Orbot</string>
+  <string name="btn_next">Nesaf</string>
+  <string name="btn_back">Yn ôl</string>
+  <string name="btn_finish">Gorffen</string>
+  <string name="btn_okay">Iawn</string>
+  <string name="btn_cancel">Diddymu</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Rhai manylion am Orbot</string>
+  <string name="wizard_permissions_root">Caniatâd wedi\'i roi</string>
+  <string name="wizard_proxy_help_info">Gosodiadau Dirprwy</string>
+  <string name="wizard_final">Mae Orbot yn barod!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Cyffredinol</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Rhybudd</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Dirprwyo\'n dryloyw</string>
+  <string name="wizard_transproxy_none">Dim</string>
+  <string name="pref_select_apps">Dewiswch Apps</string>
+  <string name="pref_select_apps_summary">Dewiswch Apps i\'w llwybro drwy Tor</string>
+  <string name="pref_node_configuration">Ffurfweddiad nod</string>
+  <string name="pref_entrance_node">Nodau mynediad</string>
+  <string name="pref_entrance_node_dialog">I mewn i nodau mynediad</string>
+  <string name="pref_proxy_password_summary">Cyfrinair y Dirprwy (Dewisol)</string>
+  <string name="status">Statws</string>
+  <string name="error">Gwall</string>
+  <string name="exit_nodes">Nodau Gadael</string>
+  <string name="enter_exit_nodes">I mewn i Nodau Gadael</string>
+  <string name="exclude_nodes">Yn eithrio Nodau</string>
+  <string name="enter_exclude_nodes">I mewn i Nodau Eithrio</string>
+  <string name="the_tor_license">Trwydded Tor</string>
+  <string name="third_party_software">Meddalwedd 3ydd-parti</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Dewiswch locale ac iaith i Orbot</string>
+  <string name="wizard_locale_title">Dewiswch iaith</string>
+  <string name="btn_save_settings">Cadw\'r gosodiadau</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-da/strings.xml b/orbotservice/src/main/res/values-da/strings.xml
new file mode 100644
index 0000000..2c63a07
--- /dev/null
+++ b/orbotservice/src/main/res/values-da/strings.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot er en gratis og åben proxy-applikation, der gør det muligt at anvende internettet mere sikkert fra andre programmer. Orbot bruger Tor til at kryptere internettrafikken, og skjuler den ved at sende den gennem serverere, lokaliseret i hele verden. Tor er gratis og åben software, der kan hjælpe dig mod netværksovervågning kaldet trafikanalyse, der kan true din personlige frihed, dit privatliv, handelsaktivitet og forhold.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">start og stop Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot starter op ...</string>
+  <string name="status_activated">Der er forbindelse til Tor-netværket</string>
+  <string name="status_disabled">Orbot er slået fra</string>
+  <string name="tor_process_starting">Starter Tor klienten...</string>
+  <string name="tor_process_complete">udført.</string>
+  <string name="tor_process_waiting">afventer.</string>
+  <string name="not_anonymous_yet">ADVARSEL: Din trafik er ikke endnu ikke anonym! Konfigurér venligst dine programmer, så de bruger HTTP proxy 127.0.0.1:8118 eller SOCKS4A eller SOCKS5-proxy 127.0.0.1:9050</string>
+  <string name="menu_home">Hjem</string>
+  <string name="menu_browse">Brows</string>
+  <string name="menu_settings">Indstillinger</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Hjælp</string>
+  <string name="menu_start">Start</string>
+  <string name="menu_stop">Stop</string>
+  <string name="menu_about">Om</string>
+  <string name="main_layout_download">Henter</string>
+  <string name="main_layout_upload">Sender</string>
+  <string name="button_help">Hjælp</string>
+  <string name="button_close">Luk</string>
+  <string name="button_about">Om</string>
+  <string name="button_clear_log">Ryd log</string>
+  <string name="menu_verify">Tjek</string>
+  <string name="menu_exit">Afslut</string>
+  <string name="press_to_start">- hold nede for start -</string>
+  <string name="pref_trans_proxy_group">Transparent proxy (kræver Root)</string>
+  <string name="pref_trans_proxy_title">Transparent proxy</string>
+  <string name="pref_trans_proxy_summary">Anvend automatisk Tor på programmer</string>
+  <string name="pref_transparent_all_title">Brug Tor til alt</string>
+  <string name="pref_transparent_all_summary">Proxy-trafik for alle programmer gennem Tor</string>
+  <string name="pref_transparent_port_fallback_title">Tilbagefaldsport for proxy</string>
+  <string name="pref_transparent_port_fallback_summary">ADVARSEL: Omgår almindelige porte (80, 443, osv). Bør *KUN* anvendes hvis \'All\' eller \'App\' tilstande ikke virker.</string>
+  <string name="pref_transparent_port_title">Portliste</string>
+  <string name="pref_transparent_port_summary">Liste af porte der skal filtreres gennem proxyen. Bør *KUN* anvendes hvis \'All\' eller \'App\' tilstande ikke virker.</string>
+  <string name="pref_transparent_port_dialog">Indtast porte der skal filtreres gennem proxyen.</string>
+  <string name="pref_has_root">Forespørg om Root-adgang</string>
+  <string name="pref_has_root_summary">Kræver root privilegier for gennemsigtig proxy.</string>
+  <string name="status_install_success">Tor\'s binære filer succesfuldt installeret!</string>
+  <string name="status_install_fail">Tor\'s binære filer kunne ikke installeres. Læs venligst loggen og underret tor-assistants at torproject.org</string>
+  <string name="title_error">Programfejl</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Om Orbot</string>
+  <string name="btn_next">Næste</string>
+  <string name="btn_back">Tilbage</string>
+  <string name="btn_finish">Afslut</string>
+  <string name="btn_okay">Okay</string>
+  <string name="btn_cancel">Fortryd</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Nogle Orbot detaljer</string>
+  <string name="wizard_permissions_root">Tilladelse givet</string>
+  <string name="wizard_permissions_stock">Orbot tilladelser</string>
+  <string name="wizard_premissions_msg_root">Fremragende! Vi kan se at du har givet root tilladelser til Orbot . Vi vil bruge denne magt med omtanke.</string>
+  <string name="wizard_permissions_msg_stock">Selvom det ikke er påkrævet, kan Orbot blive et mere nyttigt værktøj, hvis din enhed har root adgang. Benyt knappen herunder for at tildele Orbot superkræfter!</string>
+  <string name="wizard_permissions_no_root">Hvis du ikke har root adgang eller ikke aner hvad vi snakker om, skal du være sikker på at du benytter dig af apps som kan fungere med Orbot.</string>
+  <string name="wizard_permissions_consent">Jeg forstår og vil gerne fortsætte uden Superuser</string>
+  <string name="wizard_permission_enable_root">Tillad root for Orbot</string>
+  <string name="wizard_configure">Indstil Torifikation</string>
+  <string name="wizard_configure_msg">Orbot giver dig mulighed for at føre al app-trafik igennem Tor ELLER vælge individuelt imellem apps.</string>
+  <string name="wizard_configure_all">Kør alle programmers trafik gennem Tor proxyen</string>
+  <string name="wizard_configure_select_apps">Vælg individuelle apps for Tor</string>
+  <string name="wizard_tips_tricks">Orbot-aktiverede apps</string>
+  <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="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>
+  <string name="wizard_final">Orbot er klar!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Dette vil åbne din browser på https://check.torproject.org for at se om Orbot er korrekt konfigureret og at du er forbundet til Tor.</string>
+  <string name="pref_hs_group">Udbyd en skjult service</string>
+  <string name="pref_general_group">Generelt</string>
+  <string name="pref_start_boot_title">Start Orbot ved opstart</string>
+  <string name="pref_start_boot_summary">Start automatisk Orbot og forbind til Tor når din android enhed starter</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Advarsel</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Tilladelser</string>
+  <string name="wizard_permissions_root_msg1">Du kan eventuelt give Orbot \'Superuser\' adgang for at aktivere funktioner som f.eks. Transparent Proxying.</string>
+  <string name="wizard_permissions_root_msg2">Hvis du ikke vil dette, så vær sikker på at du bruger apps som fungerer med Orbot</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot-aktiverede apps</string>
+  <string name="wizard_tips_play">Find alle Guardian Project programmer på Google Play</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transperant Proxying</string>
+  <string name="wizard_transproxy_msg">Dette tillader at dine apps automatisk kører gennem Tor netværket uden nogen konfiguration.</string>
+  <string name="wizard_transproxy_hint">(Check denne boks hvis du ikke aner hvad vi snakker om)</string>
+  <string name="wizard_transproxy_none">Ingen</string>
+  <string name="pref_transparent_tethering_title">Tor internet-hotspot</string>
+  <string name="pref_transparent_tethering_summary">Start Tor gennemsigtig proxy for Wifi og internetdeling over USB (kræver genstart)</string>
+  <string name="button_grant_superuser">Anmod om Superuser adgang</string>
+  <string name="pref_select_apps">Vælg apps</string>
+  <string name="pref_select_apps_summary">Vælg apps som føres gennem Tor</string>
+  <string name="pref_node_configuration">Konfiguration af Tor node</string>
+  <string name="pref_node_configuration_summary">Avancerede indstillinger, der kan reducere anonymiteten</string>
+  <string name="pref_entrance_node">Indgangspunkter til Tor netværket</string>
+  <string name="pref_entrance_node_summary">Fingeraftryk, servernavne, lande og adresser for første hop</string>
+  <string name="pref_entrance_node_dialog">Indtast indgangspunkter</string>
+  <string name="pref_proxy_title">Udgående netværksproxy (Valgfri)</string>
+  <string name="pref_proxy_type_title">Udgående proxy-type</string>
+  <string name="pref_proxy_type_summary">Protokol til proxy serveren: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Indtast proxy type</string>
+  <string name="pref_proxy_host_title">Udgående proxy-vært</string>
+  <string name="pref_proxy_host_summary">Værtsnavn for proxyserver</string>
+  <string name="pref_proxy_host_dialog">Indtast proxy vært</string>
+  <string name="pref_proxy_port_title">Udgående proxy-port</string>
+  <string name="pref_proxy_port_summary">Proxyserverens port</string>
+  <string name="pref_proxy_port_dialog">Indtast proxy port</string>
+  <string name="pref_proxy_username_title">Brugernavn for udgående proxy</string>
+  <string name="pref_proxy_username_summary">Proxy brugernavn (Valgfri)</string>
+  <string name="pref_proxy_username_dialog">Indtast proxy-brugernavnet</string>
+  <string name="pref_proxy_password_title">Kodeord for udgående proxy</string>
+  <string name="pref_proxy_password_summary">Adgangskode for udgående proxy (Valgfri)</string>
+  <string name="pref_proxy_password_dialog">Indtast proxy-kodeordet</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Opsætter total, gennemsigtig proxy...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Opsætter program-afhængig transparent proxy...</string>
+  <string name="transparent_proxying_enabled">Transparent proxying AKTIVERET</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy slået til for internetdeling!</string>
+  <string name="warning_error_starting_transparent_proxying_">ADVARSEL: fejl under start af den gennemsigtige proxy!</string>
+  <string name="transproxy_rules_cleared">Indstillinger for TransProxy er nulstillet</string>
+  <string name="couldn_t_start_tor_process_">Kunne ikke starte Tor processen:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Opsætter port-baseret gennemsigtig proxy...</string>
+  <string name="bridge_error">Fejl ved Bro</string>
+  <string name="bridge_requires_ip">For at kunne bruge bro-komponenten, skal du indaste mindst én IP-adresse på en bro.</string>
+  <string name="send_email_for_bridges">Send en e-mail til bridges at torproject.org med teksten \"get bridges\" alene i mailens tekstfelt fra en gmail-konto.</string>
+  <string name="error">Fejl</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Din ReachableAdresses indstilling forudsagede en fejl!</string>
+  <string name="your_relay_settings_caused_an_exception_">Dine relæindstillinger forårsagede en fejl!</string>
+  <string name="exit_nodes">Udgangspunkter</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingeraftryk, servernavne, lande og adresser for det sidste hop</string>
+  <string name="enter_exit_nodes">Indtast udgangspunkter</string>
+  <string name="exclude_nodes">Ekskluder punkter</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingeraftryk, servernavne, lande og adresser der skal ekskluderes</string>
+  <string name="enter_exclude_nodes">Indtast noder at ekskludere</string>
+  <string name="strict_nodes">Strikte punkter</string>
+  <string name="use_only_these_specified_nodes">Brug *kun* disse specificerede punkter</string>
+  <string name="bridges">Broer</string>
+  <string name="use_bridges">Brug broer</string>
+  <string name="bridges_obfuscated">Skjulte broer</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Slå alternative indgangspunkter til Tor netværket til</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktiver hvis de indstillede broer er skjulte broer</string>
+  <string name="ip_address_and_port_of_bridges">IP adresser og porte på broer</string>
+  <string name="enter_bridge_addresses">Indtast bro-adresser</string>
+  <string name="relays">Relæer</string>
+  <string name="relaying">Relæfunktion</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Lad denne enhed være et ikke-udgangs relæ</string>
+  <string name="relay_port">Relæets port</string>
+  <string name="listening_port_for_your_tor_relay">Port at dette Tor relæ lytter på</string>
+  <string name="enter_or_port">Indtast OR port</string>
+  <string name="relay_nickname">Relænavn</string>
+  <string name="the_nickname_for_your_tor_relay">Kaldenavnet for dit Tor-relæ</string>
+  <string name="enter_a_custom_relay_nickname">Indtast et valgfrit navn for relæet</string>
+  <string name="reachable_addresses">Opnåelige adresser</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Kør som en klient bag en firewall med restrektive regler</string>
+  <string name="reachable_ports">Porte hvor forbindelse kan dannes</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Porte bag en restriktiv firewall hvor en forbindelse kan oprettes</string>
+  <string name="enter_ports">Indtast porte</string>
+  <string name="enable_hidden_services">Udbyd en service</string>
+  <string name="run_servers_accessible_via_the_tor_network">tillad at en server på enheden er tilgængelig via Tor-netværket</string>
+  <string name="enter_localhost_ports_for_hidden_services">indtast lokale adresser for skjulte services</string>
+  <string name="hidden_service_ports">Skjulte service porte</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">den absolutte sti til din skjulte service (genereres automatisk)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">aktiver fejlfindings-log til output (der skal anvendes adb eller aLogCat for at se dette)</string>
+  <string name="project_home">Projekt hjemmeside(r):</string>
+  <string name="the_tor_license">Tor licensen</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Tredjeparts-software:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="hidden_service_request">Et program vil åbne den skjulte server-port %S til Tor netværket. Dette er sikkert hvis du stoler på programmet.</string>
+  <string name="found_existing_tor_process">fandt eksisterende Tor process...</string>
+  <string name="something_bad_happened">Noget slemt er sket. Check loggen</string>
+  <string name="hidden_service_on">skjult service på:</string>
+  <string name="unable_to_read_hidden_service_name">ikke i stand til at læse navnet på den skjulte service</string>
+  <string name="unable_to_start_tor">Kunne ikke starte Tor:</string>
+  <string name="unable_to_reset_tor">Genstart din enhed. Ude af stand til at nulstille tor!</string>
+  <string name="pref_use_sys_iptables_title">Anvend standardindstillinger for Iptables</string>
+  <string name="pref_use_sys_iptables_summary">anvend det indbyggede iptables-program i stedet for versionen der følger med Orbot</string>
+  <string name="error_installing_binares">Kunne ikke installere eller opgradere Tor programmerne.</string>
+  <string name="pref_use_persistent_notifications">Vis altid ikonet i statuslinien når Orbot er forbundet til netværket</string>
+  <string name="pref_use_persistent_notifications_title">Vis altid notifikationer</string>
+  <string name="notification_using_bridges">Broer er aktiverede!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Sprog</string>
+  <string name="set_locale_summary">Vælg sproginstillinger og sprog for Orbot</string>
+  <string name="wizard_locale_title">Vælg sprog</string>
+  <string name="wizard_locale_msg">Behold standardindstilling eller skift det nuværende sprog</string>
+  <string name="powered_by">drevet af Tor</string>
+  <string name="btn_save_settings">Gem Indstillinger</string>
+  <string name="no_internet_connection_tor">Ingen internetforbindelse; Tor er på standby...</string>
+  <string name="bandwidth_">Båndbredde:</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-de-rAT/strings.xml b/orbotservice/src/main/res/values-de-rAT/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/orbotservice/src/main/res/values-de-rAT/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-de/strings.xml b/orbotservice/src/main/res/values-de/strings.xml
new file mode 100644
index 0000000..acf2662
--- /dev/null
+++ b/orbotservice/src/main/res/values-de/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot ist eine kostenlose Proxy-Anwendung, mit deren Hilfe andere Anwendungen das Internet sicherer nutzen können. Orbot verwendet Tor, um Ihren Internetverkehr zu verschlüsseln und ihn dann zu verbergen, indem er über eine Reihe weltweit verteilter Computer geleitet wird. Tor ist ein freies Programm und ein offenes Netzwerk, das Ihnen hilft, sich gegen Angriffe auf die persönliche Freiheit und die Privatsphäre oder auf vertrauliche Geschäftsbeziehungen sowie gegen die Datenüberwachung aus Staatssicherheitsgründen zu wehren.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">Tor starten und beenden</string>
+  <string name="tor_proxy_service_process">Tor-Vermittlungsdienst</string>
+  <string name="status_starting_up">Orbot startet …</string>
+  <string name="status_activated">Verbunden mit dem Tor-Netzwerk</string>
+  <string name="status_disabled">Orbot ist deaktiviert</string>
+  <string name="status_shutting_down">TorService wird heruntergefahren</string>
+  <string name="tor_process_starting">Tor-Programm wird gestartet …</string>
+  <string name="tor_process_complete">abgeschlossen.</string>
+  <string name="tor_process_waiting">warten.</string>
+  <string name="not_anonymous_yet">WARNUNG: Ihr Datenverkehr ist noch nicht anonymisiert! Bitte stellen Sie Ihre Programme so ein, dass Sie entweder den HTTP-Proxy 127.0.0.1:8118 oder den SOCKS4A bzw. SOCKS5-Proxy 127.0.0.1:9050 verwenden.</string>
+  <string name="menu_home">Start</string>
+  <string name="menu_browse">Durchsuchen</string>
+  <string name="menu_settings">Einstellungen</string>
+  <string name="menu_log">Protokoll</string>
+  <string name="menu_info">Hilfe</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Start</string>
+  <string name="menu_stop">Stopp</string>
+  <string name="menu_about">Über</string>
+  <string name="menu_promo_apps">Weitere Apps …</string>
+  <string name="main_layout_download">Heruntergeladen</string>
+  <string name="main_layout_upload">Hochgeladen</string>
+  <string name="button_help">Hilfe</string>
+  <string name="button_close">Schließen</string>
+  <string name="button_about">Über</string>
+  <string name="button_clear_log">Protokoll löschen</string>
+  <string name="menu_verify">Überprüfen</string>
+  <string name="menu_exit">Beenden</string>
+  <string name="menu_scan">BrückenQR scannen</string>
+  <string name="menu_share_bridge">BrückenQR teilen</string>
+  <string name="press_to_start">- Zum Starten gedrückt halten -</string>
+  <string name="pref_trans_proxy_group">Transparente Vermittlung (benötigt Root-Rechte)</string>
+  <string name="pref_trans_proxy_title">Transparente Vermittlung</string>
+  <string name="pref_trans_proxy_summary">Anwendungen automatisch durch Tor leiten</string>
+  <string name="pref_transparent_all_title">Alles durch Tor leiten</string>
+  <string name="pref_transparent_all_summary">Verbindungen aller Anwendungen durch Tor leiten</string>
+  <string name="pref_transparent_port_fallback_title">Rückfallportvermittlung</string>
+  <string name="pref_transparent_port_fallback_summary">WARNUNG: Umgeht öffentliche Ports (80, 443, usw.). *NUR BENUTZEN*, wenn »All« oder »App«-Modus nicht funktioniert.</string>
+  <string name="pref_transparent_port_title">Portliste</string>
+  <string name="pref_transparent_port_summary">Liste von Anschlüssen zur Vermittlung. *NUR BENUTZEN* wenn »All« oder »App«-Modus nicht funktioniert</string>
+  <string name="pref_transparent_port_dialog">Ports zur Vermittlung eingeben</string>
+  <string name="pref_has_root">Anfrage auf Root-Zugriff</string>
+  <string name="pref_has_root_summary">Anfrage auf Root-Zugriff für transparente Vermittlung</string>
+  <string name="status_install_success">Die Tor-Programmdateien wurden erfolgreich installiert!</string>
+  <string name="status_install_fail">Die Tor-Programmdateien konnten nicht erfolgreich installiert werden. Bitte prüfen Sie das Protokoll und wenden Sie sich an tor-assistants at torproject.org.</string>
+  <string name="title_error">Anwendungsfehler</string>
+  <string name="wizard_title">Willkommen bei Orbot</string>
+  <string name="wizard_btn_tell_me_more">Über Orbot</string>
+  <string name="btn_next">Weiter</string>
+  <string name="btn_back">Zurück</string>
+  <string name="btn_finish">Fertigstellen</string>
+  <string name="btn_okay">OK</string>
+  <string name="btn_cancel">Abbrechen</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Nähere Informationen zu Orbot</string>
+  <string name="wizard_details_msg">Orbot ist eine quelloffene Anwendung, die Tor, LibEvent und Polipo enthält. Sie stellt einen lokalen HTTP-Proxy (Port: 8118) und einen SOCKS-Proxy (Port: 9050) in das Tor-Netzwerk bereit. Auf gerooteten Geräten kann Orbot auch sämtliche Internetverbindungen durch Tor leiten.</string>
+  <string name="wizard_permissions_root">Berechtigung erteilt</string>
+  <string name="wizard_permissions_stock">Orbot-Berechtigungen</string>
+  <string name="wizard_premissions_msg_root">Ausgezeichnet! Sie haben Orbot Root-Rechte eingeräumt. Orbot wird diese Berechtigung sinnvoll verwenden.</string>
+  <string name="wizard_permissions_msg_stock">Es ist nicht zwingend erforderlich, aber Orbot kann ein leistungsfähigeres Werkzeug werden, wenn Ihr Gerät gerootet ist. Drücken Sie unten auf den Schalter, um Orbot Superuser-Rechte zu gewähren.</string>
+  <string name="wizard_permissions_no_root">Falls Sie keinen Root-Zugriff haben oder nicht wissen, was das ist, achten Sie darauf, dass Sie Anwendungen verwenden, die Orbot nutzen können.</string>
+  <string name="wizard_permissions_consent">Ich habe verstanden und möchte ohne Systemverwalterzugriff weitermachen</string>
+  <string name="wizard_permission_enable_root">Orbot Root-Rechte einräumen</string>
+  <string name="wizard_configure">Torification konfigurieren</string>
+  <string name="wizard_configure_msg">Orbot lässt Ihnen die Wahl, den Datenverkehr aller Anwendungen durch Tor zu leiten ODER einzelne Anwendungen auszuwählen.</string>
+  <string name="wizard_configure_all">Den Verkehr aller Anwendungen durch Tor leiten</string>
+  <string name="wizard_configure_select_apps">Anwendungen einzeln für Tor auswählen</string>
+  <string name="wizard_tips_tricks">Orbot aktivierte Anwendungen</string>
+  <string name="wizard_tips_msg">Die unten aufgeführten Anwendungen wurden für die Zusammenarbeit mit Orbot entwickelt. Wählen Sie diese durch anklicken zum Installieren aus oder laden Sie diese später bei Google Play,  GuardianProject.info oder F-Droid.org herunter.</string>
+  <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="wizard_tips_twitter">Twitter-Proxy auf den Rechner »localhost« und Port 8118 einstellen</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Schreiben Sie eine Geschichte und überlassen Sie Tor das Sicherheitsmanagement!</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_proxy_help_msg">Wenn die verwendete Android-App die Nutzung eines HTTP- oder SOCKS-Proxys unterstützt, kann sie mit Orbot verknüpft werden und Tor nutzen.\n\n\nDie Einstellung für \'Host\' ist 127.0.0.1 oder \'localhost\'. Für HTTP wird der Port 8118 eingetragen. Für SOCKS der Port 9050. Sie sollten möglichst SOCKS4A oder SOCKS5 verwenden.\n\n\n\n Mehr Informationen zur Verwendung von Proxys unter Android finden Sie in den FAQ auf http://tinyurl.com/proxyandroid\n</string>
+  <string name="wizard_final">Orbot ist bereit!</string>
+  <string name="wizard_final_msg">Millionen Menschen auf der ganzen Welt nutzen Tor aus einer Vielzahl von Gründen..\n\nJournalisten und Blogger, Verteidiger für Menschenrechte, Polizeibeamte, Soldaten, Firmen, Bürger repressiver Regime und ganz normale Menschen … und jetzt können Sie das auch!</string>
+  <string name="wizard_exit_at_first_screen_toast">Bitte konfigurieren Sie Orbot, bevor Sie es verwenden können!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Sie haben sich erfolgreich mit dem Tor-Netzwerk verbunden - was aber NICHT bedeutet, dass Ihr Gerät sicher ist. Sie können den Knopf »Browser« verwenden, um Ihre Verbindung zu überprüfen. \n\nBesuchen Sie uns auf https://guardianproject.info/apps/orbot oder senden Sie uns eine E-Mail an help at guardianproject.info, um mehr zu erfahren.</string>
+  <string name="tor_check">Durch das Bestätigen mit »OK« wird die Seite https://check.torproject.org in Ihrem Webbrowser geöffnet, sodass Sie überprüfen können, ob Orbot richtig konfiguriert ist und Sie mit Tor verbunden sind.</string>
+  <string name="pref_hs_group">Versteckte Dienste</string>
+  <string name="pref_general_group">Allgemein</string>
+  <string name="pref_start_boot_title">Orbot beim Systemstart ausführen</string>
+  <string name="pref_start_boot_summary">Automatisches Starten von Orbot und Verbinden mit Tor beim Start des Android-Gerätes</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot bringt Tor zu Android!\n\nTor unterstützt Sie, sich gegen Zensur, Datenrückverfolgung und die Überwachung des Netzes zu wehren, die Ihre Privatsphäre, vertraulichen Informationen und persönlichen Beziehungen bedrohen.\n\nDieser Assistent hilft Ihnen dabei, Orbot und Tor einzurichten.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Warnung</string>
+  <string name="wizard_warning_msg">Orbot nur zu installieren, anonymisiert nicht automatisch den mobilen Netzwerkverkehr.\n\nSie müssen Orbot, das Gerät und die Apps konfigurieren, um Tor erfolgreich zu verwenden.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Zugriffsrechte</string>
+  <string name="wizard_permissions_root_msg1">Sie können Orbot wahlweise Systemverwalterzugriff geben, um erweiterte Funktionen zu aktivieren, wie z.B. transparente Vermittlung.</string>
+  <string name="wizard_permissions_root_msg2">Wenn Sie dies nicht möchten, stellen Sie bitte sicher, Anwendungen zu verwenden, die für die Zusammenarbeit mit Orbot geschrieben wurden.</string>
+  <string name="wizard_permissions_no_root_msg">Ihr Gerät scheint nicht gerootet zu sein oder stellt keinen Root oder \'Systemverwalterzugriff bereit.\n\nBitte nutzen Sie den \'Apps\' Modus auf dem Hauptbildschirm.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot aktivierte Anwendungen</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: Sichere Unterhaltungsanwendung mit vertraulicher Verschlüsselung</string>
+  <string name="wizard_tips_orweb">Orfox: Datenschutz optimierter Browser der Tor verwendet</string>
+  <string name="wizard_tips_play">Alle Guardian Project-Anwendungen im Google Play Store finden</string>
+  <string name="wizard_tips_fdroid">Alle Guardian Project-Anwendungen bei F-Droid finden</string>
+  <string name="wizard_tips_fdroid_org">Alle Guardian Project-Anwendungen unter https://f-droid.org finden</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparente Vermittlung</string>
+  <string name="wizard_transproxy_msg">Dies ermöglicht Ihren Anwendungen automatisch das Tor-Netzwerk zu verwenden, ohne dieses konfigurieren zu müssen.</string>
+  <string name="wizard_transproxy_hint">(Dieses Feld auswählen, wenn Sie nicht wissen wovon wir reden)</string>
+  <string name="wizard_transproxy_none">Nichts</string>
+  <string name="pref_transparent_tethering_title">Tor-Anbindung</string>
+  <string name="pref_transparent_tethering_summary">Transparente Tor-Vermittlung für WLAN und angebundene USB-Geräte aktivieren (benötigt einen Neustart)</string>
+  <string name="button_grant_superuser">Systemverwalterzugriff anfordern</string>
+  <string name="pref_select_apps">Anwendungen auswählen</string>
+  <string name="pref_select_apps_summary">Die Anwendungen auswählen, welche durch Tor geleitet werden sollen</string>
+  <string name="pref_node_configuration">Netzknotenkonfiguration</string>
+  <string name="pref_node_configuration_summary">Dies sind erweiterte Einstellungen, die Ihre Anonymität beeinträchtigen können</string>
+  <string name="pref_entrance_node">Eingangsnetzknoten</string>
+  <string name="pref_entrance_node_summary">Fingerabdrücke, Spitznamen, Länder und Adressen für den ersten Knotenpunkt</string>
+  <string name="pref_entrance_node_dialog">Eingangsnetzknoten eingeben</string>
+  <string name="pref_allow_background_starts_title">Hintergrundstatistiken erlauben</string>
+  <string name="pref_allow_background_starts_summary">Erlauben Sie jeder Anwendung, Orbot zu beauftragen, Tor und zugehörige Dienste zu starten</string>
+  <string name="button_proxy_all">Alles über Proxy</string>
+  <string name="button_proxy_none">Nichts über Proxy</string>
+  <string name="button_invert_selection">Auswahl umkehren</string>
+  <string name="pref_proxy_title">Ausgehender Netzwerk-Proxy (optional)</string>
+  <string name="pref_proxy_type_title">Ausgehender Vermittlungstyp</string>
+  <string name="pref_proxy_type_summary">Protokoll zur Verwendung des Proxy Servers: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Vermittlungstyp eingeben</string>
+  <string name="pref_proxy_host_title">Ausgehender Vermittlungsrechner</string>
+  <string name="pref_proxy_host_summary">Rechnername des Vermittlungsservers</string>
+  <string name="pref_proxy_host_dialog">Vermittlungsrechner eingeben</string>
+  <string name="pref_proxy_port_title">Ausgehender Proxy-Anschluss</string>
+  <string name="pref_proxy_port_summary">Anschluss des Vermittlungsservers</string>
+  <string name="pref_proxy_port_dialog">Vermittlungsanschluss eingeben</string>
+  <string name="pref_proxy_username_title">Ausgehender Proxy-Benutzername</string>
+  <string name="pref_proxy_username_summary">Proxy-Benutzername (optional)</string>
+  <string name="pref_proxy_username_dialog">Proxy-Benutzernamen eingeben</string>
+  <string name="pref_proxy_password_title">Ausgehendes Proxy-Passwort</string>
+  <string name="pref_proxy_password_summary">Proxy-Passwort (optional)</string>
+  <string name="pref_proxy_password_dialog">Proxy-Passwort eingeben</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Voll transparente Vermittlung wird eingestellt …</string>
+  <string name="setting_up_app_based_transparent_proxying_">Anwendungsbasierte transparente Vermittlung wird eingestellt …</string>
+  <string name="transparent_proxying_enabled">Transparente Vermittlung AKTIVIERT</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy für Anbindung aktiviert!</string>
+  <string name="warning_error_starting_transparent_proxying_">WARNUNG: Fehler beim Starten der transparenten Vermittlung!</string>
+  <string name="transproxy_rules_cleared">TransProxy-Regeln gelöscht</string>
+  <string name="couldn_t_start_tor_process_">Tor-Prozess konnte nicht gestartet werden:</string>
+  <string name="privoxy_is_running_on_port_">Polipo läuft auf Port: </string>
+  <string name="setting_up_port_based_transparent_proxying_">Anschlussbasierte transparente Vermittlung wird eingestellt …</string>
+  <string name="bridge_error">Brückenfehler</string>
+  <string name="bridge_requires_ip">Um die Brückenfunktion nutzen zu können, müssen Sie mindestens eine Brücken-IP-Adresse eingeben.</string>
+  <string name="send_email_for_bridges">Von Ihrem Gmail-Konto eine E-Mail an bridges at torproject.org mit dem Text »get bridges« im Nachrichtenfeld senden.</string>
+  <string name="error">Fehler</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Ihre eingestellten erreichbaren Adressen haben einen Ausnahmefehler verursacht!</string>
+  <string name="your_relay_settings_caused_an_exception_">Ihre Relaiseinstellungen haben einen Ausnahmefehler verursacht!</string>
+  <string name="exit_nodes">Ausgangsnetzknoten</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerabdrücke, Spitznamen, Länder und Adressen für den letzten Knotenpunkt.</string>
+  <string name="enter_exit_nodes">Ausgangsnetzknoten eingeben</string>
+  <string name="exclude_nodes">Netzknoten ausschließen</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerabdrücke, Spitznamen, Länder und Adressen, die ausgeschlossen werden sollen</string>
+  <string name="enter_exclude_nodes">Auszuschließende Netzknoten eingeben</string>
+  <string name="strict_nodes">Absolute Netzknoten</string>
+  <string name="use_only_these_specified_nodes">*Ausschließlich* diese angegebenen Netzknoten verwenden</string>
+  <string name="bridges">Brücken</string>
+  <string name="use_bridges">Brücken benutzen</string>
+  <string name="bridges_obfuscated">Verschleierte Brücken</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Alternative Eingangsnetzknoten in das Tor-Netzwerk aktivieren</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktivieren, falls Brücken verschleierte Brücken sind</string>
+  <string name="ip_address_and_port_of_bridges">IP-Adresse und Port der Brücken</string>
+  <string name="enter_bridge_addresses">Brückenadressen eingeben</string>
+  <string name="relays">Relais</string>
+  <string name="relaying">Weiterleitung</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Ihr Gerät als Nichtausgangsrelais aktivieren</string>
+  <string name="relay_port">Relaisanschluss</string>
+  <string name="listening_port_for_your_tor_relay">Anschluss, auf dem bei Ihrem Tor-Relais gehört werden soll</string>
+  <string name="enter_or_port">OR-Port eingeben</string>
+  <string name="relay_nickname">Relaisspitzname</string>
+  <string name="the_nickname_for_your_tor_relay">Der Spitzname für Ihr Tor-Relais</string>
+  <string name="enter_a_custom_relay_nickname">Einen selbsterstellten Relaisspitznamen eingeben</string>
+  <string name="reachable_addresses">Erreichbare Adressen</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Als Programm hinter einer Firewall mit restriktiven Regeln betreiben</string>
+  <string name="reachable_ports">Erreichbare Ports</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Die Anschlüsse sind hinter einer restriktiven Firewall erreichbar</string>
+  <string name="enter_ports">Ports eingeben</string>
+  <string name="enable_hidden_services">Versteckte Dienste</string>
+  <string name="run_servers_accessible_via_the_tor_network">Auf dem Gerät einen Server betreiben, auf den das Tor-Netzwerk zugreifen kann</string>
+  <string name="enter_localhost_ports_for_hidden_services">Lokale Ports für versteckte Dienste eingeben</string>
+  <string name="hidden_service_ports">Ports der versteckten Dienste</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Der adressierbare Name für Ihren versteckten Dienst (wird automatisch generiert)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Ausgabe des Fehlerdiagnoseprotokolls aktivieren (benötigt adb oder aLogCat zur Ansicht)</string>
+  <string name="project_home">Internetseite(n) des Projektes:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Die Tor-Lizenz</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Drittanbieteranwendungen:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Eine Anwendung möchte den versteckten Server-Anschluss %S öffnen. Das ist sicher, wenn Sie der Anwendung vertrauen.</string>
+  <string name="found_existing_tor_process">bestehender Tor-Prozess gefunden …</string>
+  <string name="something_bad_happened">Etwas ist schief gelaufen. Bitte Protokoll prüfen</string>
+  <string name="hidden_service_on">Versteckte Dienste auf:</string>
+  <string name="unable_to_read_hidden_service_name">Name des versteckten Dienstes kann nicht gelesen werden</string>
+  <string name="unable_to_start_tor">Tor kann nicht gestartet werden:</string>
+  <string name="unable_to_reset_tor">Starten Sie Ihr Gerät neu, Tor konnte nicht zurückgesetzt werden!</string>
+  <string name="pref_use_sys_iptables_title">Vorgegebene IPtables verwenden</string>
+  <string name="pref_use_sys_iptables_summary">Die vorhandene IPtables-Datei verwenden, anstatt der von Orbot mitgelieferten.</string>
+  <string name="error_installing_binares">Die Tor-Programmdateien konnten nicht installiert oder aktualisiert werden.</string>
+  <string name="pref_use_persistent_notifications">Wenn Orbot verbunden ist immer das Orbot-Symbol in der Statusleiste anzeigen</string>
+  <string name="pref_use_persistent_notifications_title">Aktivitätsanzeige</string>
+  <string name="pref_use_expanded_notifications">Erweiterte Benachrichtigung mit Tor-Austrittsland und IP anzeigen</string>
+  <string name="pref_use_expanded_notifications_title">Erweiterte Benachrichtigungen</string>
+  <string name="notification_using_bridges">Brücken aktiviert!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Sprache</string>
+  <string name="set_locale_summary">Gebietsschema und Sprache für Orbot auswählen</string>
+  <string name="wizard_locale_title">Sprache auswählen</string>
+  <string name="wizard_locale_msg">Voreinstellung beibehalten oder Sprache ändern</string>
+  <string name="powered_by">betrieben mit Tor</string>
+  <string name="btn_save_settings">Einstellungen speichern</string>
+  <string name="no_internet_connection_tor">Keine Internetverbindung; Tor ist in Bereitschaft …</string>
+  <string name="bandwidth_">Bandbreite:</string>
+  <string name="down">runter</string>
+  <string name="up">hoch</string>
+  <string name="pref_disable_network_title">Bereitschaft wenn kein Netz</string>
+  <string name="pref_disable_network_summary">Tor in Bereitschaft versetzen, wenn kein Internet verfügbar ist</string>
+  <string name="newnym">Sie haben zu einer neuen Tor-Identität gewechselt!</string>
+  <string name="menu_verify_browser">Browser</string>
+  <string name="menu_use_chatsecure">ChatSecure benutzen</string>
+  <string name="permission_manage_tor_label">Tor verwalten</string>
+  <string name="permission_manage_tor_description">Diese Anwendung aktivieren, um den Tor-Dienst zu kontrollieren</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Es sieht nicht so aus, dass Sie Orfox installiert haben. Wollen Sie dabei Hilfe oder sollen wir einfach den Browser öffnen?</string>
+  <string name="install_apps_">Anwendungen installieren?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Keine Netzwerkverbindung. Tor wird in Bereitschaft versetzt …</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Netzwerkverbindung ist vorhanden. Tor wird aktiviert …</string>
+  <string name="updating_settings_in_tor_service">Einstellungen im Tor-Dienst werden aktualisiert</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Port auf dem der SOCKS-Proxy bereitgestellt wird (Standard: 9050 oder 0 zum deaktivieren)</string>
+  <string name="pref_socks_dialog">SOCKS-Portkonfiguration</string>
+  <string name="pref_transport_title">Tor TransProxy-Port</string>
+  <string name="pref_transport_summary">Port auf dem der Transparente Proxy bereitgestellt wird (Standard: 9040 oder 0 zum deaktivieren)</string>
+  <string name="pref_transport_dialog">TransProxy-Portkonfiguration</string>
+  <string name="pref_dnsport_title">Tor DNS-Port</string>
+  <string name="pref_dnsport_summary">Port auf dem DNS bereitgestellt wird (Standard: 5400 oder 0 zum deaktivieren)</string>
+  <string name="pref_dnsport_dialog">DNS-Portkonfiguration</string>
+  <string name="pref_torrc_title">Benutzerdefinierte Torrc-Konfiguration</string>
+  <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="your_tor_public_ips_">Ihre öffentlichen IPs für Tor:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Bitte deaktivieren Sie diese Anwendung unter Android->Einstellungen->Anwendungen, falls Sie Probleme mit Orbot haben:</string>
+  <string name="app_conflict">Anwendungskonflikt</string>
+  <string name="pref_transproxy_refresh_title">Automatische Transproxy-Aktualisierung</string>
+  <string name="pref_transproxy_refresh_summary">Transproxy-Regeln erneut anwenden, wenn sich der Netzwerkstatus ändert</string>
+  <string name="pref_transproxy_flush_title">Transproxy ENTFERNEN ERZWINGEN</string>
+  <string name="pref_transproxy_flush_summary">Hier Tippen, um JETZT alle Transparent-Proxy Netzwerkregeln zu löschen</string>
+  <string name="transparent_proxy_rules_flushed_">Transparente Proxy-Regeln geleert!</string>
+  <string name="you_do_not_have_root_access_enabled">Sie haben keinen aktivierten Root-Zugang</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Sie müssen Tor stoppen und wieder Starten, um die neuen Einstellungen zu übernehmen.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbit/s</string>
+  <string name="mbps">Mbit/s</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Brücken aktualisiert</string>
+  <string name="restart_orbot_to_use_this_bridge_">Bitte Orbot zum Aktivieren der Änderungen neustarten</string>
+  <string name="menu_qr">QR-Codes</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Wenn Ihr mobiles Netzwerk aktiv Tor sperrt, können Sie mit einer Brücke auf das Netzwerk zugreifen. Wählen Sie einen der oben genannten Brückentypen aus, um Brücken zu aktivieren.</string>
+  <string name="bridge_mode">Brückemodus</string>
+  <string name="get_bridges_email">E-Mail</string>
+  <string name="get_bridges_web">Netz</string>
+  <string name="activate">Aktivieren</string>
+  <string name="apps_mode">VPN-Modus der Anwendungen</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Mit Hilfe von VPN kann man alle Anwendungen über Tor umleiten.\n\n*WARNUNG* Das ist eine neue, experimentelle Funktion und sie startet in einigen fällen nicht automatisch oder stoppt einfach. Die Funktion sollte NICHT für das anonyme Surfen genutzt werden, sondern NUR um Firewalls und Filter zu umgehen.</string>
+  <string name="send_email">E-Mail senden</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Sie können eine Brücken-Adresse per E-Mail, im Web oder per Scan eines BrückenQR-Codes erhalten. Wählen Sie unten \'E-Mail\' oder \'Web\', um eine Brückenadresse anzufordern.\n\nSobald Sie eine Adresse haben, fügen Sie diese bei den Einstellungen für Brücken ein und starten Sie Orbot neu.</string>
+  <string name="install_orweb">Orfox installieren</string>
+  <string name="standard_browser">Standard-Browser</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">HINWEIS: Nur die Standard Tor-Brücken funktionieren mit Intel X86/Atom Geräten</string>
+  <string name="vpn_default_world">Welt</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-el/strings.xml b/orbotservice/src/main/res/values-el/strings.xml
new file mode 100644
index 0000000..30c827c
--- /dev/null
+++ b/orbotservice/src/main/res/values-el/strings.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">εκκίνηση και διακοπή Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Το Orbot ξεκινά</string>
+  <string name="status_activated">Συνδέθηκε στο δίκτυο Tor</string>
+  <string name="status_disabled">\"Το Orbot είναι Απενεργοποιημένο</string>
+  <string name="tor_process_starting">Εκκίνηση του πελάτη Tor...</string>
+  <string name="tor_process_complete">ολοκληρώθηκε...</string>
+  <string name="tor_process_waiting">αναμονή</string>
+  <string name="not_anonymous_yet">ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η κυκλοφορία σας δεν είναι ακόμη ανώνυμη! Ρυθμίστε τις εφαρμογές σας ώστε να χρησιμοποιούν ως πληρεξούσιο HTTP 127.0.0.1:8118 ή SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Αρχική</string>
+  <string name="menu_browse">Περιήγηση</string>
+  <string name="menu_settings">Ρυθμίσεις</string>
+  <string name="menu_log">Καταγραφή</string>
+  <string name="menu_info">Βοήθεια</string>
+  <string name="menu_start">Εκκίνηση</string>
+  <string name="menu_stop">Διακοπή</string>
+  <string name="menu_about">Σχετικά</string>
+  <string name="main_layout_download">Λήψη (ταχύτητα/σύνολο)</string>
+  <string name="main_layout_upload">Αποστολή (ταχύτητα/σύνολο)</string>
+  <string name="button_help">Βοήθεια</string>
+  <string name="button_close">Κλείσιμο</string>
+  <string name="button_about">Σχετικά</string>
+  <string name="button_clear_log">Διαγραφή Καταγραφής</string>
+  <string name="menu_verify">Έλεγχος</string>
+  <string name="menu_exit">Έξοδος</string>
+  <string name="press_to_start">-για να εκκινήσει κρατήστε το πατημένο-</string>
+  <string name="pref_trans_proxy_group">Διαφανής Πληρεξούσιος Διακομηστής (Απαιτεί διαχείριση root)</string>
+  <string name="pref_trans_proxy_title">Διαφανής Πληρεξούσιος Διακομηστής</string>
+  <string name="pref_trans_proxy_summary">Αυτόματη Προσαρμογή Εφαρμογών στο Tor</string>
+  <string name="pref_transparent_all_title">Ανωνυμοποίηση Όλων</string>
+  <string name="pref_transparent_all_summary">Να γίνεται η μεταβίβαση της κυκλοφορίας όλων των εφαρμογών μέσω του Tor</string>
+  <string name="pref_transparent_port_fallback_title">Θύρα αναδίπλωσης του πληρεξούσιου διακομιστή</string>
+  <string name="pref_transparent_port_fallback_summary">ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Παρακάμπτει τις κοινές θύρες (80, 443, κλπ). *ΝΑ ΧΡΗΣΙΜΟΠΟΙΕΙΤΑΙ ΜΟΝΟΝ* όταν οι λειτουργίες \'All\' ή \'App\' δεν αποδίδουν.</string>
+  <string name="pref_transparent_port_title">Λίστα θυρών</string>
+  <string name="pref_transparent_port_summary">Λίστα θυρών πληρεξούσιου διακομιστή. *ΝΑ ΧΡΗΣΙΜΟΠΟΙΕΙΤΑΙ ΜΟΝΟΝ* όταν οι λειτουργίες \'All\' ή \'App\' δεν αποδίδουν.</string>
+  <string name="pref_transparent_port_dialog">Εισάγετε θύρες πληρεξούσιου διακομιστή</string>
+  <string name="pref_has_root">Άιτημα πρόσβασης με δικαιώματα υπερχρήστη</string>
+  <string name="pref_has_root_summary">Άιτημα πρόσβασης με δικαιώματα υπερχρήστη για διαφανή μεταβίβαση δεδομένων μέσω πληρεξούσιου διακομιστή</string>
+  <string name="status_install_success">Τα δυαδικά αρχεία του Tor εγκαταστάθηκαν με επιτυχία!</string>
+  <string name="status_install_fail">Τα δυαδικά αρχεία του Tor δεν εγκαταστάθηκαν. Ελέγξτε τις καταγραφές και ειδοποιείστε στην διεύθυνση tor-assistants at torproject.org</string>
+  <string name="title_error">Σφάλμα εφαρμογής</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Σχετικά με το Orbot</string>
+  <string name="btn_next">Επόμενο</string>
+  <string name="btn_back">Πίσω</string>
+  <string name="btn_finish">Τέλος</string>
+  <string name="btn_okay">Okay</string>
+  <string name="btn_cancel">Άκυρο</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Μερικές λεπτομέρειες για το Orbot</string>
+  <string name="wizard_permissions_root">Η άδεια παραχωρήθηκε</string>
+  <string name="wizard_permissions_stock">Άδειες Orbot</string>
+  <string name="wizard_premissions_msg_root">Καλώς! Διαπιστώνουμε ότι έχετε ενεργοποιημένο τον υπερχρήστη για το Orbot. Θα χρησιμοποιήσουμε το προνόμιο αυτό με σύνεση.</string>
+  <string name="wizard_permissions_msg_stock"> Αν και δεν είναι απαραίτητο, το Orbot μπορεί να γίνει ισχυρότερο όταν η συσκευή σας έχει διαμορφωθεί για πρόσβαση υπερχρήστη. Πατήστε το πιο κάτω κουμπί για να δώσετε αυξημένα δικαιώματα στο Orbot! </string>
+  <string name="wizard_permissions_no_root">Αν δεν διαθέτετε πρόσβαση υπερχήστη ή δεν καταλαβαίνετε τι εννοούμε, απλώς χρησιμοποιείτε εφαρμογές που φτιάχτηκαν για να συνεργάζονται με το Orbot.</string>
+  <string name="wizard_permissions_consent">Καταλαβαίνω και θέλω να συνεχίσω ως Υπερχρήστης</string>
+  <string name="wizard_permission_enable_root">Απόδοση Διαχειρισης στο Orbot</string>
+  <string name="wizard_configure">Ρύθμιση Torification</string>
+  <string name="wizard_configure_msg">Το Orbot σας επιτρέπει να κατευθύνετε όλη την κυκλοφορία κάποιας εφαρμογής προς το Tor ή να επιλέξετε κάθε μια εφαρμογή ξεχωριστά.</string>
+  <string name="wizard_configure_all">Το Tor να γίνει ενδιάμεσος διακομιστής Proxy για όλες τις εφαρμογές</string>
+  <string name="wizard_configure_select_apps">Επιλογή μεμονωμένων εφαρμογών για το Tor</string>
+  <string name="wizard_tips_tricks">Εφαρμογές συμβατές για Orbont</string>
+  <string name="wizard_tips_msg">Οι παρακάτω εφαρμογές αναπτύχθηκαν ώστε να λειτουργούν με το Orbot. Πατήστε σε κάθε κουμπί για να εγκατασταθεί τώρα ή μπορείτε να τις βρείτε αργότερα στο Android Market</string>
+  <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="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>
+  <string name="wizard_final">Το Orbot είναι έτοιμο!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Θα ανοίξει ο περιηγητής δικτύου στην σελίδα https://check.torproject.org για να διαπιστώσετε αν το Orbot είναι σωστά ρυθμισμένο και ότι είστε συνδεδεμένος/η στο Tor.</string>
+  <string name="pref_hs_group">Φιλοξενία κρυφών υπηρεσιών</string>
+  <string name="pref_general_group">Γενικά</string>
+  <string name="pref_start_boot_title">Έναρξη του Orbot κατά την εκκίνηση</string>
+  <string name="pref_start_boot_summary">Αυτόματη έναρξη του Orbot και σύνδεση στο Tor όταν ξεκινά η Android συσκευή σας</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Προειδοποίηση</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Άδειες</string>
+  <string name="wizard_permissions_root_msg1">Αν θέλετε, μπορεί να δώσετε στο Orbot πρόσβαση \'Υπερχρήστη\' ώστε να ενεργοποιήσετε τα προχωρημένα χαρακτηριστικά, όπως το Transparent Proxying.</string>
+  <string name="wizard_permissions_root_msg2">Αν δεν θέλετε κάτι τέτοιο, βεβαιωθείτε ότι χρησιμοποιείτε εφαρμογές που συνεργάζονται με το Orbot</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Εφαρμογές συμβατές με Orbot</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: Ασφαλές chat app με Off-the-Record κρυπτογράφηση</string>
+  <string name="wizard_tips_play">Βρες όλες τις εφαρμογές Guardian Project στο Google Play</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Διαφανής μεσολάβηση διακομιστή</string>
+  <string name="wizard_transproxy_msg">Το στοιχείο αυτό επιτρέπει στις εφαρμογές σας να λειτουργούν μέσω του δικτύου Tor χωρίς κάποια ρύθμιση.</string>
+  <string name="wizard_transproxy_hint">(Επιλέξτε αυτό το τετράγωνο αν δεν καταλαβαίνετε για τι πράγμα μιλάμε)</string>
+  <string name="wizard_transproxy_none">Καμία</string>
+  <string name="pref_transparent_tethering_title">Διασύνδεση Tor</string>
+  <string name="pref_transparent_tethering_summary">Ενεργοποίηση της Διαφανούς μεσολάβησης διακομιστή για συσκευές με WiFi και διασύνδεση USB (απαιτεί επανεκκίνηση)</string>
+  <string name="button_grant_superuser">Αίτημα Πρόσβασης Υπερχρήστη</string>
+  <string name="pref_select_apps">Επιλογή εφαρμογών</string>
+  <string name="pref_select_apps_summary">Επιλέξτε τις εφαρμογές που θα διέλθουν μέσω Tor</string>
+  <string name="pref_node_configuration">Ρύθμιση κόμβου</string>
+  <string name="pref_node_configuration_summary">Οι ρυθμίσεις αυτές είναι προχωρημένες και μπορούν να μειώσουν την ανωνυμία σας.</string>
+  <string name="pref_entrance_node">Κόμβοι εισόδου</string>
+  <string name="pref_entrance_node_summary">Αποτυπώματα, ψευδώνυμα, χώρες και διευθύνσεις για την πρώτη σύνδεση</string>
+  <string name="pref_entrance_node_dialog">Εισάγετε κόμβους εισαγωγής</string>
+  <string name="pref_proxy_title">Διακομιστής μεσολάβησης εξερχομένων δεδομένων</string>
+  <string name="pref_proxy_type_title">Τύπος του διακομιστή μεσολάβησης εξερχομένων δεδομένων</string>
+  <string name="pref_proxy_type_summary">Πρωτόκολλο του διακομιστή μεσολάβησης: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Εισάγετε τύπο διακομιστή μεσολάβησης</string>
+  <string name="pref_proxy_host_title">Διακομιστής μεσολάβησης εξερχόμενων δεδομένων</string>
+  <string name="pref_proxy_host_summary">Hostname Διακομιστή Μεσολάβησης</string>
+  <string name="pref_proxy_host_dialog">Εισάγετε τον υπολογιστή για τον διακομιστή μεσολάβησης</string>
+  <string name="pref_proxy_port_title">Θύρα εξερχομένων του διακομιστή μεσολάβησης</string>
+  <string name="pref_proxy_port_summary">Θύρα Διακομιστή Μεσολάβησης</string>
+  <string name="pref_proxy_port_dialog">Εισάγετε την θύρα του διακομιστή μεσολάβησης</string>
+  <string name="pref_proxy_username_title">Όνομα χρήστη για τον Διακομιστή Μεσολάβησης εξερχόμενων δεδομένων</string>
+  <string name="pref_proxy_username_summary">Όνομα χρήστη για το Διακομιστή Μεσολάβησης (Προαιρετικό)</string>
+  <string name="pref_proxy_username_dialog">Εισάγετε το Όνομα Χρήστη για το Διακομιστή Μεσολάβησης</string>
+  <string name="pref_proxy_password_title">Κωδικός για τον Διακομιστή Μεσολάβησης εξερχόμενων δεδομένων</string>
+  <string name="pref_proxy_password_summary">Κωδικός για τον Διακομιστή Μεσολάβησης (Προαιρετικό)</string>
+  <string name="pref_proxy_password_dialog">Εισάγετε τον Κωδικό για τον Διακομιστή Μεσολάβησης</string>
+  <string name="status">Κατάσταση</string>
+  <string name="setting_up_full_transparent_proxying_">Ρύθμιση </string>
+  <string name="setting_up_app_based_transparent_proxying_">Ρύθμιση της διαφανούς μεσολάβησης διακομιστή</string>
+  <string name="transparent_proxying_enabled">Η διαφανής μεσολάβηση διακομιστή ΕΝΕΡΓΟΠΟΙΗΘΗΚΕ</string>
+  <string name="transproxy_enabled_for_tethering_">Το TransProxy ενεργοποιήθηκε για την διασύνδεση - Tethering</string>
+  <string name="warning_error_starting_transparent_proxying_">ΠΡΟΕΙΔΟΠΟΙΗΣΗ: σφάλμα κατά την εκκίνηση της διαφανούς μεσολάβησης διακομιστή!</string>
+  <string name="transproxy_rules_cleared">Οι ρυθμίσεις του TransProxy απομακρύνθηκαν</string>
+  <string name="couldn_t_start_tor_process_">Αδυναμία εκκίνησης της διεργασίας Tor:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Ρύθμιση της διαφανούς μεσολάβησης διακομιστή κατά θύρα...</string>
+  <string name="bridge_error">Σφάλμα γέφυρας</string>
+  <string name="bridge_requires_ip">Για να χρησιμοποιήσετε το στοιχείο γέφυρας, πρέπει να εισάγετε την διεύθυνση ΙΡ τουλάχιστον μιας γέφυρας.</string>
+  <string name="send_email_for_bridges">Μέσω ενός λογαριασμού gmai στείλτε ένα μήνυμα στην διεύθυνση bridges at torproject.org με την φαση \"get bridges\" μόνη της στο σώμα το μηνύματος.</string>
+  <string name="error">Σφάλμα</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Οι ρυθμίσεις ReachableAddresses προκάλεσαν μια εξαίρεση!</string>
+  <string name="your_relay_settings_caused_an_exception_">Οι ρυθμίσεις αναμεταδότη σας προκάλεσαν μια εξαίρεση!</string>
+  <string name="exit_nodes">Κόμβοι εξόδου</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Αποτυπώματα, ψευδώνυμα, χώρες και διευθύνσεις της τελευταίας σύνδεσης</string>
+  <string name="enter_exit_nodes">Εισάγετε κόμβους εξόδου</string>
+  <string name="exclude_nodes">Εξαιρετέοι κόμβοι</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Αποτυπώματα, ψευδώνυμα, χώρες και διευθύνσεις προς εξαίρεση</string>
+  <string name="enter_exclude_nodes">Εισάγετε Εξαιρετέους κόμβους</string>
+  <string name="strict_nodes">Αποκλειστικοί κόμβοι</string>
+  <string name="use_only_these_specified_nodes">Χρήση *μόνον* αυτών των συγκεκριμένων κόμβων</string>
+  <string name="bridges">Γέφυρες</string>
+  <string name="use_bridges">Χρήση γεφυρών</string>
+  <string name="bridges_obfuscated">Κρυφές γέφυρες</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Ενεργοποίηση εναλλακτικών κόμβων εισόδου στο δίκτυο Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Ενεργοποιήστε το αν οι ρυθμισμένες γέφυρες είναι κρυφές</string>
+  <string name="ip_address_and_port_of_bridges">Διεύθυνση ΙΡ και θύρα των γεφυρών</string>
+  <string name="enter_bridge_addresses">Εισάγετε την διεύθυνση της γέφυρας</string>
+  <string name="relays">Αναμεταδότες</string>
+  <string name="relaying">Γίνεται αναμετάδοση</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Μετατρέψτε την συσκευή σας σε ένα αναμεταδότη μη-εξόδου</string>
+  <string name="relay_port">Θύρα αναμετάδοσης</string>
+  <string name="listening_port_for_your_tor_relay">Θύρα ακρόασης για τον αναμεταδότη σας</string>
+  <string name="enter_or_port">Εισάγετε την θύρα OR</string>
+  <string name="relay_nickname">Ψευδώνυμο του αναμεταδότη</string>
+  <string name="the_nickname_for_your_tor_relay">Το ψευδώνυμο του αναμεταδότη σας Tor</string>
+  <string name="enter_a_custom_relay_nickname">Εισάγετε ένα προτιμώμενο ψευδώνυμο αναμεταδότη</string>
+  <string name="reachable_addresses">Προσιτές διευθύνσεις</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Εκτέλεση ως πελάτη πίσω από τοίχος προστασίας με περιοριστικές πολιτικές</string>
+  <string name="reachable_ports">Προσιτές θύρες</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Προσιτές θύρες πίσω από περιοριστικό τοίχος προστασίας</string>
+  <string name="enter_ports">Εισάγετε θύρες</string>
+  <string name="enable_hidden_services">Φιλοξενία κρυφών υπηρεσιών</string>
+  <string name="run_servers_accessible_via_the_tor_network">να επιτρέπετε στον διακομιστή της συσκευής να είναι προσβάσιμος μέσω του δικτύου Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">εισάγετε τις θύρες κρυφών υπηρεσιών του localhost</string>
+  <string name="hidden_service_ports">Θύρες κρυφών υπηρεσιών</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">το όνομα προσπέλασης για τις κρυφές υπηρεσίες σας (παράγεται αυτόματα)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ενεργοποίηση καταγραφών αποσφαλμάτωσης (για την προβολή τους απαιτείται χρήση adb ή aLogCat)</string>
+  <string name="project_home">Ιστοσελίδες του έργου:</string>
+  <string name="the_tor_license">Η Άδεια Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Λογισμικό τρίτων:</string>
+  <string name="hidden_service_request">Κάποια εφαρμογή προσπαθεί να ανοίξει την κρυφή θύρα διακομιστή %S στο δίκτυο Tor. Πρόκειται για ασφαλή ενέργεια, εφόσον γνωρίζετε την εφαρμογή.</string>
+  <string name="found_existing_tor_process">αναζήτηση διεργασιών Tor...</string>
+  <string name="something_bad_happened">Κάτι κακό συνέβη. Ελέγξτε τις καταγραφές</string>
+  <string name="hidden_service_on">ενεργοποιημένη κρυφή υπηρεσία:</string>
+  <string name="unable_to_read_hidden_service_name">αδυναμία ανάγνωσης του ονόματος της κρυφής υπηρεσίας</string>
+  <string name="unable_to_start_tor">Αδυναμία εκκίνησης του Tor:</string>
+  <string name="pref_use_sys_iptables_title">Χρήση αρχικού iptables</string>
+  <string name="pref_use_sys_iptables_summary">χρήση του ενσωματωμένου iptables αντί για εκείνων του πακέτου Orbot</string>
+  <string name="error_installing_binares">Τα αρχεία Tor δεν μπόρεσαν να εγκατασταθούν ή να αναβαθμιστούν.</string>
+  <string name="pref_use_persistent_notifications">Να διατηρείται πάντοτε το εικονίδιο στην γραμμή εργαλείων όταν το Orbot συνδέεται</string>
+  <string name="pref_use_persistent_notifications_title">Ειδοποιήσεις διαρκούς σύνδεσης</string>
+  <string name="notification_using_bridges">Οι γέφυρες ενεργοποιήθηκαν!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Επιλέξτε ρυθμίσεις τοπικότητας και γλώσσας για το Orbot</string>
+  <string name="wizard_locale_title">Επιλέξτε γλώσσα</string>
+  <string name="wizard_locale_msg">Παραμείνετε στην αρχική ή αλλάξτε την τρέχουσα γλώσσα</string>
+  <string name="btn_save_settings">Αποθήκευση ρυθμίσεων</string>
+  <string name="bandwidth_">Εύρος ζώνης:</string>
+  <string name="down">κατέβασμα</string>
+  <string name="up">ανέβασμα</string>
+  <string name="pref_disable_network_title">Χωρίς Αυτόματη Αναστολή Δικτύου</string>
+  <string name="pref_disable_network_summary">Θέσε το Tor σε λειτουργία sleep όταν δεν υπάρχει διαθέσιμη σύνδεση Ιnternet</string>
+  <string name="newnym">Έχετε αλλάξει επιτυχώς την ταυτότητα σας στο Tor! </string>
+  <string name="menu_use_chatsecure">Χρήση του ChatSecure</string>
+  <string name="permission_manage_tor_label">Διαχείριση Tor</string>
+  <string name="permission_manage_tor_description">Εξουσιοδοτήστε την εφαρμογή να ελέγχει την υπηρεσία του Tor</string>
+  <string name="install_apps_">Εγκατάσταση εφαρμογών?</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-en-rGB/strings.xml b/orbotservice/src/main/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..4ddc60d
--- /dev/null
+++ b/orbotservice/src/main/res/values-en-rGB/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="btn_next">Next</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-eo/strings.xml b/orbotservice/src/main/res/values-eo/strings.xml
new file mode 100644
index 0000000..3c103de
--- /dev/null
+++ b/orbotservice/src/main/res/values-eo/strings.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">ŝalti kaj malŝalti Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot ŝaltiĝas...</string>
+  <string name="status_activated">Konektita al Tor-reto</string>
+  <string name="status_disabled">Orbot estas malaktivigita</string>
+  <string name="tor_process_starting">Ŝaltiĝas Tor-kliento...</string>
+  <string name="tor_process_complete">kompleta.</string>
+  <string name="tor_process_waiting">atendas.</string>
+  <string name="not_anonymous_yet">ATENTIGO: Via trafiko ankoraŭ ne estas anonima! Bonvolu agordi viajn aplikaĵojn por uzi HTTP-prokurilon 127.0.0.1:8118 aŭ SOCKS4A- aŭ SOCKS5-prokurilo 127.0.0.1:9050</string>
+  <string name="menu_home">Hejma tasto</string>
+  <string name="menu_browse">Foliumi</string>
+  <string name="menu_settings">Agordoj</string>
+  <string name="menu_log">Protokolo</string>
+  <string name="menu_info">Helpo</string>
+  <string name="menu_start">Starti</string>
+  <string name="menu_stop">Halti</string>
+  <string name="menu_about">Pri</string>
+  <string name="main_layout_download">Elŝutado</string>
+  <string name="main_layout_upload">Alŝutado</string>
+  <string name="button_help">Helpo</string>
+  <string name="button_close">Fermi</string>
+  <string name="button_about">Pri</string>
+  <string name="button_clear_log">Forviŝi protokolon</string>
+  <string name="menu_verify">Kontroli</string>
+  <string name="menu_exit">Eliri</string>
+  <string name="press_to_start">- longe puŝi por ŝalti -</string>
+  <string name="pref_trans_proxy_summary">Aŭtomata Tor-igo de Aplikaĵoj</string>
+  <string name="pref_transparent_all_title">Tor-igu ĉion</string>
+  <string name="pref_transparent_port_title">Listo de Pordoj</string>
+  <string name="pref_has_root">Peti Administrajn Rajtojn</string>
+  <string name="status_install_success">Binara kodo de Tor estas sukcese instalita!</string>
+  <string name="status_install_fail">Binaraj dosieroj de Tor ne povis esti instalitaj. Kontrolu protokolon kaj sciigu nin per tor-assistants at torproject.org</string>
+  <string name="title_error">Eraro de Aplikaĵo</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Pri Orbot</string>
+  <string name="btn_next">Sekva</string>
+  <string name="btn_back">Malantaŭe</string>
+  <string name="btn_finish">Fini</string>
+  <string name="btn_cancel">Rezigni</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Kelkaj Detaloj pri Orbot</string>
+  <string name="wizard_permissions_root">Permeso estas Aluĝita</string>
+  <string name="wizard_permissions_stock">Permesoj de Orbot</string>
+  <string name="wizard_permissions_consent">Mi komprenas kaj volas daŭri sen administraj rajtoj</string>
+  <string name="wizard_configure">Agordi Tor-igon</string>
+  <string name="wizard_configure_select_apps">Elekti Individualajn Aplikaĵojn por Tor</string>
+  <string name="wizard_tips_tricks">Aplikaĵoj permesitaj por Orbot</string>
+  <string name="wizard_tips_otrchat">ChatSecutre - Sekura tujmesaĝilo por Android</string>
+  <string name="wizard_tips_proxy">Agordoj de prokurilo - Lernu kiel agordi aplikaĵojn por kunlabori kun Orbot</string>
+  <string name="wizard_tips_twitter">Agordi prokurilon por Twitter je adreso \"localhost\" kaj pordo 8118</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
+  <string name="wizard_proxy_help_info">Retperant‐agordoj</string>
+  <string name="wizard_final">Orbot estas preparita!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_hs_group">Gastigado de kaŝita servo</string>
+  <string name="pref_general_group">Ĝenerala</string>
+  <string name="pref_start_boot_title">Ŝalti Orbot dum praŝargado</string>
+  <string name="pref_start_boot_summary">Aŭtomate startigi Orbot kaj konekti al Tor dum praŝargado de via Androida ilo</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Averto</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permesoj</string>
+  <string name="wizard_permissions_root_msg2">Se vi ne volas fari tion, bonvolu certiĝi ke eblas agordi aplikaĵojn por kunlabori kun Orbot</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Aplikaĵoj permesitaj por Orbot</string>
+  <string name="wizard_tips_play">Trovu ĉiujn aplikaĵojn de Guardian Project ĉe Google Play</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_hint">(Marku ĉi tiun butonon se vi ne scias pri kio ni parolas)</string>
+  <string name="wizard_transproxy_none">Neniom</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="button_grant_superuser">Peti Administrajn Rajtojn</string>
+  <string name="pref_select_apps">Elekti aplikaĵojn</string>
+  <string name="pref_node_configuration">Agordo de Nodoj</string>
+  <string name="pref_node_configuration_summary">Tie troviĝas progresintaj agordoj kiuj povas limigi vian anonimecon</string>
+  <string name="pref_entrance_node">Eniraj nodoj</string>
+  <string name="pref_entrance_node_summary">Fingrospuroj, kaŝnomoj, landoj kaj adresoj por la unua hopo</string>
+  <string name="pref_entrance_node_dialog">Entajpu enirajn nodojn</string>
+  <string name="pref_proxy_title">Elira prokurilo (Malnepra)</string>
+  <string name="pref_proxy_type_title">Tipo de elira prokurilo</string>
+  <string name="pref_proxy_type_summary">Protokolo uzata de la prokurilo: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Entajpu tipon de la prokurilo</string>
+  <string name="pref_proxy_host_title">Adreso de la elira prokurilo</string>
+  <string name="pref_proxy_host_summary">Adresnomo de la prokurilo</string>
+  <string name="pref_proxy_host_dialog">Entajpu adreson</string>
+  <string name="pref_proxy_port_title">Pordo de la elira prokurilo</string>
+  <string name="pref_proxy_port_summary">Pordo de la Prokurservilo</string>
+  <string name="pref_proxy_port_dialog">Entajpu la pordon</string>
+  <string name="pref_proxy_username_title">Uzantnomo de la elira prokurilo</string>
+  <string name="pref_proxy_username_summary">Uzantnomo de la prokurilo (Malnepra)</string>
+  <string name="pref_proxy_username_dialog">Entajpu uzantnomon</string>
+  <string name="pref_proxy_password_title">Pasvorto de la elira prokurilo</string>
+  <string name="pref_proxy_password_summary">Pasvorto de la prokurilo (Malnepra)</string>
+  <string name="pref_proxy_password_dialog">Entajpu pasvorton</string>
+  <string name="status">Stato</string>
+  <string name="couldn_t_start_tor_process_">Tor-procedo ne sukcesis stariĝi:</string>
+  <string name="bridge_error">Eraro de Ponto</string>
+  <string name="error">Eraro</string>
+  <string name="your_relay_settings_caused_an_exception_">Via agordo de relajso kaŭzis escepton!</string>
+  <string name="exit_nodes">Finnodoj</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingrospuroj, kaŝnomoj, landoj kaj adresoj por la lasta hopo</string>
+  <string name="enter_exit_nodes">Entajpu finnofojn</string>
+  <string name="use_only_these_specified_nodes">Uzi *nur* tiujn ĉi nodojn</string>
+  <string name="bridges">Pontoj</string>
+  <string name="use_bridges">Uzi Pontojn</string>
+  <string name="ip_address_and_port_of_bridges">IP-adresoj kaj pordoj de pontoj</string>
+  <string name="enter_or_port">Entajpu OR-pordon</string>
+  <string name="relay_nickname">Kaŝnomo de la relajso</string>
+  <string name="the_nickname_for_your_tor_relay">Kaŝnomo por via Tor-relajso</string>
+  <string name="enter_a_custom_relay_nickname">Entajpu propran kaŝnomon de la relajso</string>
+  <string name="reachable_addresses">Atingeblaj adresoj</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Startigi kiel kliento malantaŭ fajromuro kun restriktaj reguloj</string>
+  <string name="reachable_ports">Atingeblaj pordoj</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Pordoj, kiuj atingeblas tra la restrikta fajromuro</string>
+  <string name="enter_ports">Entajpu pordojn</string>
+  <string name="enable_hidden_services">Gastigado de Kaŝitaj Servoj</string>
+  <string name="run_servers_accessible_via_the_tor_network">permesi al servilo sur ĉi tiu aparato esti atingebla per Tor-reto</string>
+  <string name="enter_localhost_ports_for_hidden_services">entajpi localhost-pordojn de kaŝitaj servoj</string>
+  <string name="hidden_service_ports">Pordoj de Kaŝitaj Servoj</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">adreso de via kaŝita servo (aŭtomate generata)</string>
+  <string name="project_home">Retpaĝaro(j) de la Projekto:</string>
+  <string name="the_tor_license">The Tor License</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="found_existing_tor_process">trovi ekzistantan Tor-procedon...</string>
+  <string name="hidden_service_on">kaŝitaj servoj je:</string>
+  <string name="unable_to_read_hidden_service_name">ne eblas legi nomon de la kaŝita servo</string>
+  <string name="unable_to_start_tor">Ne eblas startigi Tor:</string>
+  <string name="pref_use_sys_iptables_title">Uzi defaŭltajn Iptables</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Elekti lokaĵaron kaj lingvon por Orbot</string>
+  <string name="wizard_locale_title">Elekti lingvon</string>
+  <string name="btn_save_settings">Konservi Agordojn</string>
+  <string name="bandwidth_">Kapacito:</string>
+  <string name="down">el</string>
+  <string name="up">al</string>
+  <string name="menu_use_chatsecure">Uzi ChatSecure</string>
+  <string name="install_apps_">Instali aplikaĵojn?</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-es-rAR/strings.xml b/orbotservice/src/main/res/values-es-rAR/strings.xml
new file mode 100644
index 0000000..b921a40
--- /dev/null
+++ b/orbotservice/src/main/res/values-es-rAR/strings.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">reiniciar Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot está iniciándose...</string>
+  <string name="status_activated">Conectado a la red Tor</string>
+  <string name="status_disabled">\"Orbot está Desactivado</string>
+  <string name="tor_process_starting">Iniciando el cliente Tor...</string>
+  <string name="tor_process_complete">Completar</string>
+  <string name="tor_process_waiting">esperando...</string>
+  <string name="not_anonymous_yet">CIUDADO: Tu tráfico no es anónimo aún! Por favor configura tus aplicaciones para que usen el HTTP proxy 127.0.0.1:8118 o SOCKS4A o el proxy SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Inicio</string>
+  <string name="menu_browse">Navegar</string>
+  <string name="menu_settings">Configuración</string>
+  <string name="menu_log">Registro</string>
+  <string name="menu_info">Ayuda</string>
+  <string name="menu_start">Iniciar</string>
+  <string name="menu_stop">Detener</string>
+  <string name="menu_about">Acerca de</string>
+  <string name="main_layout_download">Descargar</string>
+  <string name="main_layout_upload">Subir</string>
+  <string name="button_help">Ayuda</string>
+  <string name="button_close">Cerrar</string>
+  <string name="button_about">Acerca de</string>
+  <string name="button_clear_log">Borrar Registros</string>
+  <string name="menu_verify">Chequear</string>
+  <string name="menu_exit">Salir</string>
+  <string name="pref_trans_proxy_group">Proxying Transparente (Requiere Root)</string>
+  <string name="pref_trans_proxy_title">Proxying Transparente</string>
+  <string name="pref_trans_proxy_summary">Torificación Automática de Aplicaciones</string>
+  <string name="pref_transparent_all_title">Torear Todo</string>
+  <string name="status_install_fail">Los archivos binarios Tor no pudieron ser instalado. Compruebe el registro y notificar a tor-assistants at torproject.org</string>
+  <string name="title_error">Error de la aplicación</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Acerca de Orbot</string>
+  <string name="btn_next">Siguiente</string>
+  <string name="btn_back">Atrás</string>
+  <string name="btn_finish">Finalizar</string>
+  <string name="btn_okay">Ok</string>
+  <string name="btn_cancel">Cancelar</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Algunos detalles de Orbot</string>
+  <string name="wizard_final">Orbot está listo!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">General</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxying Transparente</string>
+  <string name="pref_proxy_password_dialog">Ingrese contraseña Proxy</string>
+  <string name="enter_ports">Ingresar puertos</string>
+  <string name="the_tor_license">La Licencia de Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="unable_to_start_tor">No se puede iniciar Tor:</string>
+  <string name="default_bridges"></string>
+  <string name="wizard_locale_title">Elegir el lenguaje</string>
+  <string name="btn_save_settings">Guardar configuración</string>
+  <string name="bandwidth_">Ancho de banda:</string>
+  <string name="menu_use_chatsecure">Usar ChatSecure</string>
+  <string name="install_apps_">Instalar apps?</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-es/strings.xml b/orbotservice/src/main/res/values-es/strings.xml
new file mode 100644
index 0000000..15c5d59
--- /dev/null
+++ b/orbotservice/src/main/res/values-es/strings.xml
@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot es una aplicación libre de proxy (interpuesto) que faculta a otras aplicaciones para usar Internet de forma más segura. Orbot utiliza Tor para cifrar su tráfico de Internet, y luego lo oculta rebotándolo a través de una serie de computadoras por todo el mundo. Tor es software libre y una red abierta que le ayuda a defenderse contra una forma de vigilancia de red conocida como análisis de tráfico que amenaza la libertad y la privacidad personales, las actividades y relaciones comerciales confidenciales, y la seguridad de estado.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">https://check.torproject.org/?lang=es</string>
+  <string name="secure_default_web_url">https://check.torproject.org/?lang=es</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">iniciar y detener Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot está iniciandose...</string>
+  <string name="status_activated">Conectado a la red Tor</string>
+  <string name="status_disabled">Orbot está desactivado</string>
+  <string name="status_shutting_down">TorService se está cerrando</string>
+  <string name="tor_process_starting">Iniciando cliente Tor...</string>
+  <string name="tor_process_complete">completado.</string>
+  <string name="tor_process_waiting">en espera.</string>
+  <string name="not_anonymous_yet">ADVERTENCIA: ¡Su tráfico no es anónimo aún! Configure sus aplicaciones para utilizar proxy HTTP 127.0.0.1:8118, o proxy SOCKS4A o SOCKS5 127.0.0.1:9050 (o podría habilitar la proxyficación transparente si su dispositivo está rooteado)</string>
+  <string name="menu_home">Principal</string>
+  <string name="menu_browse">Examinar</string>
+  <string name="menu_settings">Configuración</string>
+  <string name="menu_log">Registro (log)</string>
+  <string name="menu_info">Ayuda</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Iniciar</string>
+  <string name="menu_stop">Detener</string>
+  <string name="menu_about">Acerca de</string>
+  <string name="menu_promo_apps">Obtener aplicaciones...</string>
+  <string name="main_layout_download">Descarga</string>
+  <string name="main_layout_upload">Subida</string>
+  <string name="button_help">Ayuda</string>
+  <string name="button_close">Cerrar</string>
+  <string name="button_about">Acerca de</string>
+  <string name="button_clear_log">Limpiar registro (log)</string>
+  <string name="menu_verify">Verificar</string>
+  <string name="menu_exit">Salir</string>
+  <string name="menu_scan">Escanear QR de bridge</string>
+  <string name="menu_share_bridge">Compartir QR de bridge</string>
+  <string name="press_to_start">- mantega pulsado para iniciar -</string>
+  <string name="pref_trans_proxy_group">Proxyficación transparente (requiere root)</string>
+  <string name="pref_trans_proxy_title">Proxyficación transparente</string>
+  <string name="pref_trans_proxy_summary">Torificado automático de aplicaciones</string>
+  <string name="pref_transparent_all_title">Torificar todo</string>
+  <string name="pref_transparent_all_summary">Proxyfica vía Tor el tráfico de todas las aplicaciones sin configurarlas</string>
+  <string name="pref_transparent_port_fallback_title">Puertos a proxyficar para contingencias</string>
+  <string name="pref_transparent_port_fallback_summary">ADVERTENCIA: Evita puertos comunes (80, 443, etc). *USAR SÓLO* si los modos \'Todo\' o \'Aplicaciones\' no funcionan.</string>
+  <string name="pref_transparent_port_title">Lista de puertos</string>
+  <string name="pref_transparent_port_summary">Lista de puertos a proxyficar. *USAR SÓLO* si los modos \'Todo\' o \'Aplicaciones\' no funcionan</string>
+  <string name="pref_transparent_port_dialog">Introduzca los puertos a proxyficar</string>
+  <string name="pref_has_root">Solicitar permisos de root</string>
+  <string name="pref_has_root_summary">Solicita permisos de root para usar proxyficación transparente</string>
+  <string name="status_install_success">¡Los binarios de Tor se instalaron con éxito!</string>
+  <string name="status_install_fail">Los archivos binarios de Tor no pudieron ser instalados. Revise el registro (log) y notifique a tor-assistants at torproject.org</string>
+  <string name="title_error">Error de la aplicación</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Acerca de Orbot</string>
+  <string name="btn_next">Siguiente</string>
+  <string name="btn_back">Atrás</string>
+  <string name="btn_finish">Finalizar</string>
+  <string name="btn_okay">Aceptar</string>
+  <string name="btn_cancel">Cancelar</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Algunos detalles de Orbot</string>
+  <string name="wizard_details_msg">Orbot es una aplicación de código-abierto que contiene Tor, LibEvent y Polipo. Proporciona un proxy HTTP (8118) y un proxy SOCKS (9050) locales hacia la red Tor. Orbot también tiene la capacidad, en un dispositivo rooteado, de enviar todo el tráfico de Internet a través de Tor.</string>
+  <string name="wizard_permissions_root">Permiso concedido</string>
+  <string name="wizard_permissions_stock">Permisos de Orbot</string>
+  <string name="wizard_premissions_msg_root">¡Excelente! Hemos detectado que ha concedido a Orbot permisos de root. Utilizaremos estos poderes sabiamente.</string>
+  <string name="wizard_permissions_msg_stock"> Aunque no es un requisito, Orbot puede convertirse en una herramienta más potente si accede a su dispositivo con permisos de root. ¡Utilice el botón inferior para conceder superpoderes a Orbot!</string>
+  <string name="wizard_permissions_no_root">Si no tiene acceso como root o no tiene idea de qué estamos hablando, tan solo asegúrese de utilizar aplicaciones específicamente preparadas para trabajar con Orbot (o que permitan conexión por proxy HTTP o SOCKS).</string>
+  <string name="wizard_permissions_consent">Comprendo, y quiero continuar sin poderes administrativos</string>
+  <string name="wizard_permission_enable_root">Conceder permisos de root a Orbot</string>
+  <string name="wizard_configure">Configurar torificación</string>
+  <string name="wizard_configure_msg">Orbot le da la opción de dirigir el tráfico de todas las aplicaciones a través de Tor - o - de seleccionar sus aplicaciones a torificar individualmente.</string>
+  <string name="wizard_configure_all">Proxyficar todas la aplicaciones a través de Tor</string>
+  <string name="wizard_configure_select_apps">Seleccionar aplicaciones individuales para Tor</string>
+  <string name="wizard_tips_tricks">Aplicaciones habilitadas para Orbot</string>
+  <string name="wizard_tips_msg">Las siguientes aplicaciones fueron desarrolladas para trabajar con Orbot. Haga clic en cada botón para instalarlas ahora, o puede encontrarlas más tarde en Google Play, en la web guardianproject.info o vía f-droid.org </string>
+  <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="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="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>
+  <string name="wizard_final">¡Orbot está listo!</string>
+  <string name="wizard_final_msg">Millones de personas por todo el mundo usan Tor por una amplia variedad de razones.\n\nPeriodistas y blogueros, defensores de los derechos humanos, funcionarios judiciales, corporaciones, ciudadanos bajo regímenes represivos, y simples ciudadanos corrientes... ¡y ahora usted también está listo!</string>
+  <string name="wizard_exit_at_first_screen_toast">¡Por favor, configure Orbot antes para poder comenzar a usarlo!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Ha conectado con éxito a la red Tor - pero esto no significa que su dispositivo sea seguro. Puede usar el botón \'Navegador\' para probar su conexión. \n\nVisítenos en https://guardianproject.info/apps/orbot o envíe un correo electrónico a help at guardianproject.info para conocer más.</string>
+  <string name="tor_check">Esto abrirá https://check.torproject.org/?lang=es en su navegador predeterminado para comprobar que Orbot esté configurado y que esté conectado a Tor.</string>
+  <string name="pref_hs_group">Alojamiento de servicios ocultos (dentro de la red Tor)</string>
+  <string name="pref_general_group">General</string>
+  <string name="pref_start_boot_title">Iniciar Orbot en el arranque</string>
+  <string name="pref_start_boot_summary">Inicia Orbot y conecta a Tor automáticamente cuando arranca su dispositivo Android</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">¡Orbot trae Tor a Android!\n\nTor le ayuda a defenderse contra el filtrado de contenido, el análisis de tráfico y la vigilancia de la red, que amenazan la privacidad, la información confidencial y las relaciones personales.\n\nEste asistente le ayudará a configurar Orbot y Tor en su dispositivo.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Advertencia</string>
+  <string name="wizard_warning_msg">Simplemente instalando Orbot no anonimizará automáticamente su tráfico móvil/celular.\n\nPara usar Tor con éxito tiene que configurar adecuadamente Orbot, su dispositivo, y otras aplicaciones.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permisos</string>
+  <string name="wizard_permissions_root_msg1">Opcionalmente puede conceder permisos de \'Superusuario\' a Orbot para habilitar las características avanzadas, como la proxyficación transparente.</string>
+  <string name="wizard_permissions_root_msg2">Si no desea hacer esto, asegúrese de utilizar aplicaciones específicamente preparadas para trabajar con Orbot (o configurables para ello)</string>
+  <string name="wizard_permissions_no_root_msg">Su dispositivo no parece estar rooteado o proporcionar root o acceso de \"Superusuario\".\n\nEn su lugar, por favor, pruebe con el modo \'Aplicaciones\' en la pantalla principal.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox: Navegador con privacidad mejorada que funciona a través de Tor</string>
+  <string name="wizard_tips_play">Descubre todas las aplicaciones de Guardian Project en Google Play</string>
+  <string name="wizard_tips_fdroid">Encontrará todas las aplicaciones del Guardian Project en F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Encontrará todas las aplicaciones del Guardian Project en https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxyficación transparente</string>
+  <string name="wizard_transproxy_msg">Permite que sus aplicaciones se ejecuten automáticamente a través de la red Tor sin realizar configuración alguna.</string>
+  <string name="wizard_transproxy_hint">(Marque esta casilla si no tiene idea de qué estamos hablando)</string>
+  <string name="wizard_transproxy_none">Ninguno</string>
+  <string name="pref_transparent_tethering_title">Tor tethering</string>
+  <string name="pref_transparent_tethering_summary">Habilita la proxyficación transparente de Tor para dispositivos tethered (dispositivos móviles \"amarrados\", pasarela a Internet para otros dispositivos conectados a ellos mediante Wifi, USB o Bluetooth) -- (requiere reinicio)</string>
+  <string name="button_grant_superuser">Solicitar permisos de superusuario</string>
+  <string name="pref_select_apps">Seleccionar aplicaciones</string>
+  <string name="pref_select_apps_summary">Escoja las aplicaciones a redirigir través de Tor</string>
+  <string name="pref_node_configuration">Configuración de nodos</string>
+  <string name="pref_node_configuration_summary">¡Estas son configuraciones avanzadas que pueden reducir su anonimato! Afectan a los circuitos (túneles) que se establezcan para su propio tráfico a través de Tor; si repite tráfico ajeno estas configuraciones no afectan a esos circuitos.</string>
+  <string name="pref_entrance_node">Nodos de entrada</string>
+  <string name="pref_entrance_node_summary">Reglas de identificación de repetidores de entrada a la red Tor, mediante huellas de validación de claves (fingerprints), alias (nicks), códigos de país y 
+direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de nodos, y las configuraciones de bridges.</string>
+  <string name="pref_entrance_node_dialog">Introduzca nodos de entrada</string>
+  <string name="pref_allow_background_starts_title">Permitir inicios en segundo plano</string>
+  <string name="pref_allow_background_starts_summary">Deja que cualquier aplicación le diga a Orbot que inicie Tor y servicios relacionados</string>
+  <string name="button_proxy_all">Proxyficar todo</string>
+  <string name="button_proxy_none">No proxyficar nada</string>
+  <string name="button_invert_selection">Invertir selección</string>
+  <string name="pref_proxy_title">Proxy de salida a la red (opcional)</string>
+  <string name="pref_proxy_type_title">Tipo de proxy saliente</string>
+  <string name="pref_proxy_type_summary">Protocolo a usar para el servidor proxy saliente: HTTP, HTTPS, Socks4, Socks5.</string>
+  <string name="pref_proxy_type_dialog">Introduzca tipo de proxy</string>
+  <string name="pref_proxy_host_title">Servidor proxy saliente</string>
+  <string name="pref_proxy_host_summary">Nombre del servidor proxy </string>
+  <string name="pref_proxy_host_dialog">Introduzca el servidor proxy</string>
+  <string name="pref_proxy_port_title">Puerto del proxy saliente </string>
+  <string name="pref_proxy_port_summary">Puerto del servidor proxy</string>
+  <string name="pref_proxy_port_dialog">Introduzca el puerto del proxy</string>
+  <string name="pref_proxy_username_title">Nombre de usuario en el proxy de salida</string>
+  <string name="pref_proxy_username_summary">Nombre de usuario en el proxy (opcional)</string>
+  <string name="pref_proxy_username_dialog">Introduzca nombre de usuario en el proxy</string>
+  <string name="pref_proxy_password_title">Contraseña en el proxy de salida</string>
+  <string name="pref_proxy_password_summary">Contraseña en el proxy (opcional)</string>
+  <string name="pref_proxy_password_dialog">Introduzca contraseña en el proxy</string>
+  <string name="status">Estado</string>
+  <string name="setting_up_full_transparent_proxying_">Estableciendo proxyficación transparente completa... </string>
+  <string name="setting_up_app_based_transparent_proxying_">Estableciendo proxyficación transparente por aplicaciones... </string>
+  <string name="transparent_proxying_enabled">Proxyficación transparente ACTIVADA</string>
+  <string name="transproxy_enabled_for_tethering_">¡TransProxy (proxyficación transparente) habilitado para tethering (pasarela)!</string>
+  <string name="warning_error_starting_transparent_proxying_">ADVERTENCIA: ¡Error al iniciar la proxyficación transparente!</string>
+  <string name="transproxy_rules_cleared">Reglas de TransProxy (proxyficación transparente) borradas</string>
+  <string name="couldn_t_start_tor_process_">No se pudo iniciar el proceso de Tor: </string>
+  <string name="privoxy_is_running_on_port_">Polipo se está ejecutando en el puerto:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Estableciendo proxyficación transparente por puertos... </string>
+  <string name="bridge_error">Error de bridge (repetidor puente)</string>
+  <string name="bridge_requires_ip">Para utilizar la función bridge (repetidor puente, acceso a Tor de publicitación restringida), debe introducir al menos una dirección IP de bridge.</string>
+  <string name="send_email_for_bridges">Envíe un correo a bridges at torproject.org incluyendo en el cuerpo del mensaje una línea sólo con \"get bridges\", desde una cuenta con dominio gmail.com, yahoo.com o yahoo.cn (que soportan DKIM)</string>
+  <string name="error">Error</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">¡Sus \'Reglas de direcciones accesibles\' han producido una excepción!</string>
+  <string name="your_relay_settings_caused_an_exception_">¡La configuración de su repetidor ha producido una excepción!</string>
+  <string name="exit_nodes">Nodos de salida</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Reglas de identificación de repetidores de salida de la red Tor, mediante huellas de validación de claves (fingerprints), alias (nicks), códigos de país y direcciones (o rangos)</string>
+  <string name="enter_exit_nodes">Introduzca repetidores de salida</string>
+  <string name="exclude_nodes">Excluír nodos</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Reglas de identificación de repetidores a evitar en la red Tor, mediante huellas de validación de claves (fingerprints), alias (nicks), códigos de país y direcciones (o rangos)</string>
+  <string name="enter_exclude_nodes">Introduzca repetidores a evitar</string>
+  <string name="strict_nodes">Hacer estricta la exclusión de nodos (incluso si falla la comunicación)</string>
+  <string name="use_only_these_specified_nodes">Usar *sólo* estos nodos especificados</string>
+  <string name="bridges">Bridges (repetidores puente) </string>
+  <string name="use_bridges">Usar bridges</string>
+  <string name="bridges_obfuscated">Bridges ofuscados (contra análisis DPI del tráfico) </string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilita nodos alternativos de entrada a la red Tor, de publicitación restringida. Prevalece sobre \'Nodos de entrada\'</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilítelo si los bridges (repetidores puente) de su lista de configuración están ofuscados (encapsulando el tráfico SSL para evitar ser detectados) </string>
+  <string name="ip_address_and_port_of_bridges">Direcciones IP y puertos de los bridges</string>
+  <string name="enter_bridge_addresses">Introduzca direcciones de bridge</string>
+  <string name="relays">Repetidores</string>
+  <string name="relaying">Repetición de tráfico</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Habilitar que su dispositivo no sea repetidor de salida (de la red Tor) </string>
+  <string name="relay_port">Puerto de repetidor</string>
+  <string name="listening_port_for_your_tor_relay">Puerto de escucha para su repetidor Tor</string>
+  <string name="enter_or_port">Introduzca puerto OR (Onion Routing, repositorio de repetidores)</string>
+  <string name="relay_nickname">Alias del repetidor</string>
+  <string name="the_nickname_for_your_tor_relay">El apodo que identificará a su repetidor en la red Tor</string>
+  <string name="enter_a_custom_relay_nickname">Introduzca un alias personalizado para su repetidor</string>
+  <string name="reachable_addresses">Reglas de direcciones accesibles ([accept(*)|reject] IP:port, etc.)</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Ejecutar Tor como sólo cliente detrás de un cortafuegos (firewall) con políticas restrictivas</string>
+  <string name="reachable_ports">Puertos accesibles</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Puertos accesibles detrás de un firewall restrictivo (80 y 443 por defecto)</string>
+  <string name="enter_ports">Introduzca puertos</string>
+  <string name="enable_hidden_services">Activar alojamiento de servicios ocultos (en la red Tor)</string>
+  <string name="run_servers_accessible_via_the_tor_network">Permite el acceso a servidores ocultos por dispositivo (IP oculta al usuario) accesibles a través de la red Tor (dominio .onion, sin DNS)</string>
+  <string name="enter_localhost_ports_for_hidden_services">Introduzca los puertos locales de sus servicios ocultos</string>
+  <string name="hidden_service_ports">Puertos de los servicios ocultos</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">El nombre direccionable (sin DNS, .onion generado automáticamente) para su servicio oculto</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Habilitar el registro de depuración (debug log) a la salida (debe utilizar adb o aLogCat para verlo)</string>
+  <string name="project_home">Página(s) principal(es) del proyecto:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Licencia de Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Software de terceras partes</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Una aplicación está intentando abrir el puerto %S de servicio oculto hacia la red Tor. Esto es seguro si su aplicación es de su confianza.</string>
+  <string name="found_existing_tor_process">Se encontró un proceso de Tor ya existente...</string>
+  <string name="something_bad_happened">Hubo algún tipo de problema. Compruebe el registro (log)</string>
+  <string name="hidden_service_on">Servicio oculto en:</string>
+  <string name="unable_to_read_hidden_service_name">No fue posible leer el nombre del servicio oculto</string>
+  <string name="unable_to_start_tor">No fue posible iniciar Tor: </string>
+  <string name="unable_to_reset_tor">¡Reinicie su dispositivo, no se pudo reiniciar Tor!</string>
+  <string name="pref_use_sys_iptables_title">Usar el Iptables por defecto</string>
+  <string name="pref_use_sys_iptables_summary">Usa el binario de Iptables del sistema en lugar del incluído en el paquete de Orbot</string>
+  <string name="error_installing_binares">No fue posible instalar o actualizar los binarios de Tor.</string>
+  <string name="pref_use_persistent_notifications">Mantener siempre el icono de Orbot en la barra de tareas cuando esté conectado</string>
+  <string name="pref_use_persistent_notifications_title">Notificaciones siempre activadas</string>
+  <string name="pref_use_expanded_notifications">Mostrar notificación expandida con el país de salida de Tor y la IP</string>
+  <string name="pref_use_expanded_notifications_title">Notificaciones expandidas</string>
+  <string name="notification_using_bridges">¡Bridges habilitados! </string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Idioma</string>
+  <string name="set_locale_summary">Elija la configuración regional y el idioma para Orbot</string>
+  <string name="wizard_locale_title">Escoja idioma</string>
+  <string name="wizard_locale_msg">Deje el predeterminado o cambie de idioma</string>
+  <string name="powered_by">impulsado por Tor</string>
+  <string name="btn_save_settings">Guardar configuración</string>
+  <string name="no_internet_connection_tor">Sin conexión a Internet; Tor está en suspensión...</string>
+  <string name="bandwidth_">Ancho de banda:</string>
+  <string name="down">bajada</string>
+  <string name="up">subida</string>
+  <string name="pref_disable_network_title">Sin suspensión-automática de la red</string>
+  <string name="pref_disable_network_summary">Ponga Tor en suspensión cuando no haya Internet disponible</string>
+  <string name="newnym">¡Ha cambiado a una nueva identidad de Tor!</string>
+  <string name="menu_verify_browser">Navegador</string>
+  <string name="menu_use_chatsecure">Usar ChatSecure</string>
+  <string name="permission_manage_tor_label">Administrar Tor</string>
+  <string name="permission_manage_tor_description">Habilita esta aplicación para controlar el servicio Tor</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">No parece que tenga Orfox instalado. ¿Quiere ayuda con eso, o simplemente debemos abrir el navegador?</string>
+  <string name="install_apps_">¿Instalar aplicaciones?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">No hay conectividad de red. Poniendo a Tor a dormir...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">La conectividad de red es buena. Despertando a Tor...</string>
+  <string name="updating_settings_in_tor_service">actualizando la configuración en el servicio Tor</string>
+  <string name="pref_socks_title">SOCKS de Tor</string>
+  <string name="pref_socks_summary">Puerto sobre el que Tor ofrece su proxy SOCKS (por defecto: 9050 o 0 para deshabilitarlo)</string>
+  <string name="pref_socks_dialog">Configuración del puerto SOCKS</string>
+  <string name="pref_transport_title">Puerto de TransProxy de Tor</string>
+  <string name="pref_transport_summary">Puerto sobre el que Tor ofrece su Proxy Transparente (por defecto: 9040 o 0 para deshabilitarlo)</string>
+  <string name="pref_transport_dialog">Configuración del puerto de TransProxy</string>
+  <string name="pref_dnsport_title">Puerto DNS de Tor</string>
+  <string name="pref_dnsport_summary">Puerto sobre el que Tor ofrece su DNS (por defecto: 5400 o 0 para deshabilitarlo)</string>
+  <string name="pref_dnsport_dialog">Configuración del puerto DNS</string>
+  <string name="pref_torrc_title">Configuración personalizada de torrc</string>
+  <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="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>
+  <string name="pref_transproxy_refresh_title">Auto-refresco de transproxy</string>
+  <string name="pref_transproxy_refresh_summary">Reaplica las reglas de transproxy cuando el estado de la red cambia</string>
+  <string name="pref_transproxy_flush_title">Transproxy FORZAR ELIMINACIÓN</string>
+  <string name="pref_transproxy_flush_summary">Pulse aquí para desechar AHORA todas las reglas de red de transproxy </string>
+  <string name="transparent_proxy_rules_flushed_">¡Reglas de proxy transparente desechadas!</string>
+  <string name="you_do_not_have_root_access_enabled">No tiene habilitado el acceso como ROOT</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Puede que tenga que detener e iniciar Orbot para que el cambio de configuración se habilite.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Bridges actualizados</string>
+  <string name="restart_orbot_to_use_this_bridge_">Por favor, reinicie Orbot para habilitar los cambios</string>
+  <string name="menu_qr">Códigos QR</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Si su red móvil/celular bloquea activamente Tor, puede usar un Puente (bridge) para acceder a la red. SELECCIONE uno de los tipos de repetidor puente arriba para hablitar los puentes.</string>
+  <string name="bridge_mode">Modo bridge</string>
+  <string name="get_bridges_email">Correo electrónico</string>
+  <string name="get_bridges_web">Página web</string>
+  <string name="activate">Activar</string>
+  <string name="apps_mode">Aplicaciones en modo VPN</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Puede habilitar que todas las aplicaciones de su dispositivo transiten a través de la red Tor usando la función VPN de Android.\n\n*ADVERTENCIA* Esta es una característica experimental nueva, y en algunos casos puede que no se inicie automáticamente, o puede que se detenga. NO debe usarse para anonimato, SÓLO para atravesar cortafuegos (firewalls) y filtros.</string>
+  <string name="send_email">Enviar correo</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Puede obtener una dirección de bridge (repetidor puente) a través de correo electrónico, la web, o escaneando un código QR de bridge. Seleccione \'Correo\' o \'Web\' debajo para solicitar una dirección de bridge.\n\nUna vez tenga una dirección, copie y péguela en la opción \"Bridges\" de la configuración de Orbot, y reinicie.</string>
+  <string name="install_orweb">Instalar Orfox</string>
+  <string name="standard_browser">Navegador estándar</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTA: Sólo los repetidores puente (bridges) estándar de Tor funcionan en dispositivos Intel X86/ATOM</string>
+  <string name="vpn_default_world">Mundo</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-et/strings.xml b/orbotservice/src/main/res/values-et/strings.xml
new file mode 100644
index 0000000..9ef3be4
--- /dev/null
+++ b/orbotservice/src/main/res/values-et/strings.xml
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.orghttp://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">käivita ja peata Tor</string>
+  <string name="tor_proxy_service_process">torproxyteenus</string>
+  <string name="status_starting_up">Orbot käivitub...</string>
+  <string name="status_activated">Ühendatud Tor võrgustikku</string>
+  <string name="status_disabled">Orbot deaktiveeritud</string>
+  <string name="tor_process_starting">Tor kliendi käivitamine...</string>
+  <string name="tor_process_complete">valmis.</string>
+  <string name="tor_process_waiting">ootel.</string>
+  <string name="not_anonymous_yet">HOIATUS: Teie liiklus pole veel anonüümne! Palun seadistage oma rakendused nii et need kasutaksid HTTP proxy\'t 127.0.0.1:8118 või SOCKS4A või SOCKS5 proxy\'t 127.0.0.1:9050</string>
+  <string name="menu_home">Kodu</string>
+  <string name="menu_browse">Sirvi</string>
+  <string name="menu_settings">Seaded</string>
+  <string name="menu_log">Logi</string>
+  <string name="menu_info">Abi</string>
+  <string name="menu_start">Start</string>
+  <string name="menu_stop">Stopp</string>
+  <string name="menu_about">Lähemalt</string>
+  <string name="main_layout_download">Lae alla</string>
+  <string name="main_layout_upload">Lae üles</string>
+  <string name="button_help">Abi</string>
+  <string name="button_close">Sulge</string>
+  <string name="button_about">Lähemalt</string>
+  <string name="button_clear_log">Nulli logi</string>
+  <string name="menu_verify">Kontrolli</string>
+  <string name="menu_exit">Välja</string>
+  <string name="press_to_start">- pikk vajutus alustamiseks -</string>
+  <string name="pref_trans_proxy_group">Läbipaistev proxy (Nõuab Root õigusi)</string>
+  <string name="pref_trans_proxy_title">Läbipaistev proxy</string>
+  <string name="pref_trans_proxy_summary">Rakenduste automaatne Torifitseerimine</string>
+  <string name="pref_transparent_all_title">Kõik läbi Tor\'i</string>
+  <string name="pref_transparent_all_summary">Proxy kõikide reakenduste liiklus läbi Tor\'i</string>
+  <string name="pref_transparent_port_fallback_title">Pordiproxy reserv</string>
+  <string name="pref_transparent_port_fallback_summary">HOIATUS: Väldib tavaporte (80, 443, jne). *KASUTAGE AINULT SIIS* kui \'Kõik\' või \'Rakendused\' režiim ei tööta.</string>
+  <string name="pref_transparent_port_title">Portide loend</string>
+  <string name="pref_transparent_port_summary">Proxy portide loend. *KASUTAGE SINULT SIIS* kui \'Kõik\' või \'Rakendused\' režiim ei tööta</string>
+  <string name="pref_transparent_port_dialog">Sisestage pordid mida proxy\'da</string>
+  <string name="pref_has_root">Nõua root juurdepääsu</string>
+  <string name="pref_has_root_summary">Nõua läbipaistva proxy jaoks root juurdepääsu</string>
+  <string name="status_install_success">Tor binaarid edukalt paigaldatud!</string>
+  <string name="status_install_fail">Tor binaarfailide paigaldamine ebaõnnestus. Palun kontrollige logi ja teavitage tor-assistants at torproject.org</string>
+  <string name="title_error">Rakenduse Viga</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Lähemalt Orbot\'ist</string>
+  <string name="btn_next">Edasi</string>
+  <string name="btn_back">Tagasi</string>
+  <string name="btn_finish">Lõpeta</string>
+  <string name="btn_okay">Hea küll</string>
+  <string name="btn_cancel">Katkesta</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Mõned Orbot\'i detailid</string>
+  <string name="wizard_permissions_root">Luba Antud</string>
+  <string name="wizard_permissions_stock">Orbot õigused</string>
+  <string name="wizard_premissions_msg_root">Vinge! Leidsime et teie seadmes on Orbot\'ile lubatud root õigused. Lubame kasutada seda väge arukalt.</string>
+  <string name="wizard_permissions_msg_stock">Kuigi see pole vajalik, saab root juurdepääsuga seadmel kasutada Orbot\'i palju võimsama vahendina. Kasutage allpool olevat nuppu et lubada Orbot\'ile supervõimed!</string>
+  <string name="wizard_permissions_no_root">Kui teil pole root juurdepääsu või te ei tea millest jutt käib, siis kindlustage et kasutate ainult rakendusi mis on seadistatud Orbot\'iga koos töötama.</string>
+  <string name="wizard_permissions_consent">Saan aru ja jätkan ilma Superkasutajata</string>
+  <string name="wizard_permission_enable_root">Luba Orbotile Root õigused</string>
+  <string name="wizard_configure">Seadista Torifitseerimine</string>
+  <string name="wizard_configure_msg">Orbot võimaldab juhtida kõigi rakenduste liikluse läbi Tor\'i VÕI valida need rakendused individuaalselt.</string>
+  <string name="wizard_configure_all">Proxy kõik rakendused läbi Tor\'i</string>
+  <string name="wizard_configure_select_apps">Valige Tor\'i jaoks individuaalsed rakendused</string>
+  <string name="wizard_tips_tricks">Orbot-lubatud rakendused</string>
+  <string name="wizard_tips_msg">Alltoodud rakendused arendati Orbot\'iga koos töötama. Koheseks paigaldamiseks vajutage igat allolevat nuppu või paigaldage need hiljem Google Play portaalist, GuardianProject.info veebilehelt või F-Droid.org kaudu.</string>
+  <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="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>
+  <string name="wizard_final">Orbot on valmis!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">See avab teie veebisivikus lehe https://check.torproject.org mille kaudu saate näha kas Orbot on ehk seadistatud ja olete ühenduses Tor\'iga.</string>
+  <string name="pref_hs_group">Peidetud Teenuste Majutus</string>
+  <string name="pref_general_group">Üldist</string>
+  <string name="pref_start_boot_title">Käivita Orbot seadme käivitumisel</string>
+  <string name="pref_start_boot_summary">Automaatne Orbot käivitumine ja Tor külge ühendumine seadme käivitumisel</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Hoiatus</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Load</string>
+  <string name="wizard_permissions_root_msg1">Võite Orbot\'ile lubada \'Superkasutaja\' juurdepääsu selleks et võimaldada rohkem võimalusi, nagu näiteks Läbipaistev Proxy.</string>
+  <string name="wizard_permissions_root_msg2">Kui te ei soovi seda teha, siis palun kindlustage et kasutate ainult rakendusi mis on seadistatud töötama koos Orbot\'iga</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Kõik Guardian Project rakendused on leitavad ka Google Play kaudu</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Läbipaistev Proxy</string>
+  <string name="wizard_transproxy_msg">Saate kõik rakendused suunata iseeneslikult Tor kaudu, lisaseadistusteta.</string>
+  <string name="wizard_transproxy_hint">(Klikkige sellele kastile kui teil pole õrna aimugi millest jutt käib)</string>
+  <string name="wizard_transproxy_none">Puudub</string>
+  <string name="pref_transparent_tethering_title">Tor lõastamine</string>
+  <string name="pref_transparent_tethering_summary">Luba Tor Läbipaistev Proxy WiFi ja USB lõastatud seadmetele (vajab uuestilaadimist)</string>
+  <string name="button_grant_superuser">Nõua Superkasutaja Juurdepääsu</string>
+  <string name="pref_select_apps">Vali Rakendused</string>
+  <string name="pref_select_apps_summary">Vali läbi Tor suunatavad rakendused</string>
+  <string name="pref_node_configuration">Sõlme seadistamine</string>
+  <string name="pref_node_configuration_summary">Need on seadistused edasijõudnutele ja võivad vähendada teie anonüümsust</string>
+  <string name="pref_entrance_node">Sisendsõlmed</string>
+  <string name="pref_entrance_node_summary">Sõrmejäljed, hüüdnimed, riigid ja aadressid esimese hüppe jaoks</string>
+  <string name="pref_entrance_node_dialog">Sisestage sisendsõlmed</string>
+  <string name="pref_proxy_title">Väljuva võrgu proxy (Valikuline)</string>
+  <string name="pref_proxy_type_title">Väljuva proxy tüüp</string>
+  <string name="pref_proxy_type_summary">Proxy serveri kasutamise protokoll: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Sisestage proxy tüüp</string>
+  <string name="pref_proxy_host_title">Väljuva proxy seade</string>
+  <string name="pref_proxy_host_summary">Proxyserveri seadmenimi</string>
+  <string name="pref_proxy_host_dialog">Sisestage proxy seade</string>
+  <string name="pref_proxy_port_title">Väljuva proxy port</string>
+  <string name="pref_proxy_port_summary">Proxyserveri port</string>
+  <string name="pref_proxy_port_dialog">Sisestage proxy port</string>
+  <string name="pref_proxy_username_title">Väljuva proxy kasutajanimi</string>
+  <string name="pref_proxy_username_summary">Proxy kasutajanimi (Valikuline)</string>
+  <string name="pref_proxy_username_dialog">Sisestage proxy kasutajanimi</string>
+  <string name="pref_proxy_password_title">Väljuva proxy salasõna</string>
+  <string name="pref_proxy_password_summary">Proxy salasõna (Valikuline)</string>
+  <string name="pref_proxy_password_dialog">Sisestage proxy salasõna</string>
+  <string name="status">Olek</string>
+  <string name="setting_up_full_transparent_proxying_">Täisläbipaistva proxy seadistamine...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Rakenduspõhise läbipaistva proxy seadistamine...</string>
+  <string name="transparent_proxying_enabled">Läbipaistev proxy LUBATUD</string>
+  <string name="transproxy_enabled_for_tethering_">LäbivProxy lõastamine lubatud!</string>
+  <string name="warning_error_starting_transparent_proxying_">Hoiatus: viga läbipaistva proxy käivitamisel!</string>
+  <string name="transproxy_rules_cleared">LäbivProxy seaded nullitud</string>
+  <string name="couldn_t_start_tor_process_">Tor protsessi käivitamine ebaõnnestus:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Pordipõhise läbipaistva proxy seadistamine...</string>
+  <string name="bridge_error">Silla viga</string>
+  <string name="bridge_requires_ip">Silla võimaluse kasutamiseks peate sisestama vähemalt ühe silla IP aadressi.</string>
+  <string name="send_email_for_bridges">Saatke e-kiri oma gmail kontolt aadressile bridges at torproject.org mis sisaldab ainult ühte rida \"get bridges\".</string>
+  <string name="error">Viga</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Teie ReachableAddresses seadistus põhjustas ekse!</string>
+  <string name="your_relay_settings_caused_an_exception_">Teie releeseadistus põhjustas ekse!</string>
+  <string name="exit_nodes">Väljundsõlmed</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Sõrmejäljed, hüüdnimed, riigid ja aadressid viimase hüppe jaoks</string>
+  <string name="enter_exit_nodes">Sisestage väljundsõlmed</string>
+  <string name="exclude_nodes">Välistatud sõlmed</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Sõrmejäljed, hüüdnimed, riigid ja aadressid mida välistada</string>
+  <string name="enter_exclude_nodes">Sisestage välistatavad sõlmed</string>
+  <string name="strict_nodes">Kindlad sõlmed</string>
+  <string name="use_only_these_specified_nodes">Kasuta *ainult* neid märgitud sõlmi</string>
+  <string name="bridges">Sillad</string>
+  <string name="use_bridges">Kasuta sildu</string>
+  <string name="bridges_obfuscated">Varjatud sillad</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Luba Tor võrgustiku alternatiivseid sisendsõlmi</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Luba siis kui seadistatud sillad on varjatud sillad</string>
+  <string name="ip_address_and_port_of_bridges">Sildade IP aadressid ja pordinumbrid</string>
+  <string name="enter_bridge_addresses">Sisestage silla aadressid</string>
+  <string name="relays">Edastajad</string>
+  <string name="relaying">Edastamine</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Luba oma seadmel hakata mitte-väljund edastajaks</string>
+  <string name="relay_port">Edastusport</string>
+  <string name="listening_port_for_your_tor_relay">Port mida teie Tor edastaja kuulab</string>
+  <string name="enter_or_port">Kas Enter VÕI port</string>
+  <string name="relay_nickname">Edastaja hüüdnimi</string>
+  <string name="the_nickname_for_your_tor_relay">Teie Tor edastaja hüüdnimi</string>
+  <string name="enter_a_custom_relay_nickname">Sisestage edastaja kohandatud hüüdnimi</string>
+  <string name="reachable_addresses">Juurdepääsetavad aadressid</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Käivita kui piirava poliitikaga tulemüüri taga asuvat klienti.</string>
+  <string name="reachable_ports">Juurdepääsetavad pordid</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Piirava poliitikaga tulemüüris avatud pordid</string>
+  <string name="enter_ports">Sisestage pordid</string>
+  <string name="enable_hidden_services">Varjatud teenuste majutamine</string>
+  <string name="run_servers_accessible_via_the_tor_network">luba üle Tor võrgustiku juurdepääs seadmes töötavale serverile</string>
+  <string name="enter_localhost_ports_for_hidden_services">sisestage varjatud teenuste localhost pordid</string>
+  <string name="hidden_service_ports">Varjatud teenuste pordid</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">teie varjatud teenuste adresseeritav nimi (luuakse automaatselt)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">lubage väljastatav silumislogi (vaatamiseks peab kasutama kas adb või aLogCat utiliite) </string>
+  <string name="project_home">Projekti kodu(d):</string>
+  <string name="the_tor_license">Tor litsents</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Kolmanda osapoole tarkvara:</string>
+  <string name="hidden_service_request">Üks rakendus soovib avada varjatud teenuse porti %S Tor võrgustikule. See on turvaline kui te usaldate seda rakendust.</string>
+  <string name="found_existing_tor_process">leidus töötav Tor protsess...</string>
+  <string name="something_bad_happened">Juhtus midagi halba. Kontrollige logi</string>
+  <string name="hidden_service_on">varjatud teenused:</string>
+  <string name="unable_to_read_hidden_service_name">ei õnnestu lugeda varjatud teenuse nime</string>
+  <string name="unable_to_start_tor">Tor käivitamine ebaõnnestus:</string>
+  <string name="pref_use_sys_iptables_title">Kasuta iptables vaikeseadeid</string>
+  <string name="pref_use_sys_iptables_summary">kasuta Orbot\'iga kaasneva iptables binaari asemel süsteemset binaari</string>
+  <string name="error_installing_binares">Tor binaaride paigaldamine või uuendamine ebaõnnestus.</string>
+  <string name="pref_use_persistent_notifications">Ühendatud Orbot korral näidata katkematult ikoonide tööriistariba</string>
+  <string name="pref_use_persistent_notifications_title">Pidevalt kuvatavad teated</string>
+  <string name="notification_using_bridges">Sillad lubatud!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Valige Orbot lokaat ja keel</string>
+  <string name="wizard_locale_title">Valige keel</string>
+  <string name="wizard_locale_msg">Jätkake vaikeväärtusega või vahetage kehtiv keel</string>
+  <string name="btn_save_settings">Salvesta seaded</string>
+  <string name="bandwidth_">Ribalaius:</string>
+  <string name="down">alla</string>
+  <string name="up">üles</string>
+  <string name="pref_disable_network_title">Pole võrgu auto-und</string>
+  <string name="pref_disable_network_summary">Pane Tor magama kui Internetiühendus puudub</string>
+  <string name="newnym">Lülitusite uuele Tor identiteedile!</string>
+  <string name="menu_use_chatsecure">Kasutage ChatSecure\'t</string>
+  <string name="permission_manage_tor_label">Hallake Tor\'i</string>
+  <string name="permission_manage_tor_description">Lubage sellel rakendusel hallata Tor teenust</string>
+  <string name="install_apps_">Paigaldada rakendusi?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Interneti ühendus puudub. Panen Tori magama...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Interneti ühendus hea. Äratan Tori üles...</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-eu/strings.xml b/orbotservice/src/main/res/values-eu/strings.xml
new file mode 100644
index 0000000..198c612
--- /dev/null
+++ b/orbotservice/src/main/res/values-eu/strings.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">Tor abiarazi eta gelditu</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot abiarazten ari da...</string>
+  <string name="status_activated">Tor sarera konektatuta</string>
+  <string name="status_disabled">\"Orbot desaktibatuta dago</string>
+  <string name="tor_process_starting">Tor bezeroa hasten...</string>
+  <string name="tor_process_complete">eginda.</string>
+  <string name="tor_process_waiting">itxaroten.</string>
+  <string name="not_anonymous_yet">ABISUA: Zure trafikoa ez da anonimoa oraindik! Mesedez konfigura itzazu zure aplikazioak 127.0.0.1:8118 HTTP proxya edo 127.0.0.1:9050 SOCKS4 edo SOCKS5 proxyak erabiltzeko</string>
+  <string name="menu_home">Etxea</string>
+  <string name="menu_browse">Arakatu</string>
+  <string name="menu_settings">Ezarpenak</string>
+  <string name="menu_log">Saioa hasi</string>
+  <string name="menu_info">Laguntza</string>
+  <string name="menu_start">Abiarazi</string>
+  <string name="menu_stop">Gelditu</string>
+  <string name="menu_about">Honi buruz</string>
+  <string name="main_layout_download">Deskargatu</string>
+  <string name="main_layout_upload">Igo</string>
+  <string name="button_help">Laguntza</string>
+  <string name="button_close">Itxi</string>
+  <string name="button_about">Honi buruz</string>
+  <string name="button_clear_log">Zerrenda Garbitu</string>
+  <string name="menu_verify">Egiaztatu</string>
+  <string name="menu_exit">Irten</string>
+  <string name="press_to_start">- sakatu luze hasteko -</string>
+  <string name="pref_trans_proxy_group">Proxyatze Gardena (Root behar du)</string>
+  <string name="pref_trans_proxy_title">Proxyatze Gardena</string>
+  <string name="pref_trans_proxy_summary">Aplikazioen Torifikatze Automatikoa</string>
+  <string name="pref_transparent_all_title">Tor-tu Dena</string>
+  <string name="pref_transparent_all_summary">Aplikazio guztien trafikoa Tor bidez proxyatu</string>
+  <string name="pref_transparent_port_fallback_title">Azken aukerako proxy portuak</string>
+  <string name="pref_transparent_port_fallback_summary">KONTUZ: Ohizko portuak sahiezten ditu (80, 443, etab.) *ERABILI BAKARRIK* \'Guztiak\' edo \'Aplikazio\' modua ez badabil.</string>
+  <string name="pref_transparent_port_title">Portu Zerrenda</string>
+  <string name="pref_transparent_port_summary">Proxyak baimenduko dituen portuak. *ERABILI BAKARRIK* \'Guztiak\' edo \'Aplikazio\' modua ez badabil</string>
+  <string name="pref_transparent_port_dialog">Sartu proxyatzeko portuak</string>
+  <string name="pref_has_root">Root sarrera eskatu</string>
+  <string name="pref_has_root_summary">Root sarrera eskatu proxyatze gardenarentzat</string>
+  <string name="status_install_success">Tor bitarrak zuzen instalatuta!</string>
+  <string name="status_install_fail">Tor fitxategi bitarrak ezin izan dira instalatu. Mesedez ikusi erregistroa eta jakinarazi tor-assistants at torproject.org</string>
+  <string name="title_error">Aplikazio Akatsa</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Orboti buruz</string>
+  <string name="btn_next">Hurrengoa</string>
+  <string name="btn_back">Atzera</string>
+  <string name="btn_finish">Amaitu</string>
+  <string name="btn_okay">Ados</string>
+  <string name="btn_cancel">Utzi</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Orbot xehetasun batzuk</string>
+  <string name="wizard_permissions_root">Baimena Emanda</string>
+  <string name="wizard_permissions_stock">Orbot Baimenak</string>
+  <string name="wizard_premissions_msg_root">Bikain! Orbotentzako root baimenak gaituta dituzula detektatu dugu.</string>
+  <string name="wizard_permissions_msg_stock">Beharrezkoa ez den arren, Orbot tresna ahaltsuagoa bihurtu daiteke zure gailuak root atzipena badu. Erabili beheko botoia Orboteri superbotereak emateko!</string>
+  <string name="wizard_permissions_no_root">Root atzipenik ez baduzu edo zertaz ari garen ez badakizu, ziurtatu zire appak Orbotekin lan egiteko konfiguratzen dituzula.</string>
+  <string name="wizard_permissions_consent">Ulertzen dut eta supererabiltzaile gabe jarraitu nahiko nuke</string>
+  <string name="wizard_permission_enable_root">Root Orboti eman</string>
+  <string name="wizard_configure">Torifikazioa Konfiguratu</string>
+  <string name="wizard_configure_msg">Orbotek zure aplikazio guztien EDO banan-banan hautatutako aplikazioen trafiko guztia Tor bidez bideratzeko aukera ematen dizu.</string>
+  <string name="wizard_configure_all">Aplikazio guztiak Tor bidez proxyatu</string>
+  <string name="wizard_configure_select_apps">Hautatu Banakako Aplikazioak Torentzat</string>
+  <string name="wizard_tips_tricks">Orbot-gaitutako Aplikazioak</string>
+  <string name="wizard_tips_msg">Azpiko appak Orbotekin lan egiteko garatuta daude. Sakatu botoi bakoitza orain instalatzeko, edo bilatu geroago Google Play-n, GuardianProject.info webgunean edo F-Droid.org erabiliz.</string>
+  <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="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>
+  <string name="wizard_final">Orbot prest dago!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Honek https://check.torproject.org web nabigatzailean irekiko du Orbot konfiguratuta eta Tor-era konektatuta zauden antzemateko.</string>
+  <string name="pref_hs_group">Ezkutuko Zerbitzuak</string>
+  <string name="pref_general_group">Orokorra</string>
+  <string name="pref_start_boot_title">Hasi Orbot Abiarazterakoan</string>
+  <string name="pref_start_boot_summary">Automatikoki Orbot hasi eta Tor konektatu zure Android gailua abiarazterakoan</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Abisua</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Baimenak</string>
+  <string name="wizard_permissions_root_msg1">Aukera moduan Orbot-i \'Supererabiltzaile\' atzipena eman ahal diozu ezaugarri aurreratuak erabiltzeko, Proxy gardena adibidez.</string>
+  <string name="wizard_permissions_root_msg2">Ez baduzu hau egin nahi ziurtatu Orbot-ekin lan egiten duten aplikazioak erabiltzen dituzula.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Google Play-n Guardiak Proiektuko aplikazio guztiak bilatu</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxyatze Gardena</string>
+  <string name="wizard_transproxy_msg">Honek zure aplikazioak konfiguratu beharrik Tor saretik joatea ahalbidetzen du.</string>
+  <string name="wizard_transproxy_hint">(Gaituta utzi zertaz ari garez ulertzen ez baduzu)</string>
+  <string name="wizard_transproxy_none">Bat ere ez</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Gaitu proxy gardena Wifi eta USB bidez Tethering-atutako gailuentzat (berrabiaraztea beharrezkoa)</string>
+  <string name="button_grant_superuser">Supererabiltzaile sarrera eskatu</string>
+  <string name="pref_select_apps">Aplikazioak hautatu</string>
+  <string name="pref_select_apps_summary">Tor bidez bideratuko diren aplikazioak hautatu</string>
+  <string name="pref_node_configuration">Nodo Konfigurazioa</string>
+  <string name="pref_node_configuration_summary">Hauek zure anonimotasuna murriztu dezaketen ezarpen aurreratuak dira</string>
+  <string name="pref_entrance_node">Sarrera Nodoak</string>
+  <string name="pref_entrance_node_summary">Lehen jauzirako hatzmarka, ezizen, herrialde eta helbideak</string>
+  <string name="pref_entrance_node_dialog">Sartu Sarrera Nodoak</string>
+  <string name="pref_proxy_title">Irteera sareko proxya (Aukerazkoa)</string>
+  <string name="pref_proxy_type_title">Proxy mota</string>
+  <string name="pref_proxy_type_summary">Proxy zerbitzariarentzako erabiltzeko protokoloak: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Sartu Proxy Mota</string>
+  <string name="pref_proxy_host_title">Proxy Ostalaria</string>
+  <string name="pref_proxy_host_summary">Proxy zerbitzariaren helbidea</string>
+  <string name="pref_proxy_host_dialog">Sartu Proxy Ostalaria</string>
+  <string name="pref_proxy_port_title">Proxy Portua</string>
+  <string name="pref_proxy_port_summary">Proxy zerbitzariaren portua</string>
+  <string name="pref_proxy_port_dialog">Sartu Proxy portua</string>
+  <string name="pref_proxy_username_title">Irteerako proxyaren erabiltzaile izena</string>
+  <string name="pref_proxy_username_summary">Proxy erabiltzaile izena (Aukerazkoa)</string>
+  <string name="pref_proxy_username_dialog">Sartu proxy erabiltzailea</string>
+  <string name="pref_proxy_password_title">Irteerako proxyaren pasahitza</string>
+  <string name="pref_proxy_password_summary">Proxy pasahitza (Aukerazkoa)</string>
+  <string name="pref_proxy_password_dialog">Sartu proxy pasahitza</string>
+  <string name="status">Egoera</string>
+  <string name="setting_up_full_transparent_proxying_">Guztientzako proxy gardena martxan ezartzen...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Aplikazioetan oinarritutako proxy transparentea ezartzen...</string>
+  <string name="transparent_proxying_enabled">Proxyatze gardena GAITUTA</string>
+  <string name="transproxy_enabled_for_tethering_">Proxy gardena gaituta Tethering-ean!</string>
+  <string name="warning_error_starting_transparent_proxying_">ABISUA: akatsa proxyatze gardena hasterakoan!</string>
+  <string name="transproxy_rules_cleared">Proxy gardeneko erregelak garbituta</string>
+  <string name="couldn_t_start_tor_process_">Ezin izan da Tor prozesua hasi:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Portuetan oinarritutako proxy gardena ezartzen...</string>
+  <string name="bridge_error">Zubi Akatsa</string>
+  <string name="bridge_requires_ip">Zubi ezaiugarria erabiltzeko gutxienez zubi baten IP helbidea sartu behar duzu.</string>
+  <string name="send_email_for_bridges">Gmail kontutik bridges at torproject.org helbidera eposta bat bidali gorputzean \"get bridges\" lerroa duena.</string>
+  <string name="error">Akatsa</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Zure helbide atzigarriak salbuespena sortu du!</string>
+  <string name="your_relay_settings_caused_an_exception_">Zure errele ezarpenak salbuespena sortu dute!</string>
+  <string name="exit_nodes">Irteera Nodoak</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Hatzmarkak, ezizenak, herrialdeak eta helbideak azkeneko jauzirako</string>
+  <string name="enter_exit_nodes">Irteera Nodoak sartu</string>
+  <string name="exclude_nodes">Nodoak baztertu</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Baztertuko diren hatzmarkak, ezizenak, herrialdeak eta helbideak</string>
+  <string name="enter_exclude_nodes">Baztertzeko nodoak sartu</string>
+  <string name="strict_nodes">Nodo hertsiak</string>
+  <string name="use_only_these_specified_nodes">*Bakarrik* zehaztutako nodo hauek erabili</string>
+  <string name="bridges">Zubiak</string>
+  <string name="use_bridges">Zubiak erabili</string>
+  <string name="bridges_obfuscated">Nahasitako Zubiak</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Tor sarera sartzeko nodo alternatiboak gaitu</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Gaitu konfiguratutako zubiak nahasitako zubiak badira</string>
+  <string name="ip_address_and_port_of_bridges">IP helbidea eta zubien portua</string>
+  <string name="enter_bridge_addresses">Sartu Zubi Helbideak</string>
+  <string name="relays">Erreleak</string>
+  <string name="relaying">Erreleatzea</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Zure gailua ez-irteerako errelea izatea gaitu</string>
+  <string name="relay_port">Errele Portua</string>
+  <string name="listening_port_for_your_tor_relay">Zure Tor errelearentzako entzuteko portua</string>
+  <string name="enter_or_port">Sartu OR portua</string>
+  <string name="relay_nickname">Errele ezizena</string>
+  <string name="the_nickname_for_your_tor_relay">Zure Tor errelearen ezizena</string>
+  <string name="enter_a_custom_relay_nickname">Sartu gustoko errelearen ezizena</string>
+  <string name="reachable_addresses">Helbide atzigarriak</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Suheziaren atzean exekutatu politika murriztaileekin</string>
+  <string name="reachable_ports">Portu atzigarriak</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Suhezi murriztailetik atzigarri diren portuak</string>
+  <string name="enter_ports">Portuak sartu</string>
+  <string name="enable_hidden_services">Ezkutuko Zerbitzuak Gaitu</string>
+  <string name="run_servers_accessible_via_the_tor_network">gailuko zerbitzuak Tor saretik atzitzea gaitu</string>
+  <string name="enter_localhost_ports_for_hidden_services">sartu localhost portuak ezkutuko zerbitzuentzat</string>
+  <string name="hidden_service_ports">Ezkutuko Zerbitzu Portuak</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">zure eskutuko zerbitzuaren izen atzigarria (automatikoki sortuta)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">arazketarako logak gaitu (adb edo aLogCat erabili ikusteko)</string>
+  <string name="project_home">Proiektuaren etxea(k):</string>
+  <string name="the_tor_license">Tor Lizentzia</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3.-Ataleko-Softwarea:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Aplikazio batek ezkutuko zerbitzariko %S portua ireki nau du Tor sarera. Segurua da aplikazioaz fidatzen bazara.</string>
+  <string name="found_existing_tor_process">Aurreko Tor prozesua topatuta...</string>
+  <string name="something_bad_happened">Zerbait txarra gertatu da. Begiratu logetan</string>
+  <string name="hidden_service_on">ezkutuko zerbitzua hemen:</string>
+  <string name="unable_to_read_hidden_service_name">ezkutuko zerbitzuare izena ezin da irakurri</string>
+  <string name="unable_to_start_tor">Ezin izan da Tor hasi:</string>
+  <string name="pref_use_sys_iptables_title">Lehenetsitako Iptables erabili</string>
+  <string name="pref_use_sys_iptables_summary">Sistemako iptables programa erabili Orbot-ekin datorreraren ordez</string>
+  <string name="error_installing_binares">Tor programak ezin izan dira instalatu edo eguneratu.</string>
+  <string name="pref_use_persistent_notifications">Orbot konektatuta dagoenean ikonoa tresna barran mantendu beti</string>
+  <string name="pref_use_persistent_notifications_title">Jakinarazpenetan beti</string>
+  <string name="notification_using_bridges">Zubiak gaituta!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Aukeratu Orbotentzako lokala eta hizkuntza</string>
+  <string name="wizard_locale_title">Hizkuntza aukeratu</string>
+  <string name="wizard_locale_msg">Lehenetsia utzi edo uneko hizkuntzara aldatu</string>
+  <string name="powered_by">Tor-ek eskainita</string>
+  <string name="btn_save_settings">Ezarpenak gorde</string>
+  <string name="no_internet_connection_tor">Ez dago Interneterako konexiorik; Tor egonean dago...</string>
+  <string name="bandwidth_">Banda zabalera:</string>
+  <string name="down">behera</string>
+  <string name="up">gora</string>
+  <string name="pref_disable_network_title">Sareko lokartze automatikorik ez</string>
+  <string name="pref_disable_network_summary">Jarri Tor lotan internet atzigarri ez dagoenean</string>
+  <string name="newnym">ChatSecure - Andriodentzako berehalako mezulari bezero ziurra</string>
+  <string name="menu_use_chatsecure">ChatSecure erabili</string>
+  <string name="permission_manage_tor_label">Tor kudeatu</string>
+  <string name="permission_manage_tor_description">Gaitu app hau Tor zerbitzua kontrolatzeko</string>
+  <string name="install_apps_">App-ak instalatu?</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="menu_qr">QR Kodeak</string>
+  <string name="standard_browser">Nabigatzaile Estandarra</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-fa/strings.xml b/orbotservice/src/main/res/values-fa/strings.xml
new file mode 100644
index 0000000..b70cc0f
--- /dev/null
+++ b/orbotservice/src/main/res/values-fa/strings.xml
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">ربات پیازی</string>
+  <string name="app_description">اربت یک برنامه پروکسی مجانی است که دیگر برنامه ها را به استفاده امن از اینترنت توانمند می کند . اربوت از تور برای رمزگذاری کردن ترافیک اینترنت شما استفاده می کند و بعد آن ها را از طریق کامپیوترهای متفاوت در نقاط مختلف جهان مخفی می کند. تور یک برنامه مجانی و شبکه باز است که شما از شما در مقابل تحت نظر بودن در شبکه٬‌  تهدید آزادی های شخصی٬ خصوصی٬ فعالیت های کاری و رابطه های شخصی بطور امن محافظت می کند. </string>
+  <string name="internal_web_url">https://guardianproject.info/apps/orbot/</string>
+  <string name="default_web_url">https://check.torproject.org/?lang=fa_IR</string>
+  <string name="secure_default_web_url">https://check.torproject.org/?lang=fa_IR</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">شروع و پایان تور</string>
+  <string name="tor_proxy_service_process">سرويس پروکسی تور</string>
+  <string name="status_starting_up">اربوت درحال آغاز است...</string>
+  <string name="status_activated">متصل به شبکه تور</string>
+  <string name="status_disabled">اربوت غیرفعال شده است.</string>
+  <string name="status_shutting_down">TorService خاموش است</string>
+  <string name="tor_process_starting">شروع کلاینت تور...</string>
+  <string name="tor_process_complete">تمام.</string>
+  <string name="tor_process_waiting">در حال انتظار.</string>
+  <string name="not_anonymous_yet">هشدار: فعالیت شما هنوز \"گمنام\" نیست! لطفن اپلیکیشن خود را تنظیم کنید تا از HTTP پروکسی 127.0.0.1:8118 و یا SOCKS4A و یا SOCKS5 پروکسی 127.0.01:9050 استفاده کند.</string>
+  <string name="menu_home">خانه</string>
+  <string name="menu_browse">مرور</string>
+  <string name="menu_settings">تنظیمات</string>
+  <string name="menu_log">ورود</string>
+  <string name="menu_info">کمک</string>
+  <string name="menu_apps">وی پی ان</string>
+  <string name="menu_start">آغاز</string>
+  <string name="menu_stop">ایست</string>
+  <string name="menu_about">درباره</string>
+  <string name="menu_promo_apps">دریافت برنامه ها ...</string>
+  <string name="main_layout_download">دانلود</string>
+  <string name="main_layout_upload">آپلود</string>
+  <string name="button_help">کمک</string>
+  <string name="button_close">بسته</string>
+  <string name="button_about">درباره</string>
+  <string name="button_clear_log">پاکسازی ورد</string>
+  <string name="menu_verify">بررسی</string>
+  <string name="menu_exit">خروج</string>
+  <string name="menu_scan">اسکن BridgeQR</string>
+  <string name="menu_share_bridge">اشتراک BridgeQR</string>
+  <string name="press_to_start">- نگهدارید برای شروع -</string>
+  <string name="pref_trans_proxy_group">پروکسیدن شفاف (نیاز به Root دارد)</string>
+  <string name="pref_trans_proxy_title">پروکسی شفاف</string>
+  <string name="pref_trans_proxy_summary">تور-نمایی اتوماتیک اپلیکیشن ها</string>
+  <string name="pref_transparent_all_title">تور همه چیز</string>
+  <string name="pref_transparent_all_summary">فعالیت همه اپلیکیشن ها را از طریق تور پروکسی کنید.</string>
+  <string name="pref_transparent_port_fallback_title">قطع پروکسی پورت</string>
+  <string name="pref_transparent_port_fallback_summary">هشدار: پورتهای رایج دور زدن (80, 444, غیره). *فقط در شرایطی استفاده کنید* که حالت های \'همه\' یا \'اپلیکیشن\' کار نمیکند.</string>
+  <string name="pref_transparent_port_title">فهرست پورت</string>
+  <string name="pref_transparent_port_summary">فهرست پرتها به پروکسی.*فقط در شرایطی استفاده کنید* که حالت های \'همه\' یا \'اپلیکیشن\' کار نمیکند.</string>
+  <string name="pref_transparent_port_dialog">پورت ها را  به پروکسی وارد کن</string>
+  <string name="pref_has_root">درخواست دسترسی root</string>
+  <string name="pref_has_root_summary"> درخواست دسترسی رون برای پروکسی کردن شفاف </string>
+  <string name="status_install_success">باینری های تور با موفقیت نصب شدند!</string>
+  <string name="status_install_fail">نصب فایل های دوتایی تور ممکن نبود. لطفن قطعه را وارسی کنید و به tor-assistance at torproject.org اطلاع دهید.</string>
+  <string name="title_error">خطای اپلیکیشین</string>
+  <string name="wizard_title">اوربوت</string>
+  <string name="wizard_btn_tell_me_more">درباره اوربوت</string>
+  <string name="btn_next">بعدی</string>
+  <string name="btn_back">بازگشت</string>
+  <string name="btn_finish">پایان</string>
+  <string name="btn_okay">قبول</string>
+  <string name="btn_cancel">لغو</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">برخی جزییات درباره اوربوت</string>
+  <string name="wizard_details_msg">اربت یک برنامه زبان باز است که شامل Tor, LibEvent and Polipo می شود و وظیفه آن ارائه  local HTTP proxy (8118) و SOCKS proxy (9050) به شبکه تور است. همچنین اربت این قابلیت را در دستگاه های ریشه دار دارد  که می تواند ترافیک اینترنت را از طریق تور ارسال کند. </string>
+  <string name="wizard_permissions_root">مجوز صادر گردید</string>
+  <string name="wizard_permissions_stock">مجوزهای اوربوت</string>
+  <string name="wizard_premissions_msg_root">بسیار عالی! اینطور که معلوم است شما دارای مجوز root برای فعال کردن ربات پیازی هستید. این امکان را بخوبی مورد استفاده قرار خواهیم داد.</string>
+  <string name="wizard_permissions_msg_stock">هرچند ضرورت ندارد اما اگر سیستم شما دارای دسترسی root باشد ربات پیازی با ظرفیت بسیار بیشتری عمل خواهد کرد. دکمه زیر را فشار دهید تا ربات پیازی دارای ظرفیت حداکثری بشود.</string>
+  <string name="wizard_permissions_no_root">اگر سیستم شما دارای دسترسی root نیست و یا اصلا چیزی از این عبارت متوجه نمی شوید، حتما سعی کنید از اپلکیشن هایی استفاده کنید که ویژه ربات پیازی تهیه شده اند.</string>
+  <string name="wizard_permissions_consent">متوجه هستم و ترجیح می دهم بدون root ادامه بدهم.</string>
+  <string name="wizard_permission_enable_root">واگذاری دسترسی root برای ربات پیازی</string>
+  <string name="wizard_configure">تنظیمات تبدیل به تور</string>
+  <string name="wizard_configure_msg">ربات پیازی به شما امکان می دهد که تمام اپلیکشین ها را از طریق توز  منتقل کنید و یا اپلیکیشن مورد نظر خود را شخصن انتخاب کنید.</string>
+  <string name="wizard_configure_all">تمام اپلیکیشن ها را از طریق تور منتقل کنید.</string>
+  <string name="wizard_configure_select_apps">اپلیکیشن های منفرد برای تور انتخاب کنید.</string>
+  <string name="wizard_tips_tricks">اپلیکیشن هایی که برای ربات پیازی تنظیم شده اند</string>
+  <string name="wizard_tips_msg">توصیه می کنیم داونلود و فعال کنید؛ اپلیکیشن هایی را استفاده کنید که مستقیم به اوربوت وصل می شوند. دکمه های زیر را فشار دهید تا نصب شود.</string>
+  <string name="wizard_tips_otrchat">ChatSecure - برنامه امن ارسال پیغام فوری برای اندروئید</string>
+  <string name="wizard_tips_proxy">تنظیمات پروکسی - یادگیری تنظیم اپلیکیشن ها برای کار با اوربوت</string>
+  <string name="wizard_tips_duckgo">اپلیکیشن موتور جستجوی داک داک گو</string>
+  <string name="wizard_tips_twitter">توییتر از \"http proxy \"localhost:8118 پشتیبانی می کند</string>
+  <string name="wizard_tips_story_maker">StoryMaker - ساختن یک داستان و ترک آن به Tor برای امنیت!</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_proxy_help_msg">اگر برنامه آندرویدی که استفاده می کنید می تواند از استفاده HTTP یا  SOCKS proxy ساپورت کند٬ پس می توانید آن را برای اتصال به اوربوت استفاده از تور تنظیم کنید. .\n\n\n تنظیمات هاست 127.0.0.1  یا \"localhost\". برای HTTP تنظیم پورت  8118 است. برای  SOCKS ٬ پروکسی 9050. اگر امکانش وجود دارد از  SOCKS4A یا SOCKS5 استفاده کنید. \n \n\n\n  می توانید در مورد پروکسی در آندروید بیشتر بیاموزید در
+ http://tinyurl.com/proxyandroid\n</string>
+  <string name="wizard_final">اوربوت آماده استفاده میباشد!</string>
+  <string name="wizard_final_msg">بسیاری از مردم در سرتاسر جهان از تور به دلایل متفاوت استفاده می کنند.\n\n خبرنگارها و بلاگرها٬ فعالان حقوق بشر٬ سربازان٬ ماموران اجرای قانون٬ شهروندان رژیم های سرکوبگر و مردم معمولی... و حالا تو </string>
+  <string name="wizard_exit_at_first_screen_toast">لطفا اوربوت را  پیکربندی کنید قبل از اینکه شما شروع به استفاده از آن کنید!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">با موفقیت به شبکه Tor متصل شده اید - اما این بدان معنا نیست دستگاه شما امن است. شما می توانید استفاده کنید از کلید \"مرورگر\" برای تست اتصال . \n\n درباره ما در https://guardianproject.info/apps/orbot و یا ارسال ایمیل به help at guardianproject.info برای کسب اطلاعات بیشتر.</string>
+  <string name="tor_check">با این قدم پیشفرض مرورگر وب شما به صفحه   https://check.torproject.org باز می شود تا شما مشاهده کنید آیا ربات پیازی تنظیم شده است و آیا شما به تور وصل شده اید یا نه.</string>
+  <string name="pref_hs_group">سرويس های مخفی هاست</string>
+  <string name="pref_general_group">کلی</string>
+  <string name="pref_start_boot_title">اوربوت را همزمان با بوت آغاز کن</string>
+  <string name="pref_start_boot_summary">وقتی اندروید بوت شد، بصورت خودکار ربات پیازی را اجرا و آن را به شبکه تور متصل کن</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">اربت٬ تور را برای آندروید می آورد تا از محتویات فیلتر شده٬ آنالیز ترافیک و کنترل شبکه که خطری برای حریم خصوصی است و اطلاعات شخصی و رابطه ها دفاع کند. \n\nT این جادوگر برای تنظیم اربت و تور در دستگاه شما کمک می کند. </string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">هشدار</string>
+  <string name="wizard_warning_msg">نصب کردن اربت به خودی خود ترافیک موبایل شما را ناشناس نخواهد کرد.\n\n باید حتما اربت را در دستگاه یا برنامه ای که از آن استفاده می کنید برای استفاده از تور تنظیم نمایید.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">دسترسی‌ها</string>
+  <string name="wizard_permissions_root_msg1">اگر بخواهید میتوانید به ربات پیازی اجازه دسترسی  سوپر یوزر بدهید تا ویژگیهای پیشرفته  مانند پروکسی شفاف را فعال کند </string>
+  <string name="wizard_permissions_root_msg2">اگر نمیخواهید این کار را انجام دهید ، لطفا مطمئن شوید که از اپلیکیشنهایی استفاده می کنید که با ربات پیازی کار می کنند</string>
+  <string name="wizard_permissions_no_root_msg">بنظر می رسد دستگاه شما ریشه ندارد یا ریشه ای ارائه کند یا دسترسی به کاربری مدیر داشته باشد. \n\n لطفا حالت Apps را در صفحه اصلی روشن نمایید. </string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">  اپلیکیشنهایی که ربات پیازی روی آنها فعال است</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: برنامه گفتگوی امن محرمانه با قابلیت رمزگزاری</string>
+  <string name="wizard_tips_play">تمامي برنامه های Guardian Project را در Google Play پيدا كنيد.</string>
+  <string name="wizard_tips_fdroid">یافتن همه برنامه های Guardian Project در F-Droid</string>
+  <string name="wizard_tips_fdroid_org">یافتن همه برنامه های Guardian Project در https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">پروکسی کردن شفاف</string>
+  <string name="wizard_transproxy_msg">این به برنامه ها به شما اجازه میدهد که بدون هیچ تنظیمی، بصورت خودکار از طریق شبکه تور اجرا شوند</string>
+  <string name="wizard_transproxy_hint">(اگر هیچ ایده‌ای ندارید که راجع به چه چیزی حرف میزنیم این گزینه را انتخاب کنید)</string>
+  <string name="wizard_transproxy_none">هیـچ</string>
+  <string name="pref_transparent_tethering_title"> تترینگ از طریق تور</string>
+  <string name="pref_transparent_tethering_summary">پروکسی شفاف از طریق تور را برای دستگاه هایی که با یو اس بی یا وای فای تتر شده اند مجاز کن. (به ری استارت نیاز دارند)</string>
+  <string name="button_grant_superuser">درخواست دسترسی برای سوپریوزر</string>
+  <string name="pref_select_apps">انتخاب برنامه ها</string>
+  <string name="pref_select_apps_summary"> انتخاب اپلیکیشن برای مسیریابی از طریق تور </string>
+  <string name="pref_node_configuration">تنظیمات گره</string>
+  <string name="pref_node_configuration_summary">اینها تنظیمات پیشرفته ای هستند که ممکن است گمنامی شما را کاهش دهند</string>
+  <string name="pref_entrance_node">گره های ورودی</string>
+  <string name="pref_entrance_node_summary">اثرانگشت ها، اسامی مستعار، کشورها و آدرسهای جهش اول</string>
+  <string name="pref_entrance_node_dialog">گره های ورودی را وارد کنید</string>
+  <string name="pref_allow_background_starts_title">اجازه دادن اجرا در پس زمینه</string>
+  <string name="button_proxy_all">همه پروکسی ها</string>
+  <string name="button_proxy_none">هیچ پروکسی</string>
+  <string name="button_invert_selection">انتخاب برعکس شود</string>
+  <string name="pref_proxy_title">پراکسی شبکه خروجی</string>
+  <string name="pref_proxy_type_title">نوع پروکسی</string>
+  <string name="pref_proxy_type_summary">پروتکل مورد استفاده برای پراکسی سرور: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">نوع پروکسی را وارد کنید</string>
+  <string name="pref_proxy_host_title"> پروکسی میزبان</string>
+  <string name="pref_proxy_host_summary">نام سرور پروکسی میزبان </string>
+  <string name="pref_proxy_host_dialog">نام پروکسی میزبان را وارد کنید</string>
+  <string name="pref_proxy_port_title">پورت پروکسی خروجی</string>
+  <string name="pref_proxy_port_summary">پورت سرور پروکسی</string>
+  <string name="pref_proxy_port_dialog">پورت پروکسی را وارد کنید</string>
+  <string name="pref_proxy_username_title">نام کاربری پراکسی خروجی</string>
+  <string name="pref_proxy_username_summary">نام کاربری پروکسی(اختیازی)</string>
+  <string name="pref_proxy_username_dialog">نام کاربری پروکسی را وارد نمایید</string>
+  <string name="pref_proxy_password_title">کلمه عبور پراکسی خروجی</string>
+  <string name="pref_proxy_password_summary">رمز عبور پروکسی(اختیاری)</string>
+  <string name="pref_proxy_password_dialog">رمز عبور پروکسی را وارد نمایید</string>
+  <string name="status">وضعیت</string>
+  <string name="setting_up_full_transparent_proxying_">نصب پروکسی کاملن شفاف...</string>
+  <string name="setting_up_app_based_transparent_proxying_">نصب پروکسی شفاف مبتنی بر برنامه...</string>
+  <string name="transparent_proxying_enabled">پروکسی شفاف فعال است</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy برای Tethering فعال شده است!</string>
+  <string name="warning_error_starting_transparent_proxying_">هشدار: خطا در هنگام راه اندازی پروکسی شفاف!</string>
+  <string name="transproxy_rules_cleared">قوانین TransProxy پاک شدند</string>
+  <string name="couldn_t_start_tor_process_"> تور نتواست اجرا شود:</string>
+  <string name="privoxy_is_running_on_port_">Polipo در حال اجرا است در پورت:</string>
+  <string name="setting_up_port_based_transparent_proxying_">نصب پروکسی شفاف مبتنی بر پورت...</string>
+  <string name="bridge_error">خطای Bridge </string>
+  <string name="bridge_requires_ip">برای استفاده از ویژگی Bridge، باید حداقل آدرس IP یک پل را وارد کنید.</string>
+  <string name="send_email_for_bridges">از یک حساب کاربری جیمیل، ایمیلی با متن \"get bridges\" به آدرس bridges at torproject.org بفرستید.</string>
+  <string name="error">خطا</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">تنظیمات شما برای آدرس قابل دسترسی باعث ایجاد خطا شده اند !</string>
+  <string name="your_relay_settings_caused_an_exception_">تنظیمات رله شما موجب خطا شده اند</string>
+  <string name="exit_nodes">گره های خروجی</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">اثر انگشتها ، اسامی مستعار ، کشورها و آدرسها برای آخرین جهش </string>
+  <string name="enter_exit_nodes"> گره های خروجی را وارد کنید</string>
+  <string name="exclude_nodes">این گره ها را استفاده نکن</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">اثر انگشتها، اسامی مستعار ، کشورها و آدرسهایی که نباید استفاده شوند</string>
+  <string name="enter_exclude_nodes"> گره هایی که نباید استفاده شوند</string>
+  <string name="strict_nodes">گره های محدود</string>
+  <string name="use_only_these_specified_nodes">فقط * از این گره های مشخص شده استفاده کنید* </string>
+  <string name="bridges">Bridges</string>
+  <string name="use_bridges">از پل Bridges کن</string>
+  <string name="bridges_obfuscated">پل های گیج کننده</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">گره ورودی متناوب به شبکه تور را فعال کنید</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">اگر Bridges تنظیم شده پلهای مربوط به پروکسی گیج کننده هستند این گزینه را فعال کنید</string>
+  <string name="ip_address_and_port_of_bridges">آدرس آی پی و پورتِ پل ها</string>
+  <string name="enter_bridge_addresses">آدرس Bridges را وارد کنید</string>
+  <string name="relays">بازپخش کننده ها</string>
+  <string name="relaying">درحال بازپخش</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">دستگاه خود را برای یک بازپخش کننده غیر-خروجی فعال کنید</string>
+  <string name="relay_port">پورت بازپخش کننده</string>
+  <string name="listening_port_for_your_tor_relay"> پورت شنونده برای باز پخش تور</string>
+  <string name="enter_or_port">پورت OR را وارد کنید</string>
+  <string name="relay_nickname">نام مستعار بازپخش کننده</string>
+  <string name="the_nickname_for_your_tor_relay">نام مستعار بازپخش کننده شما</string>
+  <string name="enter_a_custom_relay_nickname">یک نام مستعار دلخواه برای بازپخش کننده وارد کنید</string>
+  <string name="reachable_addresses">آدرس های قابل دسترس</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">بعنوان یک کاربر پشت دیواره آتش با سیاست های محدود کننده اجرا کنید</string>
+  <string name="reachable_ports">پورت‌های قابل دسترس</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">پورت‌های قابل دسترس پشت یک فایروال محدودکننده</string>
+  <string name="enter_ports">پورت‌ها را وارد کنید</string>
+  <string name="enable_hidden_services">سرویس‌های مخفی را فعال کن</string>
+  <string name="run_servers_accessible_via_the_tor_network">اجازه بده سرورهای روی دستگاه از طریق شبکه تور قابل دسترسی باشند</string>
+  <string name="enter_localhost_ports_for_hidden_services">پورت های لوکال هاست را برای سرویس مخفی وارد کنید</string>
+  <string name="hidden_service_ports">پورت‌های سرویس مخفی</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">نام نشانی پذیر برای سرویس مخفی شما (بصورت خودکار تولید شده است)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ثبت گزارش اشکال زدایی را به خروجی فعال کن (برای نمایش باید از adb یا aLogCat استفاده کنید)</string>
+  <string name="project_home">صفحه (های) اصلی پروژه:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">گواهی تور</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3rd-Party-Software:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">یک اپلیکیشن میخواهد پورت %S سرویس مخفی را به شبکه تور باز کند. اگر به این اپلیکیشن اعتماد دارید این بی خطر است.</string>
+  <string name="found_existing_tor_process">یک تور درحال اجرا پیدا شد...</string>
+  <string name="something_bad_happened">اتفاق بدی افتاد. وقایع ثبت شده را چک کنید</string>
+  <string name="hidden_service_on">سرویس مخفی روی:</string>
+  <string name="unable_to_read_hidden_service_name">ناتوان در خواندن نام سرویس مخفی</string>
+  <string name="unable_to_start_tor">ناتوان در راه اندازی تور:</string>
+  <string name="unable_to_reset_tor">راه اندازی مجدد دستگاه شما ، قادر نیست به تنظیم مجدد Tor !</string>
+  <string name="pref_use_sys_iptables_title">از Iptables پیش فرض استفاده کن</string>
+  <string name="pref_use_sys_iptables_summary">به جای چیزی که با ربات پیازی اومده، از باینری آی پی تیبلز داخلی استفاده کن</string>
+  <string name="error_installing_binares">فایلهای باینری تور قادر به نصب و یا ارتقا نبودند</string>
+  <string name="pref_use_persistent_notifications">وقتی ربات پیازی متصل است، همیشه آیکون مربوط را در نوار ابزار نگه دار.</string>
+  <string name="pref_use_persistent_notifications_title">آگاهسازی همیشه روشن</string>
+  <string name="pref_use_expanded_notifications">نمایش اطلاع رسانی گسترده با کشور خروجی Tor و IP</string>
+  <string name="pref_use_expanded_notifications_title">اطلاعیه گسترده</string>
+  <string name="notification_using_bridges">Bridges فعال شدند!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">زبان</string>
+  <string name="set_locale_summary">زبان محلی  ربات پیازی را انتخاب کنید</string>
+  <string name="wizard_locale_title">انتخاب زبان</string>
+  <string name="wizard_locale_msg">زبان کنونی را تعویض و یا به شکل پیشفرض رهایش کنید</string>
+  <string name="powered_by">طراحی شده توسط Tor</string>
+  <string name="btn_save_settings">ذخیره تنظیمات</string>
+  <string name="no_internet_connection_tor">ارتباط اینترنتی وجود ندارد; تور آماده کار است... </string>
+  <string name="bandwidth_">پهنای باند:</string>
+  <string name="down">پائین</string>
+  <string name="up">بالا</string>
+  <string name="pref_disable_network_title">خاموش کردن در صورت عدم وجود شبکه</string>
+  <string name="pref_disable_network_summary">در صورتی که شبکه وجود نداشته باشد خاموش شود</string>
+  <string name="newnym">شما به شناسه جدید تور منتقل شدید</string>
+  <string name="menu_verify_browser">مرورگر</string>
+  <string name="menu_use_chatsecure">استفاده از ChatSecure</string>
+  <string name="permission_manage_tor_label">مدیریت تور</string>
+  <string name="permission_manage_tor_description">این برنامه بتواند سرویس تور را مدیریت کند</string>
+  <string name="install_apps_">برنامه نصب شود؟</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">ارتباط شبکه ای وجود ندارد. تور به حالت خواب می رود</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">ارتباط شبکه ای خوب است. تور را بیدار نمایید...</string>
+  <string name="updating_settings_in_tor_service">به روز رسانی تنظیمات در سرویس Tor</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">پورتی که تور ارائه می دهد SOCKS proxy روی (پیش فرض: 9050 یا 0 برای غیرفعال کردن)</string>
+  <string name="pref_socks_dialog">پیکربندی پورت SOCKS</string>
+  <string name="pref_transport_title">Tor TransProxy Port</string>
+  <string name="pref_transport_summary">پورتی که تور ارائه می دهد Transparent Proxy روی (پیش فرض:  9040 یا  0 برای غیرفعال کردن)</string>
+  <string name="pref_transport_dialog">پیکربندی پورت Transproxy</string>
+  <string name="pref_dnsport_title">پورت Tor DNS</string>
+  <string name="pref_dnsport_summary">پورتی که Tor ارائه می دهد آن DNS روی (به طور پیش فرض: 5400 یا 0 برای غیر فعال کردن)</string>
+  <string name="pref_dnsport_dialog">پیکربندی پورت DNS</string>
+  <string name="pref_torrc_title">پیکربندی سفارشی Torrc</string>
+  <string name="pref_torrc_summary">فقط متخصصان:  enter direct torrc config lines</string>
+  <string name="pref_torrc_dialog">سفارشی Torrc</string>
+  <string name="wizard_tips_martus">موبایل مارتوس -  Benetech Human Rights Documentation App</string>
+  <string name="your_tor_public_ips_">IP های عمومی Tor شما:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">لطفا این برنامه را در آندروید از کار بیندازید  Android->Settings->Apps اگر مشکلی با اربت دارید:  </string>
+  <string name="app_conflict">تعارض برنامه</string>
+  <string name="pref_transproxy_refresh_title">خودکار تازه کردن Transproxy</string>
+  <string name="pref_transproxy_refresh_summary">درخواست مجدید برای قوانین Transproxy  وقتی وضعیت شبکه تغییر کرد</string>
+  <string name="pref_transproxy_flush_title">حذف اجباری Transproxy</string>
+  <string name="pref_transproxy_flush_summary">اینجا را فشار دهید برای برهم ریختن تمام قوانین  transproxy</string>
+  <string name="transparent_proxy_rules_flushed_">قوانین Transparent proxy  برهم ریخته شد! </string>
+  <string name="you_do_not_have_root_access_enabled">شما دسترسی روت را فعال نکردید. </string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_"> برای اعمال تنظیمات جدید باید اوربات را خاموش و روشن کنید.</string>
+  <string name="menu_vpn">وی پی ان</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Bridges به روز شدند</string>
+  <string name="restart_orbot_to_use_this_bridge_">برای فعال کردن تغییرات لطفا Orbot را راه اندازی مجدد کنید</string>
+  <string name="menu_qr">کدهای QR</string>
+  <string name="bridge_mode">حالت Bridges</string>
+  <string name="get_bridges_email">ایمیل</string>
+  <string name="get_bridges_web">وب</string>
+  <string name="activate">فعال</string>
+  <string name="apps_mode">حالت نرم افزار VPN</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">با استفاده از امکان وی پی ان اندروید٬ اوربات ترافیک تمام اپلیکیشن های موبایل شما را از طریق شبکه تور انتقال میدهد. 
+\n\n*هشدار* 
+امکان تونل تمام گوشی هنوز جدید و در حال آزمایش است. به همین دلیل امکان دارد که به صورت خودکار فعال نشود یا هنگام استفاده قطع شود. از این امکان برای ناشناس بودن در وب هرگز نباید استفاده کنید و باید فقط از آن برای عبور از فایروال ها و دور زدن فیلترینگ استفاده شود.</string>
+  <string name="send_email">ایمیل بفرست</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">می توانید آدرس  bridge  را از طریق ایمیل٬ وب یا با اسکن کردن  bridge QR code بدست آورید. ایمیل یا وب پایین را برای درخواست آدرس bridge انتخاب کنید.\n\n وقتی آدرس را دارید آن را کپی کنید و برگردانید در  اولویت های  Bridges در تنظیمات اربت و آن را دوباره راه اندازی کنید.</string>
+  <string name="install_orweb">نصب Orfox</string>
+  <string name="standard_browser">مرورگر استاندارد</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">نکته:  Tor bridges استاندارد فقط بر روی دستگاه های Intel X86/ATOM  کار می کند</string>
+  <string name="vpn_default_world">جهان</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-fi/strings.xml b/orbotservice/src/main/res/values-fi/strings.xml
new file mode 100644
index 0000000..0179493
--- /dev/null
+++ b/orbotservice/src/main/res/values-fi/strings.xml
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot on ilmainen välityspalvelinsovellus, joka tarjoaa muille sovelluksille mahdollisuuden käyttää internetiä turvallisemmin. Orbot käyttää Toria kryptaamaan verkkoliikenteesi ja sitten piilottaa sen kierrättämällä sitä usean tietokoneen kautta ympäri maailman. Tor on vapaa ohjelmisto ja avoin verkosto, jotka auttavat puolustautumaan vapautta ja yksityisyyttä uhkaavalta verkkovalvonnalta ja valtioiden verkonseurannalta sekä suojaamaan salaisia liiketoimintoja ja -yhteyksiä.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">käynnistä ja pysäytä Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot käynnistyy...</string>
+  <string name="status_activated">Yhdistetty Tor-verkkoon</string>
+  <string name="status_disabled">Orbot on poistettu käytöstä</string>
+  <string name="tor_process_starting">Käynnistetään Tor-ohjelmaa...</string>
+  <string name="tor_process_complete">valmis.</string>
+  <string name="tor_process_waiting">odottaa.</string>
+  <string name="not_anonymous_yet">VAROITUS: Verkkoliikenteesi ei ole vielä anonyymiä! Määritä ohjelmasi käyttämään HTTP-välityspalvelinta 127.0.0.1:8118 tai SOCKS4A- tai SOCKS5-välityspalvelinta 127.0.0.1:9050</string>
+  <string name="menu_home">Alkuun</string>
+  <string name="menu_browse">Selaa</string>
+  <string name="menu_settings">Asetukset</string>
+  <string name="menu_log">Loki</string>
+  <string name="menu_info">Ohje</string>
+  <string name="menu_start">Aloita</string>
+  <string name="menu_stop">Lopeta</string>
+  <string name="menu_about">Tietoa</string>
+  <string name="main_layout_download">Lataa</string>
+  <string name="main_layout_upload">Lähetä</string>
+  <string name="button_help">Apua</string>
+  <string name="button_close">Sulje</string>
+  <string name="button_about">Tietoa</string>
+  <string name="button_clear_log">Tyhjennä loki</string>
+  <string name="menu_verify">Tarkista</string>
+  <string name="menu_exit">Lopeta</string>
+  <string name="menu_scan">Skannaa sillan QR-koodi</string>
+  <string name="menu_share_bridge">Jaa sillan QR-koodi</string>
+  <string name="press_to_start">- paina pitkään käynnistääksesi -</string>
+  <string name="pref_trans_proxy_group">Läpinäkyvä välityspalvelimen käyttö (vaatii roottauksen)</string>
+  <string name="pref_trans_proxy_title">Läpinäkyvä välityspalvelimen käyttö</string>
+  <string name="pref_trans_proxy_summary">Ohjelmien automaattinen Torimointi</string>
+  <string name="pref_transparent_all_title">Torraa kaikki</string>
+  <string name="pref_transparent_all_summary">Välitä kaikki ohjelmien liikenne Torin läpi</string>
+  <string name="pref_transparent_port_fallback_title">Välityspalvelinportin varoasetus</string>
+  <string name="pref_transparent_port_fallback_summary">VAROITUS: Kiertää yleisiä portteja (80, 443, jne). *KÄYTÄ VAIN* jos \"Kaikki\" tai \"Sovellus\" -tila ei toimi.</string>
+  <string name="pref_transparent_port_title">Porttilista</string>
+  <string name="pref_transparent_port_summary">Välityspalvelimen kautta vietävien porttien lista. *KÄYTÄ VAIN* jos \"Kaikki\" tai \"Sovellus\" -tila ei toimi.</string>
+  <string name="pref_transparent_port_dialog">Kirjoita portit, jotka viedään välityspalvelimen kautta</string>
+  <string name="pref_has_root">Pyydä root-tason oikeuksia</string>
+  <string name="pref_has_root_summary">Pyydä root-tason oikeuksia läpinäkyvään tiedonvälitykseen</string>
+  <string name="status_install_success">Tor-binääritiedostojen asennus onnistui!</string>
+  <string name="status_install_fail">Tor-binääritiedostojen asennus epäonnistui. Tarkista loki ja ilmoita asiasta osoitteeseen tor-assistants at torproject.org</string>
+  <string name="title_error">Sovellusvirhe</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Tietoja Orbotista</string>
+  <string name="btn_next">Seuraava</string>
+  <string name="btn_back">Takaisin</string>
+  <string name="btn_finish">Lopeta</string>
+  <string name="btn_okay">Selvä</string>
+  <string name="btn_cancel">Peruuta</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Joitakin Orbotin yksityiskohtia</string>
+  <string name="wizard_details_msg">Orbot on avoimen lähdekoodin sovellus, joka sisältää Torin, LibEventin ja Polipon. Se tarjoaa paikallisen HTTP-välityspalvelimen (8118) ja SOCKS-välityspalvelimen (9050) Tor-verkkoon. Rootatulla laitteella Orbot kykenee myös reitittämään kaiken verkkoliikenteen Torin läpi.</string>
+  <string name="wizard_permissions_root">Lupa myönnetty</string>
+  <string name="wizard_permissions_stock">Orbot-oikeudet</string>
+  <string name="wizard_premissions_msg_root">Loistavaa! Olemme havainneet että olet antanut root-tason oikeudet Orbotille. Käytämme näiden oikeuksien suomia mahdollisuuksia harkiten.</string>
+  <string name="wizard_permissions_msg_stock">Vaikka root-tason oikeuksien antaminen Orbotille ei ole pakollista, tulee Orbotista tehokkaampi työkalu jos laitteellasi on root-tason oikeudet. Käytä alla olevaa painiketta antaaksesi Orbotille supervoimat!</string>
+  <string name="wizard_permissions_no_root">Jos sinulla ei ole root-tason oikeuksia tai et tiedä, mitä tarkoitamme, käytä vain Orbotille suunniteltuja ohjelmia.</string>
+  <string name="wizard_permissions_consent">Ymmärrän ja haluan jatkaa ilman Superuser-tason oikeuksia</string>
+  <string name="wizard_permission_enable_root">Anna root-tason oikeudet Orbotille</string>
+  <string name="wizard_configure">Konfiguroi Torimointi</string>
+  <string name="wizard_configure_msg">Orbot mahdollistaa kaiken sovellusliikenteen reitittämisen Tor-sovelluksen kautta TAI valita sovelluksesi yksilöllisesti.</string>
+  <string name="wizard_configure_all">Välitä kaikkien sovellusten tiedonsiirto Tor-verkon kautta</string>
+  <string name="wizard_configure_select_apps">Valitse Tor-verkkoa käyttävät sovellukset</string>
+  <string name="wizard_tips_tricks">Orbotia käyttävät sovellukset</string>
+  <string name="wizard_tips_msg">Alempana näkyvät sovellukset on suunniteltu toimimaan Orbotin kanssa. Paina jokaista nappia, jos haluat asentaa ne nyt. Voit myös löytää ne myöhemmin Googlen Play-kaupasta, GuardianProject.info:n nettisivulta tai F-Droid.org:in kautta.</string>
+  <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="wizard_tips_twitter">Aseta Twitter-välityspalvelinisännäksi \"localhost\" ja portiksi 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Tee tarina ja jätä se torin turvallisuuteen!</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>
+  <string name="wizard_proxy_help_msg">Jos käyttämäsi Android-sovellus tukee HTTP- tai SOCKS-välityspalvelimen käyttöä, voit määrittää sen yhdistämään Orbotiin ja käyttämään Toria.\n\n\n Isäntänimi on 127.0.0.1 tai \"localhost\". HTTP-portti on 8118. SOCKS-portti on 9050. SOCKS4A- tai SOCKS5-protokollia tulisi käyttää, mikäli mahdollista.\n \n\n\n Voit lukea lisää välityspalvelinten käytöstä Androidilla usein kysytyistä kysymyksistä osoitteessa: http://tinyurl.com/proxyandroid\n</string>
+  <string name="wizard_final">Orbot on valmis!</string>
+  <string name="wizard_final_msg">Miljoonat ihmiset ympäri maailman käyttävät Toria eri syistä.\n\nJornalistit ja bloggaajat, ihmisoikeuksien puolustajat, poliisit, sotilaat, yritykset, sorrettujen valtioiden kansalaiset, ja tavalliset kansalaiset... ja nyt sinäkin olet valmis siihen!</string>
+  <string name="wizard_exit_at_first_screen_toast">Määritä Orbot ennen kuin alat käyttää sitä!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Tämä avaa selaimesi osoitteeseen https://check.torproject.org nähdäkseen, onko Orbot varmaan konfiguroitu ja onko sinut yhdistetty Tor-sovellukseen.</string>
+  <string name="pref_hs_group">Piilopalvelun isännöinti</string>
+  <string name="pref_general_group">Yleiset</string>
+  <string name="pref_start_boot_title">Aloita Orbot käynnistettäessä</string>
+  <string name="pref_start_boot_summary">Käynnistä Orbot ja yhdistä Toriin automaattisesti, kun Anroid-laitteesi käynnistyy</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot tuo Torin Androidille!\n\nTor auttaa sinua suojautumaan sisältösuodattimilta sekä verkkoliikenteen seurannalta ja valvonnalta, jotka uhkaavat yksityisyyttä, salaista tietoa ja henkilökohtaisia suhteita.\n\nTämä velho auttaa sinua määrittämään Orbotin ja Torin laitteellasi.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Varoitus</string>
+  <string name="wizard_warning_msg">Pelkkä Orbotin asentaminen ei automaattisesti tee verkkoliikenteestäsi anonyymiä. Sinun täytyy määrittää Orbot kunnolla, jotta laitteesi ja muut sovellukset käyttävät Toria onnistuneesti.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Käyttöoikeudet</string>
+  <string name="wizard_permissions_root_msg1">Voit antaa Orbotille Superuser-oikeudet mahdollistaaksesi joitakin lisäominaisuuksia, kuten läpinäkyvän tiedonvälityksen.</string>
+  <string name="wizard_permissions_root_msg2">Jos et halua tehdä tätä, varmista, että käytät Orbotin kanssa toimivaksi suunniteltuja sovelluksia.</string>
+  <string name="wizard_permissions_no_root_msg">Laitteesi ei vaikuta olevan rootattu tai tarjoavan root- tai \'Superuser\'-oikeuksia.\n\nKokeile \'Sovellukset\'-tilaa päänäytöltä.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Löydä kaikki Guardian-projektin sovellukset Googlen Play-kaupasta</string>
+  <string name="wizard_tips_fdroid">Löydä kaikki Guardian Projectin sovellukset F-Droidista</string>
+  <string name="wizard_tips_fdroid_org">Löydä kaikki Guardian Projectin sovellukset osoitteesta https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Läpinäkyvä tiedonvälitys</string>
+  <string name="wizard_transproxy_msg">Tämä sallii sovellustesi tietoliikenteen menemisen automaattisesti Torin läpi</string>
+  <string name="wizard_transproxy_hint">(Rastita tämä ruutu, jos et tiedä, mitä tarkoitamme)</string>
+  <string name="wizard_transproxy_none">Ei mikään</string>
+  <string name="pref_transparent_tethering_title">Tor-välityspalvelimena oleminen</string>
+  <string name="pref_transparent_tethering_summary">Salli Torin läpinäkyvä tiedonvälitys Wifille ja USB-välityspalvelimena oleville laitteille (vaatii uudelleenkäynnistyksen)</string>
+  <string name="button_grant_superuser">Pyydä Superuser-oikeuksia</string>
+  <string name="pref_select_apps">Valitse sovellukset</string>
+  <string name="pref_select_apps_summary">Valitse Torin läpi reititettävät sovellukset</string>
+  <string name="pref_node_configuration">Tor-solmukohdan konfigurointi</string>
+  <string name="pref_node_configuration_summary">Nämä ovat lisäasetuksia, jotka voivat vähentää anonyymiyttäsi</string>
+  <string name="pref_entrance_node">Tor-sisääntulosolmu</string>
+  <string name="pref_entrance_node_summary">Sormenjäljet, lovet, maat ja osoitteet ensimmäiseen hyppyyn</string>
+  <string name="pref_entrance_node_dialog">Kirjoita sisääntulosolmujen nimet</string>
+  <string name="button_proxy_all">Välitä kaikki</string>
+  <string name="button_proxy_none">Älä välitä mitään</string>
+  <string name="button_invert_selection">Käännä valinta</string>
+  <string name="pref_proxy_title">Lähtevän liikenteen välityspalvelin (valinnainen)</string>
+  <string name="pref_proxy_type_title">Lähtevän liikenteen välityspalvelimen tyyppi</string>
+  <string name="pref_proxy_type_summary">Välityspalvelimen protokolla: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Kirjoita välityspalvelintyyppi</string>
+  <string name="pref_proxy_host_title">Ulosmenovälityspalvelimen isäntä</string>
+  <string name="pref_proxy_host_summary">Välityspalvelimen verkko-osoite</string>
+  <string name="pref_proxy_host_dialog">Kirjoita välityspalvelimen isäntä</string>
+  <string name="pref_proxy_port_title">Ulosmenovälityspalvelimen portti</string>
+  <string name="pref_proxy_port_summary">Välityspalvelimen portti</string>
+  <string name="pref_proxy_port_dialog">Kirjoita välityspalvelimen portti</string>
+  <string name="pref_proxy_username_title">Ulosmenovälityspalvelimen käyttäjänimi</string>
+  <string name="pref_proxy_username_summary">Välityspalvelimen käyttäjätunnus (valinnainen)</string>
+  <string name="pref_proxy_username_dialog">Kirjoita välityspalvelimen käyttäjätunnus</string>
+  <string name="pref_proxy_password_title">Ulosmenovälityspalvelimen salasana</string>
+  <string name="pref_proxy_password_summary">Välityspalvelimen salasana (valinnainen)</string>
+  <string name="pref_proxy_password_dialog">Kirjoita välityspalvelimen salasana</string>
+  <string name="status">Tila</string>
+  <string name="setting_up_full_transparent_proxying_">Täyttä läpinäkyvää tiedonvälitystä otetaan käyttöön...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Sovelluspohjaista läpinäkyvää tiedonvälitystä otetaan käyttöön...</string>
+  <string name="transparent_proxying_enabled">Läpinäkyvä tiedonvälitys SALLITTU</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy on otettu käyttöön Tor-välityspalvelimimena olemista varten!</string>
+  <string name="warning_error_starting_transparent_proxying_">VAROITUS: virhe aloittaessa läpinäkyvää tiedonvälitystä!</string>
+  <string name="transproxy_rules_cleared">TransProxyn säännöt tyhjennetty</string>
+  <string name="couldn_t_start_tor_process_">Tor-prosessin käynnistäminen epäonnistui:</string>
+  <string name="privoxy_is_running_on_port_">Polipo on käynnissä portissa:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Porttipohjaista läpinäkyvää tiedonvälitystä otetaan käyttöön...</string>
+  <string name="bridge_error">Siltavirhe</string>
+  <string name="bridge_requires_ip">Jos haluat käyttää siltaominaisuutta, kirjoita vähintään yhden sillan IP-osoite.</string>
+  <string name="send_email_for_bridges">Lähetä sähköpostia osoitteeseen bridges at torproject.org gmail-osoitteesta siten, että viestin ainoa rivi on \"get bridges\".</string>
+  <string name="error">Virhe</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">ReachableAccess-asetuksesi aiheuttivat virheen!</string>
+  <string name="your_relay_settings_caused_an_exception_">Releasetuksesi aiheuttivat virheen!</string>
+  <string name="exit_nodes">Päätesolmut</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Sormenjäljet, lovet, maat ja osoitteet viimeiselle hypylle</string>
+  <string name="enter_exit_nodes">Kirjoita päätesolmut</string>
+  <string name="exclude_nodes">Vältä solmuja</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Vältettävät sormenjäljet, lovet, maat ja osoitteet</string>
+  <string name="enter_exclude_nodes">Kirjoita vältettävät solmut</string>
+  <string name="strict_nodes">Tarkat solmukohdat</string>
+  <string name="use_only_these_specified_nodes">Käytä *vain* näitä solmuja</string>
+  <string name="bridges">Sillat</string>
+  <string name="use_bridges">Käytä siltoja</string>
+  <string name="bridges_obfuscated">Hämärät sillat</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Salli vaihtoehtoiset sisääntulosolmut Tor-verkkoon</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Salli hämärien siltojen konfigurointi</string>
+  <string name="ip_address_and_port_of_bridges">Siltojen IP-osoitteet ja portit</string>
+  <string name="enter_bridge_addresses">Kirjoita siltaosoitteet</string>
+  <string name="relays">Releet</string>
+  <string name="relaying">Releytys</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Salli laitteen käyttö välireleenä</string>
+  <string name="relay_port">Releportti</string>
+  <string name="listening_port_for_your_tor_relay">Tor-releesi kuunteluportti</string>
+  <string name="enter_or_port">Kirjoita OR-portti</string>
+  <string name="relay_nickname">Releen kutsumanimi</string>
+  <string name="the_nickname_for_your_tor_relay">Kutsumanimi Tor-releellesi</string>
+  <string name="enter_a_custom_relay_nickname">Kirjoita mukautettu relenimi</string>
+  <string name="reachable_addresses">Saavutettavissa olevat osoitteet</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Aja asiakkaana rajoitetun palomuurin takaa</string>
+  <string name="reachable_ports">Saavutettavissa olevat portit</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Rajoitetun palomuurin takaa saavutettavat portit</string>
+  <string name="enter_ports">Kirjoita portit</string>
+  <string name="enable_hidden_services">Piilopalvelun isännöinti</string>
+  <string name="run_servers_accessible_via_the_tor_network">salli laitteensisäisen palvelimen käyttö osana Tor-verkkoa</string>
+  <string name="enter_localhost_ports_for_hidden_services">kirjoita sisäiset portit piilopalveluille</string>
+  <string name="hidden_service_ports">Piilopalveluiden portit</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">piilopalvelusi nimiosoite (luodaan automaattisesti)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">salli virheenjäljityslokin tulo tulostevirtaan (käytä adb:tä tai aLogCat:ia tarkastellaksesi)</string>
+  <string name="project_home">Projektin kotisivu(t):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor-lisenssi</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3:n osapuolen ohjelmisto:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Sovellus haluaa avata piilopalveluportin %S Tor-verkkoon. Tämä on turvallista, jos luotat sovellukseen.</string>
+  <string name="found_existing_tor_process">löytyi olemassaoleva Tor-prosessi...</string>
+  <string name="something_bad_happened">Jotain pahaa tapahtui. Tarkista loki</string>
+  <string name="hidden_service_on">piilopalvelun sijainti:</string>
+  <string name="unable_to_read_hidden_service_name">piilopalvelunimen lukeminen epäonnistui</string>
+  <string name="unable_to_start_tor">Torin käynnistys epäonnistui:</string>
+  <string name="unable_to_reset_tor">Toria ei voitu nollata, käynnistä laitteesi uudelleen!</string>
+  <string name="pref_use_sys_iptables_title">Käytä Ip-oletustauluja</string>
+  <string name="pref_use_sys_iptables_summary">käytä sisäänrakennettua Ip-taulubinääriä Orbotin mukana tulleen sijasta</string>
+  <string name="error_installing_binares">Tor-binääritiedostojen asentaminen tai päivitys epäonnistui.</string>
+  <string name="pref_use_persistent_notifications">Pidä kuvake aina työkalupalkissa, kun Orbot on yhdistetty</string>
+  <string name="pref_use_persistent_notifications_title">Ilmoitukset aina käytössä</string>
+  <string name="pref_use_expanded_notifications">Näytä laajennettu ilmoitus (Torin ulostulon maa ja IP)</string>
+  <string name="pref_use_expanded_notifications_title">Laajennetut ilmoitukset</string>
+  <string name="notification_using_bridges">Sillat käytössä!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Kieli</string>
+  <string name="set_locale_summary">Valitse maa-asetus ja kieli Orbit-sovellukselle</string>
+  <string name="wizard_locale_title">Valitse kieli</string>
+  <string name="wizard_locale_msg">Jätä oletusarvoon tai vaihda nykyiseen kieleen</string>
+  <string name="powered_by">perustuu Toriin</string>
+  <string name="btn_save_settings">Tallenna asetukset</string>
+  <string name="no_internet_connection_tor">Ei internet-yhteyttä; Tor on valmiustilassa...</string>
+  <string name="bandwidth_">Kaistanleveys:</string>
+  <string name="down">alas</string>
+  <string name="up">ylös</string>
+  <string name="pref_disable_network_title">Ei verkon automaattilepotilaa</string>
+  <string name="pref_disable_network_summary">Laita Tor nukkumaan, kun internet-yhteyttä ei ole saatavilla</string>
+  <string name="newnym">Vaihdoit Tor-identiteettisi uuteen!</string>
+  <string name="menu_use_chatsecure">Käytä ChatSecurea</string>
+  <string name="permission_manage_tor_label">Hallinnoi Toria</string>
+  <string name="permission_manage_tor_description">Anna tämän sovelluksen ohjata Tor-palvelua</string>
+  <string name="install_apps_">Asennetaanko sovelluksia?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Ei verkkoyhteyttä. Tor siirtyy valmiustilaan...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Verkkoyhteys toimii. Herätetään Tor...</string>
+  <string name="updating_settings_in_tor_service">päivitetään Tor-palvelun asetuksia</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Portti, jossa Torin SOCKS-proxy on (oletus: 9050, 0 = poista käytöstä)</string>
+  <string name="pref_socks_dialog">SOCKS-portin valinta</string>
+  <string name="pref_transport_title">Tor TransProxyn portti</string>
+  <string name="pref_transport_summary">Portti, jossa Torin läpinäkyvä välityspalvelin on (oletus: 9040, 0 = poista käytöstä)</string>
+  <string name="pref_transport_dialog">TransProxy-portin valinta</string>
+  <string name="pref_dnsport_title">Tor DNS-portti</string>
+  <string name="pref_dnsport_summary">Portti, jossa Torin DNS on (oletus: 5400, 0 = poista käytöstä)</string>
+  <string name="pref_dnsport_dialog">DNS-portin valinta</string>
+  <string name="pref_torrc_title">Torrc:n mukautetut asetukset</string>
+  <string name="pref_torrc_summary">VAIN ASIANTUNTIJAT: syötä torrc:n määritysrivejä suoraan</string>
+  <string name="pref_torrc_dialog">Mukautettu torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus - Benetechin ihmisoikeuksien dokumentaatiosovellus</string>
+  <string name="your_tor_public_ips_">Julkiset Tor-IP:si:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Poista tämä sovellus käytöstä kohdassa Android->Asetukset->Sovellukset, jos Orbotin kanssa on ongelmia:</string>
+  <string name="app_conflict">Sovellusristiriita</string>
+  <string name="pref_transproxy_refresh_title">Transproxyn automaattinen päivitys</string>
+  <string name="pref_transproxy_refresh_summary">Uudista Transproxy-säännöt, kun verkon tila muuttuu</string>
+  <string name="pref_transproxy_flush_title">Transproxyn PAKOTETTU POISTO</string>
+  <string name="pref_transproxy_flush_summary">Kosketa tätä tyhjentääksesi transproxyn verkkosäännöt VÄLITTÖMÄSTI</string>
+  <string name="transparent_proxy_rules_flushed_">Läpinäkyvän välityspalvelimen säännöt tyhjennetty!</string>
+  <string name="you_do_not_have_root_access_enabled">Sinulla ei ole ROOT-oikeuksia käytössä</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Saatat joutua pysäyttämään ja käynnistämään Orbotin, jotta asetusten muutos tulee käyttöön</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">Mbps</string>
+  <string name="kb">kt</string>
+  <string name="mb">Mt</string>
+  <string name="bridges_updated">Sillat päivitetty</string>
+  <string name="restart_orbot_to_use_this_bridge_">Käynnistä Orbot uudelleen ottaaksesi muutokset käyttöön</string>
+  <string name="menu_qr">QR-koodit</string>
+  <string name="bridge_mode">Siltatila</string>
+  <string name="get_bridges_email">Sähköposti</string>
+  <string name="get_bridges_web">Verkkosivu</string>
+  <string name="activate">Ota käyttöön</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Voit siirtää kaikki sovellukset laitteellasi kulkemaan Tor-verkon kautta Androidin VPN-toiminnolla.\n\n*VAROITUS* Tämä on uusi, kokeellinen ominaisuus, joka ei välttämättä käynnisty automaattisesti tai voi pysähtyä. Sitä EI pitäisi käyttää anonymiyteen, AINOASTAAN palomuurien ja suodatinten ohittamiseen.</string>
+  <string name="send_email">Lähetä sähköpostia</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Voit saada sillan osoitteen sähköpostin kautta, verkkosivulta tai skannaamalla sillan QR-koodin. Valitse \'Sähköposti\' tai \'Verkkosivu\' alta pyytääksesi sillan osoitetta.\n\nKun sinulla on osoite, kopioi & liitä se \"Sillat\" -kohtaan Orbotin asetuksissa ja käynnistä uudelleen.</string>
+  <string name="standard_browser">Normaali selain</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">HUOMAA: Vain standardit Tor-sillat toimivat Intel X86/ATOM -laitteilla.</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-fr-rFR/strings.xml b/orbotservice/src/main/res/values-fr-rFR/strings.xml
new file mode 100644
index 0000000..3a11d06
--- /dev/null
+++ b/orbotservice/src/main/res/values-fr-rFR/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot est une appli libre de serveur mandataire permettant aux applis d\'utiliser Internet avec une sécurité accrue. Orbot utilise Tor pour chiffrer votre trafic Internet et le cache ensuite en le relayant au travers d\'ordinateurs de par le monde. Tor est un logiciel libre et un réseau ouvert qui vous aide à vous défendre contre une forme de surveillance réseau qui menace la liberté personnelle et la protection des données personnelles, les activités professionnelles confidentielles et les relations, et l\'analyse du trafic des gouvernements.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">démarrer et arrêter Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot démarre...</string>
+  <string name="status_activated">Connecté au réseau Tor</string>
+  <string name="status_disabled">Orbot est désactivé</string>
+  <string name="status_shutting_down">TorService est en cours d\'extinction</string>
+  <string name="tor_process_starting">Démarrage du client Tor...</string>
+  <string name="tor_process_complete">terminé.</string>
+  <string name="tor_process_waiting">attente.</string>
+  <string name="not_anonymous_yet">AVERTISSEMENT : votre trafic n\'est pas encore anonyme ! Veuillez configurer vos applications pour qu\'elles utilisent le serveur mandataire HTTP 127.0.0.1:8118 ou le serveur mandataire SOCKS4A ou SOCKS5 à 127.0.0.1:9050</string>
+  <string name="menu_home">Accueil</string>
+  <string name="menu_browse">Parcourir</string>
+  <string name="menu_settings">Paramètres</string>
+  <string name="menu_log">Journal</string>
+  <string name="menu_info">Aide</string>
+  <string name="menu_apps">RPV</string>
+  <string name="menu_start">Démarrer</string>
+  <string name="menu_stop">Arrêter</string>
+  <string name="menu_about">À propos</string>
+  <string name="menu_promo_apps">Obtenir des applis...</string>
+  <string name="main_layout_download">Télchargement</string>
+  <string name="main_layout_upload">Téléversement</string>
+  <string name="button_help">Aide</string>
+  <string name="button_close">Fermer</string>
+  <string name="button_about">À propos</string>
+  <string name="button_clear_log">Effacer le journal</string>
+  <string name="menu_verify">Vérifier</string>
+  <string name="menu_exit">Quitter</string>
+  <string name="menu_scan">Balayer un code QR de pont</string>
+  <string name="menu_share_bridge">Partager un code QR de pont</string>
+  <string name="press_to_start">- appuyer longuement pour démarrer -</string>
+  <string name="pref_trans_proxy_group">Relayage transparent (root exigé)</string>
+  <string name="pref_trans_proxy_title">Relayage transparent</string>
+  <string name="pref_trans_proxy_summary">Torifaction automatique des applis</string>
+  <string name="pref_transparent_all_title">Tout passer par Tor</string>
+  <string name="pref_transparent_all_summary">Relayer le trafic de toutes les applis par Tor</string>
+  <string name="pref_transparent_port_fallback_title">Repli pour le relais de port</string>
+  <string name="pref_transparent_port_fallback_summary">AVERTISSEMENT : contourne les ports habituels (80, 443, etc). *À N\'UTILISER QUE* si les modes « Tout » ou « Appli » ne fonctionnent pas.</string>
+  <string name="pref_transparent_port_title">Liste des ports</string>
+  <string name="pref_transparent_port_summary">Liste des ports à relayer. *À N\'UTILISER QUE* si les modes « Tout » ou « Appli » ne fonctionnent pas.</string>
+  <string name="pref_transparent_port_dialog">Saisir les ports à relayer</string>
+  <string name="pref_has_root">Demander l\'accès Root</string>
+  <string name="pref_has_root_summary">Demander l\'accès Root pour un relayage transparent</string>
+  <string name="status_install_success">L\'exécutable de Tor a été installé avec succès !</string>
+  <string name="status_install_fail">Le fichier exécutable de Tor n\'a pu pas être installé. Veuillez vérifier le journal et le signaler à tor-assistants at torproject.org</string>
+  <string name="title_error">Erreur d\'application</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">À propos d\'Orbot</string>
+  <string name="btn_next">Suivant</string>
+  <string name="btn_back">Précédent</string>
+  <string name="btn_finish">Fin</string>
+  <string name="btn_okay">OK</string>
+  <string name="btn_cancel">Annuler</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Quelques détails sur Orbot</string>
+  <string name="wizard_details_msg">Orbot est une application à code source ouvert incluant Tor, LibEvent et Polipo. Elle fournit un mandataire local HTTP (8118) et un mandataire SOCKS (9050) vers le réseau Tor. Orbot a aussi la capacité, sur un appareil rooté, d\'envoyer tout le trafic Internet par Tor.</string>
+  <string name="wizard_permissions_root">Permission accordée</string>
+  <string name="wizard_permissions_stock">Permissions d\'Orbot</string>
+  <string name="wizard_premissions_msg_root">Excellent ! Nous avons détecté les permissions root sont activées pour Orbot. Nous utiliserons ce pouvoir avec discernement.</string>
+  <string name="wizard_permissions_msg_stock">Bien que cela ne soit pas exigé, Orbot peut devenir un outil plus puissant si votre appareil à l\'accès root. Utilisez le bouton ci-dessous pour accorder à Orbot des superpouvoirs !</string>
+  <string name="wizard_permissions_no_root">Si vous n\'avez pas l\'accès root ou n\'avez aucune idée de quoi l\'on parle, assurez-vous d\'utiliser des applis conçues pour fonctionner avec Orbot.</string>
+  <string name="wizard_permissions_consent">Je comprends et je souhaite continuer sans superpouvoir</string>
+  <string name="wizard_permission_enable_root">Accorder les droits Root à Orbot</string>
+  <string name="wizard_configure">Configurer la torification</string>
+  <string name="wizard_configure_msg">Orbot vous donne l\'option de faire passer tout le trafic applicatif par Tor OU de choisir les applications individuellement.</string>
+  <string name="wizard_configure_all">Relayer toutes les applis par Tor</string>
+  <string name="wizard_configure_select_apps">Choisir des applis pour Tor</string>
+  <string name="wizard_tips_tricks">Applis concues pour Orbot</string>
+  <string name="wizard_tips_msg">Les applis ci-dessous ont été développées pour fonctionner avec Orbot. Cliquez sur chaque bouton pour les installer maintenant, ou trouvez plus tard dans Google Play Store, sur le site Web GuardianProject.info ou avec F-Droid.org.</string>
+  <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="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="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>
+  <string name="wizard_final">Orbot est prêt !</string>
+  <string name="wizard_final_msg">Des millions de personnes de par le monde utilisent Tor pour une grande variété de raisons.\n\nDes journalistes et des blogueurs, des défenseurs des droits humains, des officiers des forces de l\'ordre, des soldats, des sociétés, des citoyens de régimes répressifs, et de simples citoyens... et maintenant vous êtes aussi prêt à l\'utiliser !</string>
+  <string name="wizard_exit_at_first_screen_toast">Veuillez configurer Orbot avant de pouvoir commencer à l\'utiliser !</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Vous vous êtes connecté au réseau Tor avec succès - mais cela NE SIGNIFIE PAS que votre appareil est sécurisé. Vous pouvez utiliser le bouton « Navigateur » pour tester votre connexion. \n\n Visitez https://guardianproject.info/apps/orbot ou envoyez un courriel à help at guardianproject.info pour en savoir davantage.</string>
+  <string name="tor_check">Ceci ouvrira votre navigateur Web sur https://check.torproject.org afin de déterminer si Orbot est convenablement configuré et si vous êtes connecté à Tor.</string>
+  <string name="pref_hs_group">Hébergement de services cachés</string>
+  <string name="pref_general_group">Général</string>
+  <string name="pref_start_boot_title">Démarrer Orbot à l\'amorçage</string>
+  <string name="pref_start_boot_summary">Démarrer Orbot automatiquement et se connecter à Tor lors de l\'amorçage de votre appareil Android</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot, c\'est Tor sur Android !\n\nTor vous aide à vous défendre contre le filtrage du contenu, l\'analyse du trafic et la surveillance du réseau qui menacent la vie privée, les informations confidentielles et les relations interpersonnelles.\n\nCet assistant vous aidera à configurer Orbot et Tor sur votre appareil.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Avertissement</string>
+  <string name="wizard_warning_msg">La simple installation d\'Orbot n\'anonymisera pas automatiquement votre trafic mobile.\n\nVous devez configurer Orbot adéquatement, ainsi que votre appareil et les autres applis pour utiliser Tor avec succès.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permissions</string>
+  <string name="wizard_permissions_root_msg1">Vous pouvez optionnellement accorder à Orbot un accès « superutilisateur » pour activer des options avancées, comme le relayage transparent.</string>
+  <string name="wizard_permissions_root_msg2">Si vous ne voulez pas le faire, veuillez vous assurer d\'utiliser des applis conçues pour fonctionner avec Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Votre appareil ne semble pas être rooté ou ne pas fournir l\'accès root ou super-utilisateur.\n\nVeuillez plutôt essayer le mode « Applis » de l\'écran principal.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox : navigateur à confidentialité améliorée fonctionnant sur Tor</string>
+  <string name="wizard_tips_play">Trouver toutes les applis du Projet Guardian sur Google Play</string>
+  <string name="wizard_tips_fdroid">Trouver toutes les applis du Projet Guardian sur F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Trouver toutes les applis du Projet Guardian sur https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Relayage transparent</string>
+  <string name="wizard_transproxy_msg">Ceci permet à vos applis d\'utiliser automatiquement le réseau Tor sans aucune configuration.</string>
+  <string name="wizard_transproxy_hint">(Cochez cette case si vous n\'avez aucune idée de ce dont nous parlons)</string>
+  <string name="wizard_transproxy_none">Aucun</string>
+  <string name="pref_transparent_tethering_title">Fonction modem avec Tor</string>
+  <string name="pref_transparent_tethering_summary">Activer le relayage transparent pour les périphériques utilisant la fonction modem soit par Wi-Fi ou par USB (redémarrage nécessaire)</string>
+  <string name="button_grant_superuser">Demander l\'accès superutilisateur</string>
+  <string name="pref_select_apps">Choisir les applis</string>
+  <string name="pref_select_apps_summary">Choisir les applis à acheminer par Tor</string>
+  <string name="pref_node_configuration">Configuration de nœud </string>
+  <string name="pref_node_configuration_summary">Ces paramètres avancés peuvent réduire votre anonymat</string>
+  <string name="pref_entrance_node">Nœuds d\'entrée</string>
+  <string name="pref_entrance_node_summary">Empreintes, pseudos, pays et adresses pour le premier saut</string>
+  <string name="pref_entrance_node_dialog">Saisir les nœuds d\'entrée</string>
+  <string name="pref_allow_background_starts_title">Permet des lancements en arrière-plan</string>
+  <string name="pref_allow_background_starts_summary">Laissez n\'importe quelle appli dire à Orbot de démarrer Tor et les services connexes</string>
+  <string name="button_proxy_all">Tout relayer</string>
+  <string name="button_proxy_none">Ne rien relayer</string>
+  <string name="button_invert_selection">Inverser la sélection</string>
+  <string name="pref_proxy_title">Mandataire pour le réseau sortant (optionnel)</string>
+  <string name="pref_proxy_type_title">Type de mandataire sortant</string>
+  <string name="pref_proxy_type_summary">Protocole à utiliser pour le serveur mandataire : HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Saisir le type de mandataire</string>
+  <string name="pref_proxy_host_title">Hôte du mandataire sortant</string>
+  <string name="pref_proxy_host_summary">Nom d\'hôte du serveur mandataire</string>
+  <string name="pref_proxy_host_dialog">Saisir l\'hôte mandataire</string>
+  <string name="pref_proxy_port_title">Port du mandataire sortant</string>
+  <string name="pref_proxy_port_summary">Port du serveur mandataire</string>
+  <string name="pref_proxy_port_dialog">Saisir le port du mandataire</string>
+  <string name="pref_proxy_username_title">Nom d\'utilisateur du mandataire sortant</string>
+  <string name="pref_proxy_username_summary">Nom d\'utilisateur du mandataire (optionnel)</string>
+  <string name="pref_proxy_username_dialog">Saisir le nom d\'utilisateur du mandataire</string>
+  <string name="pref_proxy_password_title">Mot de passe du mandataire sortant</string>
+  <string name="pref_proxy_password_summary">Mot de passe du mandataire (optionnel)</string>
+  <string name="pref_proxy_password_dialog">Saisir le mot de passe du mandataire</string>
+  <string name="status">État</string>
+  <string name="setting_up_full_transparent_proxying_">Configuration le relayage entièrement transparent...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Configuration d\'un relayage transparent par appli...</string>
+  <string name="transparent_proxying_enabled">Relayage transparent ACTIVÉ</string>
+  <string name="transproxy_enabled_for_tethering_">Relais transparent activé pour pour la fonction modem !</string>
+  <string name="warning_error_starting_transparent_proxying_">AVERTISSEMENT : erreur lors du démarrage du relayage transparent !</string>
+  <string name="transproxy_rules_cleared">Règles du relais transparent effacées</string>
+  <string name="couldn_t_start_tor_process_">Impossible de démarrer le processus Tor : </string>
+  <string name="privoxy_is_running_on_port_">Polipo tourne sur le port : </string>
+  <string name="setting_up_port_based_transparent_proxying_">Configuration du relayage transparent par port...</string>
+  <string name="bridge_error">Erreur de pont</string>
+  <string name="bridge_requires_ip">Afin de pouvoir utiliser la fonction pont, vous devez au moins saisir l\'adresse IP d\'un pont.</string>
+  <string name="send_email_for_bridges">Envoyez un courriel à bridges at torproject.org avec la ligne « get bridges », seule, dans le corps du courriel à partir d\'un compte Gmail. </string>
+  <string name="error">Erreur</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Vos paramètres ReachableAddresses (adresses accessibles) ont causé une exception !</string>
+  <string name="your_relay_settings_caused_an_exception_">Vos paramètres de relais ont causé une exception !</string>
+  <string name="exit_nodes">Nœuds de sortie</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Empreintes, pseudos, pays et adresses pour le dernier saut</string>
+  <string name="enter_exit_nodes">Saisir les noeuds de sortie</string>
+  <string name="exclude_nodes">Nœuds à exclure</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Empreintes, pseudos, pays et adresses à exclure</string>
+  <string name="enter_exclude_nodes">Saisir les nœuds à exclure</string>
+  <string name="strict_nodes">Nœuds stricts</string>
+  <string name="use_only_these_specified_nodes">Utiliser *uniquement * ces nœuds spécifiés</string>
+  <string name="bridges">Ponts</string>
+  <string name="use_bridges">Utiliser des ponts</string>
+  <string name="bridges_obfuscated">Ponts obscurcis</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Activer des nœuds alternatifs d\'entrée vers le réseau Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Activer si les ponts configurés sont des ponts obscurcis</string>
+  <string name="ip_address_and_port_of_bridges">Adresse IP et port des ponts</string>
+  <string name="enter_bridge_addresses">Saisir les adresses des ponts</string>
+  <string name="relays">Relais</string>
+  <string name="relaying">Relayage</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Configurez votre appareil pour être un relais de non-sortie</string>
+  <string name="relay_port">Port du relais</string>
+  <string name="listening_port_for_your_tor_relay">Port d\'écoute pour votre relais Tor</string>
+  <string name="enter_or_port">Saisir le port OR</string>
+  <string name="relay_nickname">Pseudo du relais</string>
+  <string name="the_nickname_for_your_tor_relay">Le pseudo de votre relais Tor</string>
+  <string name="enter_a_custom_relay_nickname">Saisir un pseudo personnalisé pour le relais</string>
+  <string name="reachable_addresses">Adresses accessibles</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Exécuter en tant que client derrière un pare-feu avec des politiques restrictives</string>
+  <string name="reachable_ports">Ports accessibles</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Ports accessibles derrière un pare-feu restrictif</string>
+  <string name="enter_ports">Saisir les ports</string>
+  <string name="enable_hidden_services">Hébergement de services cachés</string>
+  <string name="run_servers_accessible_via_the_tor_network">permettre aux serveurs sur l\'appareil d\'être accessibles par le réseau Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">saisir les ports de l\'hôte local pour les services cachés</string>
+  <string name="hidden_service_ports">Ports des services cachés</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">le nom adressable pour votre service caché (généré automatiquement)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">activer le journal de débogage vers la sortie (vous devez utiliser adb ou aLogCat pour le visualiser)</string>
+  <string name="project_home">Page(s) d\'accueil du projet :</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">La licence de Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Logiciels tiers :</string>
+  <string name="tor_version">Tor : https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21 : http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9 : https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21 : http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q : http://www.openssl.org</string>
+  <string name="hidden_service_request">Une appli veut ouvrir le port %S du serveur caché au réseau Tor. ceci est sécuritaire si vous faites confiance à l\'appli.</string>
+  <string name="found_existing_tor_process">un processus existant de Tor a été trouvé...</string>
+  <string name="something_bad_happened">Quelque chose n\'a pas été. Vérifiez le journal</string>
+  <string name="hidden_service_on">service caché sur :</string>
+  <string name="unable_to_read_hidden_service_name">impossible de lire le nom du service caché</string>
+  <string name="unable_to_start_tor">Impossible de démarrer Tor :</string>
+  <string name="unable_to_reset_tor">Redémarrez votre appareil, impossible de réinitialiser Tor !</string>
+  <string name="pref_use_sys_iptables_title">Utiliser les Iptables par défaut</string>
+  <string name="pref_use_sys_iptables_summary">Utiliser le binaire iptables intégré à la place du binaire intégré avec Orbot</string>
+  <string name="error_installing_binares">Les fichiers binaires de Tor n\'ont pas pu être installés ou mis à niveau.</string>
+  <string name="pref_use_persistent_notifications">Toujours conserver l\'icône dans la barre des tâches quand Orbot est connecté.</string>
+  <string name="pref_use_persistent_notifications_title">Toujours activer les notifications</string>
+  <string name="pref_use_expanded_notifications">Montrer des notifications étendues avec le pays de sortie de Tor et l\'IP</string>
+  <string name="pref_use_expanded_notifications_title">Notifications étendues</string>
+  <string name="notification_using_bridges">Les ponts sont activés !</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Langue</string>
+  <string name="set_locale_summary">Choisir les paramètres régionaux pour Orbot</string>
+  <string name="wizard_locale_title">Choisir la langue</string>
+  <string name="wizard_locale_msg">Laisser à la valeur par défaut ou changer la langue actuelle</string>
+  <string name="powered_by">propulsé par Tor</string>
+  <string name="btn_save_settings">Enregistrer les paramètres</string>
+  <string name="no_internet_connection_tor">Pas de connexion Internet ; Tor est en attente...</string>
+  <string name="bandwidth_">Bande passante :</string>
+  <string name="down">aval</string>
+  <string name="up">amont</string>
+  <string name="pref_disable_network_title">Pas de mise en veille automatique du réseau</string>
+  <string name="pref_disable_network_summary">Mettre Tor en veille quand aucune connexion Internet n\'est disponible</string>
+  <string name="newnym">Vous avez basculé vers une nouvelle identité Tor !</string>
+  <string name="menu_verify_browser">Navigateur</string>
+  <string name="menu_use_chatsecure">Utiliser ChatSecure</string>
+  <string name="permission_manage_tor_label">Gérer Tor</string>
+  <string name="permission_manage_tor_description">Autoriser cette appli à contrôler le service Tor</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Il semble qu\'Orfox n\'est pas installé. Voulez-vous de l\'aide à ce sujet ou devrions-nous juste ouvrir le navigateur ?</string>
+  <string name="install_apps_">Installer les applis ?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Pas de connectivité réseau. Mise au repos de Tor...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">La connectivité réseau est bonne. Réveil de Tor...</string>
+  <string name="updating_settings_in_tor_service">mise à jour des paramètres dans le service Tor</string>
+  <string name="pref_socks_title">SOCKS Tor</string>
+  <string name="pref_socks_summary">Port sur lequel Tor offre son mandataire SOCKS (par défaut : 9050 ou 0 pour le désactiver)</string>
+  <string name="pref_socks_dialog">Configuration du part SOCKS</string>
+  <string name="pref_transport_title">Port Transproxy de Tor</string>
+  <string name="pref_transport_summary">Port sur lequel Tor offre son mandataire transparent (par défaut : 9040 ou 0 pour le désactiver)</string>
+  <string name="pref_transport_dialog">Configuration du port TransProxy</string>
+  <string name="pref_dnsport_title">Port DNS de Tor</string>
+  <string name="pref_dnsport_summary">Port sur lequel Tor offre son DNS (par défaut : 5400 ou 0 pour le désactiver)</string>
+  <string name="pref_dnsport_dialog">Configuration du port DNS</string>
+  <string name="pref_torrc_title">Configuration personnalisée de Torrc</string>
+  <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="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>
+  <string name="pref_transproxy_refresh_title">Rafraîchissement automatique de Transproxy</string>
+  <string name="pref_transproxy_refresh_summary">Appliquer de nouveau les règles de Transproxy lors des changements d\'état du réseau</string>
+  <string name="pref_transproxy_flush_title">Transproxy ENLEVER DE FORCE</string>
+  <string name="pref_transproxy_flush_summary">Toquer ici pour vider toutes les règles réseau de transproxy MAINTENANT</string>
+  <string name="transparent_proxy_rules_flushed_">Les règles du mandataire transparent ont été vidées !</string>
+  <string name="you_do_not_have_root_access_enabled">L\'accès ROOT n\'est pas activé</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Vous pourriez avoir à arrêter et démarrer Orbot pour que les changements de paramètres soient activés.</string>
+  <string name="menu_vpn">RPV</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">Ko</string>
+  <string name="mb">Mo</string>
+  <string name="bridges_updated">Ponts mis à jour</string>
+  <string name="restart_orbot_to_use_this_bridge_">Veuillez redémarrer Orbot pour activer les changements</string>
+  <string name="menu_qr">Codes QR</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Si votre réseau mobile bloque Tor activement, vous pouvez utiliser un pont pour accéder au réseau.\n\nCHOISIR un des types de ponts ci-dessus pour activer les ponts.</string>
+  <string name="bridge_mode">Mode pont</string>
+  <string name="get_bridges_email">Courriel</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Activer</string>
+  <string name="apps_mode">Mode RPV des applis</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Vous pouvez activer le relais de toutes les applis par le réseau Tor en utilisant la fonction de RPV d\'Android.\n\n*AVERTISSEMENT* Cette fonction est nouvelle et expérimentale et pourrait parfois ne pas démarrer automatiquement, et même s\'arrêter. Elle ne devrait PAS être utilisée pour l\'anonymat, et être SEULEMENT utilisée pour passer les pare-feu et les filtres.</string>
+  <string name="send_email">Envoyer un courriel</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Vous pouvez obtenir une adresse de pont par courriel, par le Web ou en balayant le code QR d\'un pont. Choisissez *Courriel* ou *Web* ci-dessous pour demander une adresse de pont.\n\nUne fois que vous avez une adresse, copiez & collez-la dans le champ « Ponts » des paramètres d\'Orbot et redémarrez.</string>
+  <string name="install_orweb">Installer Orfox</string>
+  <string name="standard_browser">Navigateur standard</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Note : seuls les ponts Tor standards fonctionnent sur les appareils Intel X86/ATOM</string>
+  <string name="vpn_default_world">Monde</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-fr/strings.xml b/orbotservice/src/main/res/values-fr/strings.xml
new file mode 100644
index 0000000..fa05133
--- /dev/null
+++ b/orbotservice/src/main/res/values-fr/strings.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot est une application proxy gratuite qui améliore l\'utilisation plus sécurisée des applications. Orbot utilise Tor pour crypter votre trafic internet et le cacher en passant par une série d\'ordinateur partout dans le monde. Tor est un logiciel gratuit et un réseau ouvert qui vous aide à vous défendre contre les surveillances de réseau qui font peur à la liberté personnelle et la vie privée, les activités confidentielles des entreprises et des relations, et l\'état de la sécurité connu sous le nom d\'analyse de trafic.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">Démarrer et arrêter Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Démarrage de Orbot...</string>
+  <string name="status_activated">Connecté au réseau Tor</string>
+  <string name="status_disabled">Orbot est désactivé</string>
+  <string name="status_shutting_down">Le service Tor est en cours de fermeture</string>
+  <string name="tor_process_starting">Démarrage du client Tor...</string>
+  <string name="tor_process_complete">terminé.</string>
+  <string name="tor_process_waiting">en attente.</string>
+  <string name="not_anonymous_yet">ATTENTION : Votre trafic n\'est pas encore anonyme ! Veuillez configurer votre application pour utiliser le proxy HTTP 127.0.0.1:8118 ou le proxy SOCKS4A ou SOCKS5A 172.0.0.1:9050</string>
+  <string name="menu_home">Accueil</string>
+  <string name="menu_browse">Naviguer</string>
+  <string name="menu_settings">Paramètres</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Aide</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Démarrer</string>
+  <string name="menu_stop">Arrêter</string>
+  <string name="menu_about">A propos</string>
+  <string name="menu_promo_apps">Obtenir des applications</string>
+  <string name="main_layout_download">Télécharger</string>
+  <string name="main_layout_upload">Envoyer</string>
+  <string name="button_help">Aide</string>
+  <string name="button_close">Fermer</string>
+  <string name="button_about">A propos</string>
+  <string name="button_clear_log">Effacer la log</string>
+  <string name="menu_verify">Vérifier</string>
+  <string name="menu_exit">Quitter</string>
+  <string name="menu_scan">Analyser BridgeQR</string>
+  <string name="menu_share_bridge">Partager BridgeQR</string>
+  <string name="press_to_start">- appui long pour commencer -</string>
+  <string name="pref_trans_proxy_group">Passage du trafic Internet de manière transparente (Requiert le Root)</string>
+  <string name="pref_trans_proxy_title">Passage du trafic Internet de manière transparente</string>
+  <string name="wizard_title">Orbot</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Passage du trafic Internet de manière transparente</string>
+  <string name="default_bridges"></string>
+  <string name="menu_vpn">VPN</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-gl/strings.xml b/orbotservice/src/main/res/values-gl/strings.xml
new file mode 100644
index 0000000..8496d4b
--- /dev/null
+++ b/orbotservice/src/main/res/values-gl/strings.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot é unha aplicación de proxy libre que permite a outras aplicacións usar a internet dun xeito máis seguro. Orbot usa Tor para encriptar o teu tráfico de internet ocultando e rebotándoo a través dunha serie de ordenadores ao redor do mundo. Tor é software libre e unha rede aberta que axuda a defenderte contra unha forma de vixiancia na rede que ameaza a liberdade e privacidade persoal, actividades confidenciáis de negocios e relacións, e estado de seguridade coñecido como análise de tráfico.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">iniciar e deter Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot está a se iniciar...</string>
+  <string name="status_activated">Conectado á rede Tor</string>
+  <string name="status_disabled">Orbot está desactivado</string>
+  <string name="tor_process_starting">Iniciando cliente Tor...</string>
+  <string name="tor_process_complete">completado.</string>
+  <string name="tor_process_waiting">á espera.</string>
+  <string name="not_anonymous_yet">AVISO: o teu tráfico aínda non é anónimo! Por favor, configura os teus aplicativos para uxar o proxy HTTP 127.0.0.1:8118 ou SOCKS4A ou o proxy SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Inicio</string>
+  <string name="menu_browse">Examinar</string>
+  <string name="menu_settings">Axustes</string>
+  <string name="menu_log">Rexistro (log)</string>
+  <string name="menu_info">Axuda</string>
+  <string name="menu_start">Iniciar</string>
+  <string name="menu_stop">Deter</string>
+  <string name="menu_about">Sobre</string>
+  <string name="main_layout_download">Descargar</string>
+  <string name="main_layout_upload">Cargar</string>
+  <string name="button_help">Axuda</string>
+  <string name="button_close">Pechar</string>
+  <string name="button_about">Sobre</string>
+  <string name="button_clear_log">Limpar rexistro</string>
+  <string name="menu_verify">Comprobar</string>
+  <string name="menu_exit">Saír </string>
+  <string name="press_to_start">- toque longo para comezar-</string>
+  <string name="pref_trans_proxy_group">Proxyficación transparente (cómpre ser root)</string>
+  <string name="pref_trans_proxy_title">Proxyficación transparente</string>
+  <string name="pref_trans_proxy_summary">Torificación Automática dos Aplicativos</string>
+  <string name="pref_transparent_all_title">Tor para todo</string>
+  <string name="pref_transparent_all_summary">Pasar todo o tráfico dos aplicativos por Tor</string>
+  <string name="pref_transparent_port_fallback_title">Porto de Reserva do Proxy</string>
+  <string name="pref_transparent_port_fallback_summary">ATENCIÓN: Evita os portos comúns (80, 443, etc). * USAR SÓ* se os modos  \'Todo\' ou \'Aplicación\' non funcionan.</string>
+  <string name="pref_transparent_port_title">Lista de Portos</string>
+  <string name="pref_transparent_port_summary">Lista de portos a pasar. *USAR SÓ* se os modos \'Todo\' ou \'Aplicación\' non funcionan</string>
+  <string name="pref_transparent_port_dialog">Introduza os portos a pasar</string>
+  <string name="pref_has_root">Requerir Acceso de Superusuario</string>
+  <string name="pref_has_root_summary">Requerir acceso de root para proxy transparente</string>
+  <string name="status_install_success">Se instalaron con éxito os binarios de Tor!</string>
+  <string name="status_install_fail">Non se puideron instalar os ficheiros binarios de Tor. Por favor, comprobe o rexistro e notifíqueo a tor-assistants at torproject.org</string>
+  <string name="title_error">Erro de Aplicativo</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Acerca de Orbot</string>
+  <string name="btn_next">Seguinte</string>
+  <string name="btn_back">Atrás</string>
+  <string name="btn_finish">Rematar</string>
+  <string name="btn_okay">Aceptar</string>
+  <string name="btn_cancel">Cancelar</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Algúns detalles sobre Orbot</string>
+  <string name="wizard_permissions_root">Permiso Concedido</string>
+  <string name="wizard_permissions_stock">Permisos de Orbot</string>
+  <string name="wizard_premissions_msg_root">Excelente! Detectamos que ten permisos de root habilitados para Orbot. Empregaremos este poder sabiamente.</string>
+  <string name="wizard_permissions_msg_stock">Aínda que non é necesario, Orbot pode ser unha ferramenta máis poderosa se o seu dispositivo ten acceso de root. Use o botón de abaixo para dar superpoderes a Orbot!</string>
+  <string name="wizard_permissions_no_root">Se non ten acceso de root ou non tén nin idea de  qué lle estamos a falar, asegúrese de usar aplicativos que funcionen con Orbot.</string>
+  <string name="wizard_permissions_consent">Entendo e gostaríame continuar sen Superusuario</string>
+  <string name="wizard_permission_enable_root">Conceder Root a Orbot</string>
+  <string name="wizard_configure">Configurar Torificación</string>
+  <string name="wizard_configure_msg">Orbot dá-lle a opción de enrutar todo o tráfico dos aplicativos a través de Tor OU elexir ditos aplicativos individualmente.</string>
+  <string name="wizard_configure_all">Enviar Todos os Aplicativos Por Tor</string>
+  <string name="wizard_configure_select_apps">Elixir Aplicativos Individuais por Tor</string>
+  <string name="wizard_tips_tricks">Aplicativos habilitados para Tor</string>
+  <string name="wizard_tips_msg">Os aplicativos de abaixo foron programados para funcionar con Orbot. Prema en cada botón para instalar agora, ou os pode atopar despóis en Google Play, no sitio web GuardianProject.info ou en F-Droid.org.</string>
+  <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="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>
+  <string name="wizard_final">Orbot está listo!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Isto abrirá no seu navegador https://check.torproject.org para ver se Obrbot está configurado probablemente e se está conectado a Tor.</string>
+  <string name="pref_hs_group">Aloxamento Oculto de Servizo</string>
+  <string name="pref_general_group">Xeral</string>
+  <string name="pref_start_boot_title">Inciar Orbot no Arranque</string>
+  <string name="pref_start_boot_summary">Iniciar Orbot automáticamente cando o seu dispositivo Android arranque</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Aviso</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permisos</string>
+  <string name="wizard_permissions_root_msg1">Opcionalmente pode darlle a Orbot acceso de \'Superusuario\' para habilitar características avanzadas, como o Proxy Transparente.</string>
+  <string name="wizard_permissions_root_msg2">Se non quere facer isto, por favor asegúrese de usar aplicativos feitos para traballar con Orbot</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Atope todos os aplicativos de Guardian Project apps en Google Play</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxy Transparente</string>
+  <string name="wizard_transproxy_msg">Isto permite que os seus aplicativos funcionen a través de rede Tor sen ningunha configuración.</string>
+  <string name="wizard_transproxy_hint">(Marque esta caixa se non ten nin idea do que lle estamos a falar)</string>
+  <string name="wizard_transproxy_none">Ningunha</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Habilitar Proxy Transparente Tor para dispositivos enlazados por Wifi ou USB (require reiniciar)</string>
+  <string name="button_grant_superuser">Pedir Acceso de Superusuario</string>
+  <string name="pref_select_apps">Seleccionar Aplicativos</string>
+  <string name="pref_select_apps_summary">Elixir Aplicativos a Enrutar a Través de Tor</string>
+  <string name="pref_node_configuration">Configuración de Nodo</string>
+  <string name="pref_node_configuration_summary">Estes son axuste avanzados que poden reducir o seu anonimato</string>
+  <string name="pref_entrance_node">Nodos de Entrada</string>
+  <string name="pref_entrance_node_summary">Huellas, alias, países e direccións para o primeiro salto</string>
+  <string name="pref_entrance_node_dialog">Introduzca Nodos de Entrada</string>
+  <string name="pref_proxy_title">Proxy para a Rede de Saída (Opcional)</string>
+  <string name="pref_proxy_type_title">Tipo de Proxy de Saída</string>
+  <string name="pref_proxy_type_summary">Protocolo a usar para o servidor proxy: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Introduzca Tipo de Proxy</string>
+  <string name="pref_proxy_host_title">Host de Proxy de Saída</string>
+  <string name="pref_proxy_host_summary">Nome do Host Proxy Servidor</string>
+  <string name="pref_proxy_host_dialog">Introduzca o Host Proxy</string>
+  <string name="pref_proxy_port_title">Porto do Proxy de Saída</string>
+  <string name="pref_proxy_port_summary">Porto do Servidor Proxy</string>
+  <string name="pref_proxy_port_dialog">Introduzca o porto do Proxy</string>
+  <string name="pref_proxy_username_title">Nome de usuario do Proxy de Saída</string>
+  <string name="pref_proxy_username_summary">Nome de Usuario do Proxy (Opcional)</string>
+  <string name="pref_proxy_username_dialog">Introduza o Nome de Usuario do Proxy</string>
+  <string name="pref_proxy_password_title">Contrasinal do Proxy de Saída</string>
+  <string name="pref_proxy_password_summary">Contrasinal do Proxy (Opcional)</string>
+  <string name="pref_proxy_password_dialog">Introduza Contrasinal do Proxy</string>
+  <string name="status">Estado</string>
+  <string name="setting_up_full_transparent_proxying_">Preparando proxy transparente completo...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Preparando proxy transparente baseado en aplicativo...</string>
+  <string name="transparent_proxying_enabled">Proxy Transparente HABILITADO</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy habilitado para Enlazamento!</string>
+  <string name="warning_error_starting_transparent_proxying_">ATENCIÓN: erro arrancando o proxy transparente!</string>
+  <string name="transproxy_rules_cleared">Regras TransProxy limpadas</string>
+  <string name="couldn_t_start_tor_process_">No se pudio inciar o proceso Tor:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Preparando proxy transparente baseado en porto...</string>
+  <string name="bridge_error">Erro de Ponte</string>
+  <string name="bridge_requires_ip">Para usar a característica de ponte, debe introducir cando menos unha dirección IP de ponte.</string>
+  <string name="send_email_for_bridges">Envíe un email a bridges at torproject.org só coa liña \"get bridges\" no corpo do correo dende unha conta de gmail.</string>
+  <string name="error">Erro</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">O seu axuste de ReachableAddresses causou unha excepción!</string>
+  <string name="your_relay_settings_caused_an_exception_">Os seus axustes de relay causou unha excepción!</string>
+  <string name="exit_nodes">Nodos de Saída</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Huellas, alias, países e direccións para o último salto</string>
+  <string name="enter_exit_nodes">Introduza Nodos de Saída</string>
+  <string name="exclude_nodes">Excluir Nodos</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Huellas, alias, países e direccións a excluír</string>
+  <string name="enter_exclude_nodes">Introduza Nodos Excluídos</string>
+  <string name="strict_nodes">Nodos Estritos</string>
+  <string name="use_only_these_specified_nodes">Usar *só* este nodos específicos</string>
+  <string name="bridges">Pontes</string>
+  <string name="use_bridges">Usar Pontes</string>
+  <string name="bridges_obfuscated">Pontes Ofuscadas</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilitar nodos alternativos de entrada á rede Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilitar se oas pontes configuradas son pontes ofuscadas</string>
+  <string name="ip_address_and_port_of_bridges">Dirección IP e porto das pontes</string>
+  <string name="enter_bridge_addresses">Introduza Direccións das Pontes</string>
+  <string name="relays">Reenvíos</string>
+  <string name="relaying">Reenvío</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Habilite o seu dispositivo para ser un reenvío non de saída</string>
+  <string name="relay_port">Porto de Reenvío</string>
+  <string name="listening_port_for_your_tor_relay">Porto de Escoita do seu reenvío Tor</string>
+  <string name="enter_or_port">Introduza o porto OR</string>
+  <string name="relay_nickname">Alias de Reenvío</string>
+  <string name="the_nickname_for_your_tor_relay">Seu alias para reenvío de Tor</string>
+  <string name="enter_a_custom_relay_nickname">Introduza un alias personalizado de reenvío</string>
+  <string name="reachable_addresses">Direccións Alcanzábeis</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Executar como un cliente detrás dun firewall con políticas restritivas</string>
+  <string name="reachable_ports">Portos Alcanzábeis</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Portos alcanzábeis detrás dun firewall restritivo</string>
+  <string name="enter_ports">Inserir portos</string>
+  <string name="enable_hidden_services">Aloxamento de Servizo Oculto</string>
+  <string name="run_servers_accessible_via_the_tor_network">permitir ao servidor no dispositivo estar accesible na rede Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">introduza os portos localis para servizos ocultos</string>
+  <string name="hidden_service_ports">Portos de Servicios Ocultos</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">nome para referirse ao seu servizo oculto (xenerado automáticamente)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">habilitar rexistro de depuración na saída (debe usar adb ou aLogCat para ver)</string>
+  <string name="project_home">Páxina(s) de Inicio do Proxecto:</string>
+  <string name="the_tor_license">A Licencia de Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Software de Terceiros:</string>
+  <string name="hidden_service_request">Un aplicativo quere abrir o porto do servidor oculto %S na rede Tor. Isto é seguro se confía no aplicativo.</string>
+  <string name="found_existing_tor_process">atopado proceso Tor existente...</string>
+  <string name="something_bad_happened">Algo malo pasou. Comprobe o rexistro</string>
+  <string name="hidden_service_on">servizo oculto en:</string>
+  <string name="unable_to_read_hidden_service_name">imposible ler nome de servizo oculto</string>
+  <string name="unable_to_start_tor">Incapaz de arrancar Tor</string>
+  <string name="pref_use_sys_iptables_title">Usar iptables por Defecto</string>
+  <string name="pref_use_sys_iptables_summary">usar o binario de iptables instalado en lugar do empaquetado con Orbot</string>
+  <string name="error_installing_binares">Non se puideron instalar ou actualizar os binarios de Tor</string>
+  <string name="pref_use_persistent_notifications">Mostrar sempre a icona na barra de ferramentas cando Orbot estea conectado</string>
+  <string name="pref_use_persistent_notifications_title">Notificacións Sempre Acesas</string>
+  <string name="notification_using_bridges">Pontes habilitadas!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Elixir locale e idioma para Orbot</string>
+  <string name="wizard_locale_title">Escoller idioma</string>
+  <string name="wizard_locale_msg">Deixar por defecto ou cambiar ao idioma actual</string>
+  <string name="btn_save_settings">Gardar os axustes</string>
+  <string name="bandwidth_">Ancho de Banda:</string>
+  <string name="down">caído</string>
+  <string name="up">levantado</string>
+  <string name="pref_disable_network_title">Auto-Parado Sen Rede</string>
+  <string name="pref_disable_network_summary">Parar Tor cando non hai conexión a internet</string>
+  <string name="newnym">Cambiou a unha nova identidade Tor!</string>
+  <string name="menu_use_chatsecure">Usar ChatSecure</string>
+  <string name="permission_manage_tor_label">Xestionar Tor</string>
+  <string name="permission_manage_tor_description">Hablitar este aplicativo para controlar o servicio Tor</string>
+  <string name="install_apps_">Instalar aplicativos?</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-gu-rIN/strings.xml b/orbotservice/src/main/res/values-gu-rIN/strings.xml
new file mode 100644
index 0000000..bfb4b94
--- /dev/null
+++ b/orbotservice/src/main/res/values-gu-rIN/strings.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="btn_cancel">રદ કરો</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">પ્રોક્સી ગોઠવણીઓ</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-gu/strings.xml b/orbotservice/src/main/res/values-gu/strings.xml
new file mode 100644
index 0000000..3965a3d
--- /dev/null
+++ b/orbotservice/src/main/res/values-gu/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_info">મદદ</string>
+  <string name="button_help">મદદ</string>
+  <string name="button_close">બંધ કરો</string>
+  <string name="btn_cancel">રદ્ કરો</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">પ્રોક્સી ગોઠવણીઓ</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-he/strings.xml b/orbotservice/src/main/res/values-he/strings.xml
new file mode 100644
index 0000000..e5e33f9
--- /dev/null
+++ b/orbotservice/src/main/res/values-he/strings.xml
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot הינה אפליקציית פרוקסי חינמית המאפשרת לאפליקציות אחרות להשתמש באינטרנט בבטחה. Orbot נעזרת ב-Tor כדי להצפין את תעבורת האינטרנט שלך ולהסוותה באמצעותה ניתובה דרך מספר מחשבים ברחבי העולם. Tor היא תוכנה חופשית ורשת פתוחה המסייעת לך להתגונן מפני סוגים מסוימים של אמצעי ניטור ומעקב אחר רשת האינטרנט המאיימים על הפרטיות, החירות האישית, פעילויות עסקיות ומערכות יחסים חשאיות.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">התחל ועצור את Tor</string>
+  <string name="tor_proxy_service_process">שירות פרוקסי Tor</string>
+  <string name="status_starting_up">Orbot מתחיל…</string>
+  <string name="status_activated">מחובר לרשת Tor</string>
+  <string name="status_disabled">Orbot כבוי</string>
+  <string name="tor_process_starting">מתחיל לקוח Tor...</string>
+  <string name="tor_process_complete">הושלם.</string>
+  <string name="tor_process_waiting">מחכה.</string>
+  <string name="not_anonymous_yet">אזהרה: התעבורה שלך אינה אנונימית עדיין! בבקשה הגדר את האפליקציות שלך כך שיתאפשר שימוש בפרוקסי HTTP (קרי 127.0.0.1:8118) או SOCKS4A או SOCKS5 (קרי 127.0.0.1:9050)</string>
+  <string name="menu_home">בית</string>
+  <string name="menu_browse">דפדף</string>
+  <string name="menu_settings">הגדרות</string>
+  <string name="menu_log">רישום</string>
+  <string name="menu_info">עזרה</string>
+  <string name="menu_start">התחל</string>
+  <string name="menu_stop">עצור</string>
+  <string name="menu_about">אודות</string>
+  <string name="main_layout_download">הורדה</string>
+  <string name="main_layout_upload">העלאה</string>
+  <string name="button_help">עזרה</string>
+  <string name="button_close">סגור</string>
+  <string name="button_about">אודות</string>
+  <string name="button_clear_log">נקה רישום</string>
+  <string name="menu_verify">בדוק</string>
+  <string name="menu_exit">יציאה</string>
+  <string name="menu_scan">סרוק BridgeQR</string>
+  <string name="menu_share_bridge">שתף BridgeQR</string>
+  <string name="press_to_start">-נגיעה ארוכה להתחלה-</string>
+  <string name="pref_trans_proxy_group">פרוקסי שקוף (שורש נדרש)</string>
+  <string name="pref_trans_proxy_title">פרוקסי שקוף</string>
+  <string name="pref_trans_proxy_summary">עבודה אוטומטית עם אפליקציות דרך Tor</string>
+  <string name="pref_transparent_all_title">הכל דרך Tor</string>
+  <string name="pref_transparent_all_summary">תעבור דרך פרוקסי  עבור כל האפליקציות דרך Tor</string>
+  <string name="pref_transparent_port_fallback_title">מפלט פורט פרוקסי</string>
+  <string name="pref_transparent_port_fallback_summary">אזהרה: עקוף פורטים נפוצים (80,443 וכו\'). *השתמש רק* אם האופנים \'All\' או \'App\'  לא עובדים.</string>
+  <string name="pref_transparent_port_title">רשימת פורטים</string>
+  <string name="pref_transparent_port_summary">רשימת פורטים לפרוקסי. *השתמש רק* אם האופנים \'All\' או \'App\'  לא עובדים.</string>
+  <string name="pref_transparent_port_dialog">הזן פורטים לפרוקסי</string>
+  <string name="pref_has_root">דרושה גישת שורש</string>
+  <string name="pref_has_root_summary">בקש גישה עליונה עבור שימוש בפרוקסי שקוף</string>
+  <string name="status_install_success">קבצים ברי הרצה של Tor הותקנו בהצלחה!</string>
+  <string name="status_install_fail">הקבצים ברי ההרצה של Tor לא ניתנו להתקנה. בבקשה בדוק את הלוג והודע ל 
+tor-assistants at torproject.org</string>
+  <string name="title_error">שגיאת אפליקציה</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">אודות Orbot</string>
+  <string name="btn_next">הבא</string>
+  <string name="btn_back">הקודם</string>
+  <string name="btn_finish">סיים</string>
+  <string name="btn_okay">אישור</string>
+  <string name="btn_cancel">ביטול</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">פרטים מסוימים של Orbot </string>
+  <string name="wizard_details_msg">Orbot היא אפליקציית קוד פתוח הכוללת את Tor, LibEvent ו-Polipo. היא מתחבר לרשת Tor באמצעות שרת פרוקסי HTTP מקומי (8118) ושרת פרוקסי SOCKS (פורט 9050). Orbot יכולה בנוסף עם הרשאות רוט לנתב את כל תעבורת האינטרנט של המכשיר דרך Tor כברירת מחדל.</string>
+  <string name="wizard_permissions_root">ניתנה הרשאה</string>
+  <string name="wizard_permissions_stock">הרשאות Orbot</string>
+  <string name="wizard_premissions_msg_root">מצוין! גילינו כי יש לך הרשאות שורש מאופשרות בשביל Orbot. אנחנו נשתמש בכוח הזה בחוכמה.</string>
+  <string name="wizard_permissions_msg_stock">בזמן שזה לא נדרש, Orbot יכולה להפוך להיות כלי חזק יותר אם למכשיר שלך יש גישה עליונה. תשתמש בכפתור למטה כדי לקבל כוחות על של Orbot !</string>
+  <string name="wizard_permissions_no_root">אם אין לך גישה עליונה או אין לך מושג על מה אנחנו מדברים, רק תוודא שתשתמש באפליקציות שנועדו לעבוד עם Orbot.</string>
+  <string name="wizard_permissions_consent">הבנתי ואני מעדיף להמשיך בלי Superuser</string>
+  <string name="wizard_permission_enable_root">אפשר גישת שורש עבור Orbot</string>
+  <string name="wizard_configure">הגדר עבודה באמצעות Tor</string>
+  <string name="wizard_configure_msg">Orbot נותנת לך אפשרות לכוון את כל תעבורת האפליקציות דרך Tor או לבחור את האפליקציות שלך בנפרד.</string>
+  <string name="wizard_configure_all">השתמש בפרוקסי בכל האפליקציות דרך Tor</string>
+  <string name="wizard_configure_select_apps">בחר אפליקציות מסוימות עבור Tor</string>
+  <string name="wizard_tips_tricks">Orbot מתאפשר על ידי אפליקציות</string>
+  <string name="wizard_tips_msg">האפליקציות מתחת פותחו לעבודה עם Orbot. לחץ על כל כפתור להתקנה מיידית, או שאתה יכול למצוא אותם אחר כך ב Google Play, באתר GuardianProject.info או
+דרך  F-Droid.org</string>
+  <string name="wizard_tips_otrchat">ChatSecure - תוכנת מסרים מידיים מאובטחת לאנדרואיד</string>
+  <string name="wizard_tips_proxy">הגדרות פרוקסי - למד איך להגדיר אפליקציות לעבוד עם Orbot</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo אפליקציית מנוע חיפוש</string>
+  <string name="wizard_tips_twitter">קבע פרוקסי Twitter למארח \"localhost\" ולפורט 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - מערך שיעורים לעיתונאים על שימוש ב-Tor להגנה על עבודתם.</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_proxy_help_msg">אם אפליקצת האנדרואיד שאתה משתמש תומכת בפרוקסי מבוסס HTTP או SOCKS, תוכל להגדיר אותה לעבוד עם Orbot תחת Tor. \n\n\n ההגדרות הן: שם השרת הוא 127.0.0.1 או \"localhost\". עבור HTTP, הפורט הוא 8118. עבור SOCKS, הפורט הוא 9050. עליך להשתמש בSOCKS4A או SOCKS5 אם אפשר.\n \n\n\n תוכל ללמוד עוד אודות פרוקסי באנדרואיד תחת עמוד השאלות הנפוצות שלנו בכתובת: http://tinyurl.com/proxyandroid </string>
+  <string name="wizard_final">Orbot מוכן!</string>
+  <string name="wizard_final_msg">מיליוני אנשים ברחבי העולם משתמשים בTor מסיבות רבות.\n\n עיתונאים ובלוגרים, פעילי זכויות אדם, שוטרים, חיילים, תאגידים, אזרחי במשטרים מדוגאים וגם אזרחים פשוטים... ועכשיו גם אתה!</string>
+  <string name="wizard_exit_at_first_screen_toast">אנא הגדר את Orbot לפני שתוכל להתחיל להשתמש בה!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">דבר זה יוביל את דפדפן הרשת שלך למוד https://check.torproject.org כדי לראות אם Orbot הוגדרה כראוי וכן כי אתה מחובר לרשת Tor.</string>
+  <string name="pref_hs_group">איחסון שירותים נסתרים</string>
+  <string name="pref_general_group">כללי</string>
+  <string name="pref_start_boot_title">התחל את Orbot בהדלקת המכשיר</string>
+  <string name="pref_start_boot_summary">התחל את Orbot והתחבר לרשת Tor אוטומטית כאשר המכשיר נדלק</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">אזהרה</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">הרשאות</string>
+  <string name="wizard_permissions_root_msg1">אתה יכול להעניק לאפליקציה Orbot גישת \'Superuser\' כדי לאפשר מאפיינים מתקדמים כמו למשל, פרוקסי שקוף.</string>
+  <string name="wizard_permissions_root_msg2">אם אתה לא רוצה לעשות את זה, אנא הקפד להשתמש באפליקציות שיועדו לעבוד עם Orbot</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot-יישומים מופעלים</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: אפליקציית מסרים עם הצפנת Off-the-Record</string>
+  <string name="wizard_tips_play">מצא את כל אפליציות Guardian Project אצל Google Play</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">פרוקסי שקוף</string>
+  <string name="wizard_transproxy_msg">זה מאפשר לאפליקציות שלך לרוץ באופן אוטומטי דרך רשת Tor ללא כל תצורה.</string>
+  <string name="wizard_transproxy_hint">(סמן תיבה זו אם אין לך מושג על מה אנחנו מדברים)</string>
+  <string name="wizard_transproxy_none">כלום</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">מאפשר עבודה עם פרוקסי שקוף עבור רשת אלחוטית ומכשירי  USB Tethered (דורש אתחול מחדש)</string>
+  <string name="button_grant_superuser">דרוש אישור Superuser</string>
+  <string name="pref_select_apps">בחר אפלקציות</string>
+  <string name="pref_select_apps_summary">בחר אפלקציות</string>
+  <string name="pref_node_configuration">הגדרות Node</string>
+  <string name="pref_node_configuration_summary">קיימות הגדרות מתקדמות שיכולות להפחית את האנונימיות שלך</string>
+  <string name="pref_entrance_node">Entrance Nodes</string>
+  <string name="pref_entrance_node_summary">טביעות אצבע, כינויים, ארצות וכתובות עבור המעבר הראשון</string>
+  <string name="pref_entrance_node_dialog">הכנס Entrance Nodes</string>
+  <string name="button_proxy_all">העבר הכל דרך פרוקסי</string>
+  <string name="button_proxy_none">אל תשתמש בפרוקסי</string>
+  <string name="button_invert_selection">הפוך בחירה</string>
+  <string name="pref_proxy_type_title">Outbound Proxy Type</string>
+  <string name="pref_proxy_type_summary">פרוטוקול שימוש בשרת פרוקסי:  HTTP, HTTPS, Socks4,Socks5</string>
+  <string name="pref_proxy_type_dialog">סוג הפרוקסי</string>
+  <string name="pref_proxy_host_title">מארח של Outbound Proxy</string>
+  <string name="pref_proxy_host_summary">שם מארח שרת פרוקסי</string>
+  <string name="pref_proxy_host_dialog">הכנס מארח פרוקסי</string>
+  <string name="pref_proxy_port_title">פורט של Outbound Proxy</string>
+  <string name="pref_proxy_port_summary">פורט שרת פרוקסי</string>
+  <string name="pref_proxy_port_dialog">הכנס פורט של פרוקסי</string>
+  <string name="pref_proxy_username_title">שם משתמש של Outbound Proxy</string>
+  <string name="pref_proxy_username_summary">שם משתמש פרוקסי (רשות)</string>
+  <string name="pref_proxy_username_dialog">הזן שם משתמש פרוקסי</string>
+  <string name="pref_proxy_password_title">סיסמא של Outbound Proxy</string>
+  <string name="pref_proxy_password_summary">סיסמת פרוקסי (רשות)</string>
+  <string name="pref_proxy_password_dialog">הזן סיסמת פרוקסי</string>
+  <string name="status">סטטוס</string>
+  <string name="setting_up_full_transparent_proxying_">הכנה של הפרוקסי השקוף...</string>
+  <string name="setting_up_app_based_transparent_proxying_">הכנה של הפרוקסי השקוף מבוסס אפליקציות...</string>
+  <string name="transparent_proxying_enabled">פרוקסי שקוף מאופשר</string>
+  <string name="transproxy_enabled_for_tethering_">פרוקסי שקוף מאופשר ל Tathering!</string>
+  <string name="warning_error_starting_transparent_proxying_">אזהרה: שגיאה התחילה את הפרוקסי השקוף!</string>
+  <string name="transproxy_rules_cleared">כללי TransProxy טוהרו</string>
+  <string name="couldn_t_start_tor_process_">אין אפשרות להתחיל תהליך Tor:</string>
+  <string name="privoxy_is_running_on_port_">Polipo רץ על פורט:</string>
+  <string name="setting_up_port_based_transparent_proxying_">הכנה של הפרוקסי השקוף מבוסס פורט...</string>
+  <string name="bridge_error">שגיאת גשר</string>
+  <string name="error">שגיאה</string>
+  <string name="exit_nodes">צמתי יציאה</string>
+  <string name="enter_exit_nodes">הזן צמתי יציאה</string>
+  <string name="exclude_nodes">צמתים מוצאים</string>
+  <string name="enter_exclude_nodes">הזן צמתים מוצאים</string>
+  <string name="strict_nodes">צמתים קפדנים</string>
+  <string name="use_only_these_specified_nodes">השתמש *רק* בצמתים מצוינים אלו</string>
+  <string name="bridges">גשרים</string>
+  <string name="use_bridges">השתמש בגשרים</string>
+  <string name="bridges_obfuscated">גשרים מעורפלים</string>
+  <string name="ip_address_and_port_of_bridges">כתובת ה-IP ויציאה של הגשרים</string>
+  <string name="enter_bridge_addresses">הכנס כתובות גשר</string>
+  <string name="relays">ממסרים</string>
+  <string name="relaying">ממסור</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">אפשר למכשיר שלך להיות תחנת ממסר שאיננה יציאה</string>
+  <string name="relay_port">פורט הממסר</string>
+  <string name="listening_port_for_your_tor_relay">פורט מאזין עבור Tor relay</string>
+  <string name="enter_or_port"> הכנס יציאת OR</string>
+  <string name="relay_nickname">כינוי הממסר</string>
+  <string name="the_nickname_for_your_tor_relay">הכינוי לממסר Tor שלך</string>
+  <string name="enter_a_custom_relay_nickname">הזן כינוי עבור ממסר</string>
+  <string name="reachable_addresses">כתובות בהישג יד</string>
+  <string name="reachable_ports">פורטים בהישג יד</string>
+  <string name="enter_ports">הזן פורטים</string>
+  <string name="enable_hidden_services">אחסון שירותים נסתרים</string>
+  <string name="enter_localhost_ports_for_hidden_services">הזן פורטים של localhost עבור שירותים נסתרים</string>
+  <string name="hidden_service_ports">פורט השירותים הנסתרים</string>
+  <string name="project_home">אתרי הפרויקט:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">הרשיון של Tor</string>
+  <string name="https_torproject_org">https://torproject.org/</string>
+  <string name="third_party_software">תוכנה-צד-ג׳: </string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="found_existing_tor_process">נמצא תהליך Tor קיים…</string>
+  <string name="something_bad_happened">משהו רע התרחש. בדוק את היומן</string>
+  <string name="hidden_service_on">שירות נסתר ב:</string>
+  <string name="unable_to_read_hidden_service_name">לא מסוגל לקרוא שם שירות נסתר</string>
+  <string name="unable_to_start_tor">לא מסוגל להתחיל את Tor:</string>
+  <string name="unable_to_reset_tor">אתחל את המכשיר שלך, אין אפשרות להפעיל מחדש את Tor!</string>
+  <string name="pref_use_sys_iptables_title">השתמש בברירות המחדל של iptables</string>
+  <string name="pref_use_persistent_notifications">לשמור תמיד את האיקון בסרגל כלים כשאורבוט מחובר</string>
+  <string name="notification_using_bridges">גשרים מאופשרים!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">שפה</string>
+  <string name="set_locale_summary">בחר את המקומיות והשפה של Orbot</string>
+  <string name="wizard_locale_title">בחר שפה</string>
+  <string name="wizard_locale_msg">השאר ברירת מחדל או החלף לשפה הנוכחית</string>
+  <string name="powered_by">מופעל באמצעות Tor</string>
+  <string name="btn_save_settings">שמירת הגדרות</string>
+  <string name="no_internet_connection_tor">אין חיבור לאינטרנט; תור ממתין...</string>
+  <string name="bandwidth_">רוחב פס:</string>
+  <string name="down">מטה</string>
+  <string name="up">מעלה</string>
+  <string name="pref_disable_network_summary">כבה את Tor כאשר אין חיבור לאינטרנט</string>
+  <string name="newnym">החלפת אל זהות Tor חדשה!</string>
+  <string name="menu_use_chatsecure">הפעל את ChatSecure</string>
+  <string name="permission_manage_tor_label">נהל Tor</string>
+  <string name="permission_manage_tor_description">אפשר את אפליקציה זו כדי לשלוט בשירות Tor</string>
+  <string name="install_apps_">להתקין אפליקציה?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">אין חיבור לרשת. מכבה את Tor....</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">החיבור עובד טוב. מעיר את Tor...</string>
+  <string name="updating_settings_in_tor_service">מעדכן הגדרות Tor במכשיר</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_dialog">הגדרות SOCKS Port </string>
+  <string name="pref_transport_title">Tor TransProxy Port</string>
+  <string name="pref_transport_dialog">הגדרת הפורט של TransProxy</string>
+  <string name="pref_dnsport_title">Tor DNS Port</string>
+  <string name="your_tor_public_ips_">הIPs החיצוניים שלך עם Tor:</string>
+  <string name="you_do_not_have_root_access_enabled">אין לך גישת רוט מאופשרת</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">תצטרך לכבות ולהפעיל את Orbot על מנת להחיל את השינוי בהגדרות.</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="menu_qr">קוד QR</string>
+  <string name="get_bridges_email">דוא\"ל</string>
+  <string name="get_bridges_web">אתר</string>
+  <string name="activate">הפעל</string>
+  <string name="send_email">שלח דוא\"ל</string>
+  <string name="standard_browser">דפדפן רגיל</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-hi/strings.xml b/orbotservice/src/main/res/values-hi/strings.xml
new file mode 100644
index 0000000..9156dfa
--- /dev/null
+++ b/orbotservice/src/main/res/values-hi/strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">औरबौट एक मुफ्त अैप</string>
+  <string name="menu_browse">ब्राउज़</string>
+  <string name="menu_settings">सेटिंग्स</string>
+  <string name="menu_info">मदद</string>
+  <string name="button_help">मदद</string>
+  <string name="button_close">बंद  करें </string>
+  <string name="wizard_title">Orbot</string>
+  <string name="btn_back">वापस</string>
+  <string name="btn_cancel">रद्द करें </string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">प्रोक्सी सेटींग</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">समन्य </string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">कोई नहीं</string>
+  <string name="status">स्थिति</string>
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-hr-rHR/strings.xml b/orbotservice/src/main/res/values-hr-rHR/strings.xml
new file mode 100644
index 0000000..717ae74
--- /dev/null
+++ b/orbotservice/src/main/res/values-hr-rHR/strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_home">Polazno</string>
+  <string name="menu_browse">Pretraži</string>
+  <string name="menu_settings">Postavke</string>
+  <string name="menu_info">Pomoć</string>
+  <string name="menu_about">O</string>
+  <string name="button_help">Pomoć</string>
+  <string name="button_close">Zatvori</string>
+  <string name="button_about">O</string>
+  <string name="menu_exit">Izlaz</string>
+  <string name="btn_back">Povratak</string>
+  <string name="btn_cancel">Odustani</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Postavke Proxya</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Općenito</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Upozorenje</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">Nepoznato</string>
+  <string name="status">Status</string>
+  <string name="error">Greška</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Spremi postavke</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-hr/strings.xml b/orbotservice/src/main/res/values-hr/strings.xml
new file mode 100644
index 0000000..19ddf3e
--- /dev/null
+++ b/orbotservice/src/main/res/values-hr/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot je besplatna proxy aplikacija koja omogućuje ostalim aplikacijama da koriste internet sigurnije. Orbot koristi Tor za enkripciju Vašeg Internet prometa, a zatim ga skriva šaljući ga kroz seriju računala diljem svijeta. Tor je besplatan software i otvorena mreža koja pomaže u borbi protiv nadzora mreže koji ugrožava osobne slobode i privatnost, povjerljive poslovne aktivnosti i odnose, te pomaže u borbi protiv analize prometa.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">pokreni i zaustavi Tor</string>
+  <string name="tor_proxy_service_process">torproxyusluga</string>
+  <string name="status_starting_up">Orbot se pokreće...</string>
+  <string name="status_activated">Spojen na Tor mrežu</string>
+  <string name="status_disabled">Orbot je deaktiviran</string>
+  <string name="status_shutting_down">TorService se gasi</string>
+  <string name="tor_process_starting">Pokrećem Tor klijent...</string>
+  <string name="tor_process_complete">gotovo.</string>
+  <string name="tor_process_waiting">čekam.</string>
+  <string name="not_anonymous_yet">UPOZORENJE: Vaš promet još nije anoniman! Molimo konfigurirajte Vaše aplikacije da koriste HTTP proxy 127.0.0.1:8118 ili SOCKS4A ili SOCKS5 proxy 127.0.0.1:9050</string>
+  <string name="menu_home">Polazno</string>
+  <string name="menu_browse">Pretraži</string>
+  <string name="menu_settings">Postavke</string>
+  <string name="menu_log">Dnevnik</string>
+  <string name="menu_info">Pomoć</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Početak</string>
+  <string name="menu_stop">Zaustavi</string>
+  <string name="menu_about">O</string>
+  <string name="menu_promo_apps">Dohvati aplikacije...</string>
+  <string name="main_layout_download">Preuzimanje</string>
+  <string name="main_layout_upload">Slanje</string>
+  <string name="button_help">Pomoć</string>
+  <string name="button_close">Zatvori</string>
+  <string name="button_about">O</string>
+  <string name="button_clear_log">Očisti Dnevnik</string>
+  <string name="menu_verify">Provjeri</string>
+  <string name="menu_exit">Izlaz</string>
+  <string name="menu_scan">Skeniraj BridgeQR</string>
+  <string name="menu_share_bridge">Podijeli BridgeQR</string>
+  <string name="press_to_start">- dugi klik za početak -</string>
+  <string name="pref_trans_proxy_group">Transparentni Proxy (Zahtijeva Root)</string>
+  <string name="pref_trans_proxy_title">Transparentni Proxy</string>
+  <string name="pref_trans_proxy_summary">Automatska Torifikacija Aplikacija</string>
+  <string name="pref_transparent_all_title">Tor Sve</string>
+  <string name="pref_transparent_all_summary">Proxy promet svih aplikacija kroz Tor</string>
+  <string name="pref_transparent_port_fallback_title">Port Proxy Rezerva</string>
+  <string name="pref_transparent_port_fallback_summary">UPOZORENJE: Zaobilazi uobičajene portove (80, 443, itd.) *KORISTITE SAMO* ako \'Sve\' ili \'Aplikacije\' mod ne radi.</string>
+  <string name="pref_transparent_port_title">Popis portova</string>
+  <string name="pref_transparent_port_summary">Popis portova za proxy. *KORISTITE SAMO* ako \'Sve\' ili \'Aplikacije\' mod ne radi</string>
+  <string name="pref_transparent_port_dialog">Unesite port za proxy</string>
+  <string name="pref_has_root">Zatraži Root Pristup</string>
+  <string name="pref_has_root_summary">Zatraži root pristup za transparentni proxy</string>
+  <string name="status_install_success">Tor izvršne datoteke uspješno instalirane!</string>
+  <string name="status_install_fail">Tor izvršne datoteke nije bilo moguće instalirati. Molimo provjerite dnevnik i obavijestite tor-assistans at torproject.org</string>
+  <string name="title_error">Greška u Aplikaciji</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">O Orbot-u</string>
+  <string name="btn_next">Sljedeće</string>
+  <string name="btn_back">Natrag</string>
+  <string name="btn_finish">Završi</string>
+  <string name="btn_okay">U redu</string>
+  <string name="btn_cancel">Odustani</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Detalji o Orbot-u</string>
+  <string name="wizard_details_msg">Orbot je otvorena aplikacija koja sadrži Tor, LibEvent i Polipo. Pruža lokalni HTTP proxy (8118) i SOCKS proxy (9050) u Tor mrežu. Orbot ima mogućnost, na root-anom uređaju, slati sav promet kroz Tor.</string>
+  <string name="wizard_permissions_root">Dopuštenje Odobreno</string>
+  <string name="wizard_permissions_stock">Orbot Dopuštenja</string>
+  <string name="wizard_premissions_msg_root">Odlično! Uočili smo da imate root dopuštenja omogućena za Orbot. Koristit ćemo ovu moć mudro.</string>
+  <string name="wizard_permissions_msg_stock">Iako nije neophodan, Orbot može postati moćan alat ako vaš uređaj ima root pristup. Koristite gumb niže da bi odobrili Orbot-u supermoći!</string>
+  <string name="wizard_permissions_no_root">Ako nemate root pristup ili nemate pojma o čemu pričamo, osigurajte da koristite aplikacije koje rade s Orbot-om.</string>
+  <string name="wizard_permissions_consent">Razumijem i želim nastaviti bez Superuser-a</string>
+  <string name="wizard_permission_enable_root">Odobri Root za Orbot</string>
+  <string name="wizard_configure">Konfiguriraj Torifikaciju</string>
+  <string name="wizard_configure_msg">Orbot Vam daje opciju da usmjerite sav aplikacijski promet kroz Tor ILI odaberete aplikacije individualno.</string>
+  <string name="wizard_configure_all">Proxy Sve Aplikacije Kroz Tor</string>
+  <string name="wizard_configure_select_apps">Odaberi Individualne Aplikacije za Tor</string>
+  <string name="wizard_tips_tricks">Orbot-omogućene Aplikacije</string>
+  <string name="wizard_tips_msg">Aplikacije dolje su napravljene da rade sa Orbot-om. Kliknite svaki gumb da instalirate odmah ili ih kasnije možete naći na Google Play-u, na GuardianProject.info web stranici ili preko F-Droid.org.</string>
+  <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="wizard_tips_twitter">Namjesti Twitter proxy na host \"localhost\" i port 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - napravite priču i prepustite sigurnost Tor-u!</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>
+  <string name="wizard_proxy_help_msg">Ako Android aplikacija koju koristite podržava korištenje HTTP ili SOCKS proxy-a, možete ju konfigurirati da se spaja na Orbot i koristi Tor.\n\n\n Postavke su 127.0.0.1 ili \"localhost\". Za HTTP postavke porta su 8118. Za SOCKS, proxy je 9050. Trebali bi koristiti SOCKS4A ili SOCKS5 ako je moguće.\n\n\n Možete naučiti više o proxy-ranju na Androidu putem često postavljenih pitanja: http://tinyurl.com/proxyandroid</string>
+  <string name="wizard_final">Orbot je spreman!</string>
+  <string name="wizard_final_msg">Milijuni ljudi diljem svijeta koriste Tor iz raznih razloga.\n\nNovinari i blogeri, pravobranitelji, policijski službenici, vojnici, korporacije, građani represivnih režima i uobičajeni građani... a od sad i Vi!</string>
+  <string name="wizard_exit_at_first_screen_toast">Molimo konfigurirajte Orbot prije nego ga počnete koristiti!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Uspješno ste spojeni na Tor mrežu - ali ovo NE znači da je Vaš uređaj siguran. Možete koristiti gumb \'Preglednik\' kako bi testirali svoju vezu. \n\nPosjetite nas na https://guardianproject.info/apps/orbot ili nam pošaljite email na help at guardianproject.info kako bi naučili više.</string>
+  <string name="tor_check">Ovo će otvoriti Vaš web preglednik na https://check.torproject.org kako bi vidjeli je li Orbot konfiguriran i jeste li povezani na Tor.</string>
+  <string name="pref_hs_group">Hosting Skrivenih Usluga</string>
+  <string name="pref_general_group">Općenito</string>
+  <string name="pref_start_boot_title">Pokreni Orbot pri pokretanju</string>
+  <string name="pref_start_boot_summary">Automatski pokreni Orbot i poveži Tor kad se Android uređaj pokrene</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot donosi Tor na Android!\n\nTor pomaže u borbi protiv filtriranja prometa, analize prometa i nadzora mreže koji ugrožava privatnost, povjerljive informacije i osobne veze.\n\nOvaj čarobnjak će Vam pomoći u konfiguraciji Orbot-a i Tor-a na Vašem uređaju.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Upozorenje</string>
+  <string name="wizard_warning_msg">Samo instaliranje Orbot-a neće automatski anonimizirati Vaš mobilni promet.\n\nMorate ispravno konfigurirati Orbot, svoj uređaj i ostale aplikacije da uspješno koriste Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Dopuštenja</string>
+  <string name="wizard_permissions_root_msg1">Opcionalno, možete odobriti Orbot-u \'Superuser\' pristup da bi omogućili napredne značajke, kao što je Transparentni Proxy.</string>
+  <string name="wizard_permissions_root_msg2">Ako ne želite ovo, budite sigurni da koristite aplikacije koje su napravljene da rade s Orbotom</string>
+  <string name="wizard_permissions_no_root_msg">Čini se da Vaš uređaj nije root-an.\n\nMolimo probajte \'Aplikacije\' način rada na glavnom ekranu.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox: Preglednik s pojačanom privatnosti koji radi kroz Tor</string>
+  <string name="wizard_tips_play">Pronađi sve Guardian Projekt aplikacije na Google Play</string>
+  <string name="wizard_tips_fdroid">Pronađi sve Guardian Project aplikacije na F-Droid-u</string>
+  <string name="wizard_tips_fdroid_org">Pronađi sve Guardian Project aplikacije na https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparentni Proxy</string>
+  <string name="wizard_transproxy_msg">Ovo omogućava Vašim aplikacijama da automatski rade kroz Tor mrežu bez ikakve konfiguracije.</string>
+  <string name="wizard_transproxy_hint">(Stavite kvačicu ako nemate pojma o čemu pričamo)</string>
+  <string name="wizard_transproxy_none">Ništa</string>
+  <string name="pref_transparent_tethering_title">Tor Privezanje</string>
+  <string name="pref_transparent_tethering_summary">Omogući Tor Transparentni Proxy za Wifi i USB privezane uređaje (zahtijeva ponovno pokretanje)</string>
+  <string name="button_grant_superuser">Zatraži Pristup Superuser-u</string>
+  <string name="pref_select_apps">Odaberi Aplikacije</string>
+  <string name="pref_select_apps_summary">Odaberi Aplikacije koje će se usmjeriti kroz Tor</string>
+  <string name="pref_node_configuration">Konfiguracija Čvora</string>
+  <string name="pref_node_configuration_summary">Ovo su napredne postavke koje mogu smanjiti Vašu anonimnost</string>
+  <string name="pref_entrance_node">Ulazni Čvorovi</string>
+  <string name="pref_entrance_node_summary">Otisci prstiju, nadimci, države i adrese za prvi skok</string>
+  <string name="pref_entrance_node_dialog">Unesi Ulazne Čvorove</string>
+  <string name="pref_allow_background_starts_title">Dozvoli pokretanja u pozadini</string>
+  <string name="pref_allow_background_starts_summary">Dopusti bilo kojoj aplikaciji da kaže Orbot-u da pokrene Tor i povezane usluge</string>
+  <string name="button_proxy_all">Proxy-raj sve</string>
+  <string name="button_proxy_none">Ne proxy-raj ništa</string>
+  <string name="button_invert_selection">Izokreni odabrano</string>
+  <string name="pref_proxy_title">Izlazni Mrežni Proxy (Opcionalno)</string>
+  <string name="pref_proxy_type_title">Vrsta Izlaznog Proxy-a</string>
+  <string name="pref_proxy_type_summary">Protokol koji se koristi za proxy server: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Unesi Tip Proxyj-a</string>
+  <string name="pref_proxy_host_title">Domaćin Izlaznog Proxy-a</string>
+  <string name="pref_proxy_host_summary">Ime domaćina Proxy Poslužitelja</string>
+  <string name="pref_proxy_host_dialog">Unesi Domaćina Proxy-a</string>
+  <string name="pref_proxy_port_title">Port Izlaznog Proxy-a</string>
+  <string name="pref_proxy_port_summary">Port Proxy Poslužitelja</string>
+  <string name="pref_proxy_port_dialog">Unesite port za proxy.</string>
+  <string name="pref_proxy_username_title">Proxy izlazno korisničko ime</string>
+  <string name="pref_proxy_username_summary">Proxy korisničko ime (Opcionalno)</string>
+  <string name="pref_proxy_username_dialog">Unesite Proxy korisničko ime</string>
+  <string name="pref_proxy_password_title">Proxy izlazna lozinka</string>
+  <string name="pref_proxy_password_summary">Proxy lozinka (Opcionalno)</string>
+  <string name="pref_proxy_password_dialog">Unesite Proxy lozinku</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Postavljam potpuno transparentan proxy...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Postavljam transparentan proxy zasnovan na aplikaciji...</string>
+  <string name="transparent_proxying_enabled">Transparentni Proxy OMOGUĆENO</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy omogućen za Privezivanje!</string>
+  <string name="warning_error_starting_transparent_proxying_">UPOZORENJE: greška pri pokretanju transparentnog proxy-a!</string>
+  <string name="transproxy_rules_cleared">TransProxy pravila očišćena</string>
+  <string name="couldn_t_start_tor_process_">Nije moguće započeti Tor proces:</string>
+  <string name="privoxy_is_running_on_port_">Polipo je pokrenut na portu:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Postavljam transparentan proxy zasnovan na portu...</string>
+  <string name="bridge_error">Greška Mosta</string>
+  <string name="bridge_requires_ip">Da bi koristili mostove, morate unijeti bar jednu IP adresu mosta.</string>
+  <string name="send_email_for_bridges">Pošaljite email koristeći gmail račun na bridges at torproject.org samo s tekstom \"get bridges\" u sadržaju.</string>
+  <string name="error">Greška</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Vaše ReachableAddresses postavke su uzrokovale iznimku!</string>
+  <string name="your_relay_settings_caused_an_exception_">Vaše postavke releja su uzrokovale iznimku!</string>
+  <string name="exit_nodes">Izlazni Čvorovi</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Otisci prstiju, nadimci, države i adrese za zadnji skok</string>
+  <string name="enter_exit_nodes">Unesi Izlazne Čvorove</string>
+  <string name="exclude_nodes">Nemoj Uključiti Čvorove</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Otisci prstiju, nadimci, države i adrese koje ne treba uključiti</string>
+  <string name="enter_exclude_nodes">Unesi Čvorove koje treba isključiti</string>
+  <string name="strict_nodes">Striktni Čvorovi</string>
+  <string name="use_only_these_specified_nodes">Koristi *samo* ove navedene čvorove</string>
+  <string name="bridges">Mostovi</string>
+  <string name="use_bridges">Koristi Mostove</string>
+  <string name="bridges_obfuscated">Skriveni Mostovi</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Omogući naizmjenične ulazne čvorove u Tor Mrežu</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Omogućite ako su postavljeni mostovi skriveni mostovi</string>
+  <string name="ip_address_and_port_of_bridges">IP adresa i port mostova</string>
+  <string name="enter_bridge_addresses">Unesi Adrese Mostova</string>
+  <string name="relays">Releji</string>
+  <string name="relaying">Prenošenje</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Omogućite svom uređaju da bude ne-izlazni relej</string>
+  <string name="relay_port">Relej Port</string>
+  <string name="listening_port_for_your_tor_relay">Port za slušanje Vašeg Tor releja</string>
+  <string name="enter_or_port">Unesi OR port</string>
+  <string name="relay_nickname">Nadimak releja</string>
+  <string name="the_nickname_for_your_tor_relay">Nadimak za Vaš Tor relej</string>
+  <string name="enter_a_custom_relay_nickname">Unesi prilagođeni nadimak releja</string>
+  <string name="reachable_addresses">Dostupne Adrese</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Pokreni kao klijent iza firewall-a sa restriktivnim pravilima</string>
+  <string name="reachable_ports">Dostupni portovi</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Portovi dostupni iza restriktivnog firewall-a</string>
+  <string name="enter_ports">Unesi portove</string>
+  <string name="enable_hidden_services">Hosting Skrivenih Usluga</string>
+  <string name="run_servers_accessible_via_the_tor_network">dopusti poslužitelju na uređaju da bude dostupan preko Tor mreže</string>
+  <string name="enter_localhost_ports_for_hidden_services">unesi localhost portove za skrivene usluge</string>
+  <string name="hidden_service_ports">Portovi za skrivene usluge</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">adresirano ime za vašu skrivenu uslugu (generirano automatski)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">omogući izlaznost dnevnika o otkrivanju greške (mora koristiti adb ili aLogCat za pregled)</string>
+  <string name="project_home">Dom(ovi) Projekta:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor licenca</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Software treće strane:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Aplikacija želi otvoriti port %S skrivenog poslužitelja Tor mreži. Ovo je sigurno ako vjerujete aplikaciji.</string>
+  <string name="found_existing_tor_process">pronađeni postojeći Tor procesi...</string>
+  <string name="something_bad_happened">Nešto loše se dogodilo. Provjerite dnevnik</string>
+  <string name="hidden_service_on">skrivena usluga na:</string>
+  <string name="unable_to_read_hidden_service_name">nije moguće pročitati ime skrivene usluge</string>
+  <string name="unable_to_start_tor">Nije moguće pokrenuti Tor:</string>
+  <string name="unable_to_reset_tor">Ponovno pokrenit svoj uređaj, nije moguće ponovno pkrenuti Tor!</string>
+  <string name="pref_use_sys_iptables_title">Koristi Zadane Iptablice</string>
+  <string name="pref_use_sys_iptables_summary">koristi ugrađene iptablice umjesto onih zapakiranih s Orbot-om</string>
+  <string name="error_installing_binares">Nije bilo moguće instalirati ili nadograditi Tor datoteke .</string>
+  <string name="pref_use_persistent_notifications">Uvjek drži ikonu na alatnoj traci kad je Orbot spojen</string>
+  <string name="pref_use_persistent_notifications_title">Obavijesti o stalnoj pokrenutosti</string>
+  <string name="pref_use_expanded_notifications">Prikaži proširene obavijesti s Tor izlaznom državom i IP-em</string>
+  <string name="pref_use_expanded_notifications_title">Proširene obavijesti</string>
+  <string name="notification_using_bridges">Mostovi omogućeni!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Jezik</string>
+  <string name="set_locale_summary">Odaberi lokaciju i jezik za Orbot</string>
+  <string name="wizard_locale_title">Odaberi Jezik</string>
+  <string name="wizard_locale_msg">Ostavi zadano ili promjeni na trenutni jezik</string>
+  <string name="powered_by">pogoni Tor</string>
+  <string name="btn_save_settings">Spremi postavke</string>
+  <string name="no_internet_connection_tor">Nema internet veze; Tor je u stanju pripravnosti...</string>
+  <string name="bandwidth_">Bandwidth:</string>
+  <string name="down">dolje</string>
+  <string name="up">gore</string>
+  <string name="pref_disable_network_title">Nema mrežnog auto-spavanja</string>
+  <string name="pref_disable_network_summary">Stavi Tor na spavanje kad internet nije dostupan</string>
+  <string name="newnym">Prebacili ste se na nov Tor identitet!</string>
+  <string name="menu_verify_browser">Preglednik</string>
+  <string name="menu_use_chatsecure">Koristi ChatSecure</string>
+  <string name="permission_manage_tor_label">Upravljaj Tor-om</string>
+  <string name="permission_manage_tor_description">Omogući ovoj palikaciji da upravlja Tor-om</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Čini se da nemate Orfox instaliran. Želite li pomoć s tim ili da samo otvorimo preglednik?</string>
+  <string name="install_apps_">Instaliraj aplikacije?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Nema mrežne povezivosti. Stavljam Tor na spavanje...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Mrežan povezanost je dobra. Budim Tor...</string>
+  <string name="updating_settings_in_tor_service">ažuriram postavke u Tor usluzi</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Port na kojem Tor pruža svoj SOCKS proxy (zadano: 9050, 0 za onemogućavanje)</string>
+  <string name="pref_socks_dialog">Konfiguracija SOCKS porta </string>
+  <string name="pref_transport_title">Tor TransProxy Port</string>
+  <string name="pref_transport_summary">Port na kojem Tor pruža Transparentni Proxy (zadano: 9040, 0 za onemogućivanje)</string>
+  <string name="pref_transport_dialog">Konfiguracija TransProxy porta</string>
+  <string name="pref_dnsport_title">Tor DNS Port</string>
+  <string name="pref_dnsport_summary">Port na kojem Tor pruža DNS (zadano 5400, 0 za onemogućivanje)</string>
+  <string name="pref_dnsport_dialog">Postavljanje DNS porta</string>
+  <string name="pref_torrc_title">Torrc prilagođena konfiguracija</string>
+  <string name="pref_torrc_summary">SAMO ZA STRUČNJAKE: unesite direktno torrc konfiguracijske linije</string>
+  <string name="pref_torrc_dialog">Prilagođeni Torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus - Benetech aplikacija za dokumentaciju ljudskih prava</string>
+  <string name="your_tor_public_ips_">Vaši javni Tor IP-evi:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Onemogućite ovu palikaciju u Android->Postavke->Aplikacije ako imate problema s Orbot-om:</string>
+  <string name="app_conflict">Konflikt aplikacija</string>
+  <string name="pref_transproxy_refresh_title">Automatsko osvježavanje Transproxy-a</string>
+  <string name="pref_transproxy_refresh_summary">Ponovno primjeni Transproxy pravila kad se promjeni mrežno stanje</string>
+  <string name="pref_transproxy_flush_title">Transproxy PRISILNO UKLANJANJE</string>
+  <string name="pref_transproxy_flush_summary">Dotaknite ovdje da bi očistili sva transproxy mrežna pravila ODMAH</string>
+  <string name="transparent_proxy_rules_flushed_">Pravila transparentnog proxy-a očišćena!</string>
+  <string name="you_do_not_have_root_access_enabled">Nema omogućen root pristup</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Možda će te morati zaustaviti i pokrenuti Orbot da bi se omogućile promjenjene postavke.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Mostova ažurirano</string>
+  <string name="restart_orbot_to_use_this_bridge_">Ponovno pokrenite Orbot da bi omogućili promjene</string>
+  <string name="menu_qr">QR kodovi</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Ako Vaš mreža aktivno blokira Tor, možete koristiti Most kako bi pristupili mreži. ODABERITE jedan od gorenavedenih tipova mosta kako bi ih omogućili.</string>
+  <string name="bridge_mode">Način rada Most</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Aktiviraj</string>
+  <string name="apps_mode">VPN način rada aplikacija</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Možete omogućiti svim aplikacijama na svom uređaju da se pokreću kroz Tor koristeći VPN značajku Android-a.\n\n*UPOZORENJE* Ovo je nova, eksperimentalna značajka i u nekim slučajevima se možda neće automatski pokrenuti, ili će se zaustaviti. NE bi ju trebalo koristiti za anonimnost, nego SAMO za prolaženje kroz vatrozide i filtere.</string>
+  <string name="send_email">Pošalji email</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Možete dobiti adrese mostova kroz email, web ili skeniranjem QR koda. Odaberite \'Email\' ili \'Web\' niže da zatražite adresu mosta.\n\nJednom kad imate adresu, kopirajte i zalijepite ju u \"Mostovi\" postavku Orbot-a i ponovno ga pokrenite.</string>
+  <string name="install_orweb">Instaliraj Orfox</string>
+  <string name="standard_browser">Standardni preglendik</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NAPOMENA: samo standardni Tor mostovi rade na Intel X86/ATOM uređajima</string>
+  <string name="vpn_default_world">Svijet</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-hu/strings.xml b/orbotservice/src/main/res/values-hu/strings.xml
new file mode 100644
index 0000000..6b4e264
--- /dev/null
+++ b/orbotservice/src/main/res/values-hu/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Az Orbot egy ingyenes proxy alkalmazás, ami képessé tesz alkalmazásokat, hogy biztonságosabban használhassák az internetet. Az Orbot Tor-t használ, hogy titkosítsa az internetforgalmadat és elrejtse azáltal, hogy pattogtatja számítógépek sorozatain keresztül a világ körül. A Tor ingyenes szoftver és nyitott hálózat, ami segít megvédeni a hálózati felügyelettől, ami fenyegeti a személyi szabadságot és magánéletet, a bizalmas céges tevékenységeket és kapcsolatokat, és állambiztonság címén a forgalomelemzéstől.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">a Tor indítása, leállítása</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Az Orbot indul...</string>
+  <string name="status_activated">Csatlakozva a Tor hálózathoz</string>
+  <string name="status_disabled">Az Orbot deaktiválva</string>
+  <string name="status_shutting_down">A TorService leáll</string>
+  <string name="tor_process_starting">A Tor kliens indítása...</string>
+  <string name="tor_process_complete">kész.</string>
+  <string name="tor_process_waiting">várakozik.</string>
+  <string name="not_anonymous_yet">FIGYELEM: A forgalmad még nem névtelen! Állítsd be az alkalmazásaidat, hogy HTTP proxyt használjanak a 127.0.0.1:8118 címen vagy SOCKS4A vagy SOCKS5 proxyt a 127.0.0.1:9050 címen</string>
+  <string name="menu_home">Kezdőlap</string>
+  <string name="menu_browse">Böngészés</string>
+  <string name="menu_settings">Beállítások</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Súgó</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Indítás</string>
+  <string name="menu_stop">Leállítás</string>
+  <string name="menu_about">Névjegy</string>
+  <string name="menu_promo_apps">Alkalmazások beszerzése...</string>
+  <string name="main_layout_download">Letöltés</string>
+  <string name="main_layout_upload">Feltöltés</string>
+  <string name="button_help">Súgó</string>
+  <string name="button_close">Bezár</string>
+  <string name="button_about">Névjegy</string>
+  <string name="button_clear_log">Log törlése</string>
+  <string name="menu_verify">Ellenőrzés</string>
+  <string name="menu_exit">Kilépés</string>
+  <string name="menu_scan">BridgeQR szkennelése</string>
+  <string name="menu_share_bridge">BridgeQR megosztása</string>
+  <string name="press_to_start">- hosszú nyomás az indításhoz -</string>
+  <string name="pref_trans_proxy_group">Transzparens Proxyzás (Root szükséges)</string>
+  <string name="pref_trans_proxy_title">Transzparens Proxyzás</string>
+  <string name="pref_trans_proxy_summary">Alkalmazások automatikus Tor-izálása</string>
+  <string name="pref_transparent_all_title">Minden Tor-olása</string>
+  <string name="pref_transparent_all_summary">Minden forgalom átproxyzása a Tor-on</string>
+  <string name="pref_transparent_port_fallback_title">Port Proxy visszacsatolás</string>
+  <string name="pref_transparent_port_fallback_summary">FIGYELEM: Kikerüli a szokásos portokat (80, 443, stb). *CSAK AKKOR HASZNÁLD* ha a \'Minden\' vagy \'Alkalmazás\' mód nem működik.</string>
+  <string name="pref_transparent_port_title">Port Lista</string>
+  <string name="pref_transparent_port_summary">A proxyzandó portok listája. *CSAK AKKOR HASZNÁLD* ha a \'Minden\' vagy \'Alkalmazás\' mód nem működik.</string>
+  <string name="pref_transparent_port_dialog">Add meg a proxyzandó portokat</string>
+  <string name="pref_has_root">Root hozzáférés szükséges</string>
+  <string name="pref_has_root_summary">Root hozzáférés szükséges a transzparens proxyzáshoz</string>
+  <string name="status_install_success">A Tor binárisok sikeresen telepítve lettek!</string>
+  <string name="status_install_fail">A Tor bináris állományok telepítése sikertelen. Ellenőrizd a naplót és értesítsd a tor-assistants at torproject.org -ot</string>
+  <string name="title_error">Alkalmazás hiba</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Az Orbot-ról</string>
+  <string name="btn_next">Tovább</string>
+  <string name="btn_back">Vissza</string>
+  <string name="btn_finish">Befejezés</string>
+  <string name="btn_okay">OK</string>
+  <string name="btn_cancel">Mégsem</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Néhány Orbot adat</string>
+  <string name="wizard_details_msg">Az Orbot egy nyílt-forráskódú alkalmazás, ami tartalmazza a Tor-t, LibEvent-et és Polipo-t. Szolgáltat egy helyi HTTP proxyt (8118) és egy SOCKS proxyt (9050) a Tor hálózatba. Az Orbot-nak megvan az a képessége is, hogy rootolt eszközön minden internetes forgalmat a Tor-on keresztül küldjön.</string>
+  <string name="wizard_permissions_root">Jogosultság megadva</string>
+  <string name="wizard_permissions_stock">Orbot jogosultságok</string>
+  <string name="wizard_premissions_msg_root">Kitűnő! Úgy észleltük, hogy root jogot engedélyeztél az Orbot számára. Ezt az erőt bölcsen fogjuk használni.</string>
+  <string name="wizard_permissions_msg_stock"> Habár nem szükséges, az Orbot sokkal hatékonyabb eszköz lehet, ha a készüléknek van root hozzáférése. Használd az alábbi gombot, hogy szuper-erőt adj az Orbot-nak! </string>
+  <string name="wizard_permissions_no_root">Ha nincs root hozzáférésed, vagy fogalmad sincs, hogy miről beszélünk, csak győződjél meg arról, hogy olyan alkalmazásokat használsz, amelyek együttműködnek az Orbot-tal.</string>
+  <string name="wizard_permissions_consent">Értettem és Superuser nélkül folytatnám tovább</string>
+  <string name="wizard_permission_enable_root">Root jog megadása az Orbot-nak</string>
+  <string name="wizard_configure">Tor-izálás konfigurálása</string>
+  <string name="wizard_configure_msg">Az Orbot lehetővé teszi, hogy az összes alkalmazás forgalmát a Tor-on keresztül küldje VAGY hogy egyénileg kiválaszthasd az alkalmazásaidat.</string>
+  <string name="wizard_configure_all">Minden alkalmazás keresztülproxyzása a Tor-on</string>
+  <string name="wizard_configure_select_apps">Alkalmazások kiválasztása a Tor-hoz</string>
+  <string name="wizard_tips_tricks">Orbot-engedélyezett alkalmazások</string>
+  <string name="wizard_tips_msg">Az alábbi alkalmazások az Orbot-tal való együttműködésre lettek fejlesztve. Kattints minden gombra az azonnali telepítéshez, vagy később megtalálod őket a Google Play-en, a GuardianProject.info weboldalon vagy az F-Droid.org-n.</string>
+  <string name="wizard_tips_otrchat">ChatSecure - Biztonságos azonnali üzenetküldő kliens Androidra</string>
+  <string name="wizard_tips_proxy">Proxy beállítások - Tanuld meg, hogyan állíthatod be az alkalmazásaidat, hogy együttműködjenek az Orbot-tal</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo keresőmotor alkalmazás</string>
+  <string name="wizard_tips_twitter"> Állítsd be a Twitter proxyt a hosztnál \"localhost\"-ra és a port-nál 8118-ra</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Készíts egy történetet és hagyd a Tor-ra a biztonságért!</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_proxy_help_msg">Ha az Android alkalmazás, amit használsz támogatja a HTTP vagy SOCKS proxy használatát, akkor konfigurálhatod, hogy csatlakozzon az Orbot-hoz és Tor-t használjon.\n\n\n A hoszt beállítások 127.0.0.1 vagy \"localhost\". HTTP-nek a port beállítása 8118. A SOCKS-nak a proxyja 9050. SOCKS4A -t vagy SOCKS5 -t kéne használnod, ha lehetséges.\n \n\n\n Többet tudhatsz meg a proxyzásról Androidon a GYIK-en keresztül itt: http://tinyurl.com/proxyandroid</string>
+  <string name="wizard_final">Az Orbot kész!</string>
+  <string name="wizard_final_msg">Emberek milliói használják a világ körül a Tor-t többféle különböző okból.\n\nÚjságírók és bloggerek, emberi jogok védelmezői, rendőrök, katonák, cégek, elnyomó rezsimek polgárai, és csak átlagos polgárok... és most már te is készen állsz!</string>
+  <string name="wizard_exit_at_first_screen_toast">Kérlek konfiguráld az Orbot-ot, mielőtt elkezded használni!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Sikeresen csatlakoztál a Tor hálózathoz - de ez NEM jelenti azt, hogy a készüléked biztonságos. Használhatod a \'Böngésző\' gombot a kapcsolatod teszteléséhez. \n\nLátogass meg minket a https://guardianproject.info/apps/orbot -on vagy küldj egy emailt a help at guardianproject.info -ra, hogy többet megtudj.</string>
+  <string name="tor_check">Ez megnyitja a webböngésződben a https://check.torproject.org -t ahhoz, hogy lásd, az Orbot valószínűleg konfigurált és csatlakozva vagy a Tor-hoz.</string>
+  <string name="pref_hs_group">Rejtett szolgáltatás kiszolgálás</string>
+  <string name="pref_general_group">Általános</string>
+  <string name="pref_start_boot_title">Az Orbot indítása rendszerindításkor</string>
+  <string name="pref_start_boot_summary">Automatikusan elindítja az Orbot-ot és csatlakozik a hálózathoz, amikor az Android eszköz betölt</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Az Orbot elhozza a Tor-t Androidra!\n\nA Tor segít megvédeni téged a tartalomszűréstől, forgalomelemzéstől és hálózati felügyelettől ami fenyegeti a magánéletet, bizalmas információt és személyes kapcsolatokat.\n\nEz a varázsló segít konfigurálni az Orbot-ot és Tor-t az eszközödön.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Figyelem</string>
+  <string name="wizard_warning_msg">Az Orbot egyszerű telepítésével nem fogja automatikusan névtelenné tenni a mobilforgalmadat.\n\nMegfelelően kell konfigurálnod az Orbot-ot, az eszközödet és egyéb alkalmazásokat ahhoz, hogy sikeresen használják a Tor-t.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Jogosultságok</string>
+  <string name="wizard_permissions_root_msg1">Opcionálisan adhatsz az Orbot részére \'Superuser\' hozzáférést, hogy engedélyezz olyan speciális szolgáltatásokat, mint például a Transzparens Proxyzás.</string>
+  <string name="wizard_permissions_root_msg2">Ha nem akarod ezt tenni, kérlek bizonyosodj meg róla, hogy olyan alkalmazásokat használsz, amelyek együttműködnek az Orbot-tal</string>
+  <string name="wizard_permissions_no_root_msg">Az eszközöd nem tűnik rootoltnak vagy nem ad root vagy \'Superuser\' hozzáférést.\n\nKérlek próbáld az \'Appok\' módot a főképernyőn ehelyett.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot-engedélyezett Alkalmazások</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: Biztonságos üzenetküldő alkalmazás OTR titkosítással</string>
+  <string name="wizard_tips_orweb">Orfox: Fokozott adatvédelmi böngésző, ami Tor-on keresztül működik</string>
+  <string name="wizard_tips_play">Az összes Guardian Project alkalmazás keresése a Google Play-en</string>
+  <string name="wizard_tips_fdroid">Az összes Guardian Project alkalmazást megtalálod az F-Droid -on</string>
+  <string name="wizard_tips_fdroid_org">Az összes Guardian Project alkalmazást megtalálod a https://f-droid.org -on</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Átlátszó Proxyzás</string>
+  <string name="wizard_transproxy_msg">Ez lehetővé teszi az alkalmazások számára a Tor-on keresztül kommunikálást, bármilyen konfiguráció nélkül.</string>
+  <string name="wizard_transproxy_hint">(Jelöld be ezt négyzetet, ha fogalmad sincs arról, hogy miről beszélünk)</string>
+  <string name="wizard_transproxy_none">Nincs</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">A Tor Transzparens Proxyzásának engedélyezése a Wifi és az USB Tetherelt eszközök felé (újraindítást igényel)</string>
+  <string name="button_grant_superuser">Superuser hozzáférés kérése</string>
+  <string name="pref_select_apps">Alkalmazások kiválasztása</string>
+  <string name="pref_select_apps_summary">Válassz alkalmazásokat, amik keresztül haladjanak a Tor-on</string>
+  <string name="pref_node_configuration">Csomópont konfiguráció</string>
+  <string name="pref_node_configuration_summary">Ezek haladó beállítások, amelyek csökkenthetik a névtelenséged.</string>
+  <string name="pref_entrance_node">Belépő csomópontok</string>
+  <string name="pref_entrance_node_summary">Ujjlenyomatok, becenevek, országok és címek az első ugráshoz</string>
+  <string name="pref_entrance_node_dialog">Belépő csomópontok megadása</string>
+  <string name="pref_allow_background_starts_title">Háttérbeli indulások engedélyezése</string>
+  <string name="pref_allow_background_starts_summary">Bármely alkalmazás közölheti az Orbot-tal, hogy indítsa a Tor-t és a kapcsolódó szolgáltatásokat</string>
+  <string name="button_proxy_all">Mindent proxyz</string>
+  <string name="button_proxy_none">Semmit nem proxyz</string>
+  <string name="button_invert_selection">Kijelölés megfordítása</string>
+  <string name="pref_proxy_title">Kimenő hálózati proxy (választható)</string>
+  <string name="pref_proxy_type_title">Proxy típus</string>
+  <string name="pref_proxy_type_summary">A Proxy szerver által használandó protokoll: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Add meg a proxy típusát</string>
+  <string name="pref_proxy_host_title">Kimenő proxy hoszt</string>
+  <string name="pref_proxy_host_summary">Proxy szerver állomásneve</string>
+  <string name="pref_proxy_host_dialog">Add meg a proxy hosztot</string>
+  <string name="pref_proxy_port_title">Proxy port</string>
+  <string name="pref_proxy_port_summary">Proxy szerver port</string>
+  <string name="pref_proxy_port_dialog">Add meg a proxy portját</string>
+  <string name="pref_proxy_username_title">Kimenő proxy felhasználónév</string>
+  <string name="pref_proxy_username_summary">Proxy felhasználónév (választható)</string>
+  <string name="pref_proxy_username_dialog">Add meg a proxy felhasználónevet</string>
+  <string name="pref_proxy_password_title">Kimenő proxy jelszó</string>
+  <string name="pref_proxy_password_summary">Proxy jelszó (választható)</string>
+  <string name="pref_proxy_password_dialog">Add meg a proxy jelszót</string>
+  <string name="status">Állapot</string>
+  <string name="setting_up_full_transparent_proxying_">A teljes körű transzparens proxyzás beállítása...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Alkalmazásalapú transzparens proxyzás beállítása...</string>
+  <string name="transparent_proxying_enabled">Transzparens proxyzás ENGEDÉLYEZVE</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy engedélyezve tetheringre!</string>
+  <string name="warning_error_starting_transparent_proxying_">FIGYELMEZTETÉS: hiba a transzparens proxyzás indításakor!</string>
+  <string name="transproxy_rules_cleared">TransProxy szabályok törölve</string>
+  <string name="couldn_t_start_tor_process_">Nem indítható el a Tor folyamat:</string>
+  <string name="privoxy_is_running_on_port_">A Polipo ezen a porton fut:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Port alapú transzparens proxyzás beállítása...</string>
+  <string name="bridge_error">Híd hiba</string>
+  <string name="bridge_requires_ip">A híd szolgáltatás használatához legalább egy híd IP címét meg kell adnod.</string>
+  <string name="send_email_for_bridges">Küldj egy emailt a bridges at torproject.org -ra a \"get bridges\" sorral a levél törzsében egy gmail fiókból.</string>
+  <string name="error">Hiba</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Az elérhető címeid beállításai kivételt okoztak!</string>
+  <string name="your_relay_settings_caused_an_exception_">Az átjátszód beállításai kivételt okoztak!</string>
+  <string name="exit_nodes">Kilépési csomópontok</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Ujjlenyomatok, becenevek, országok és címek az utolsó ugráshoz</string>
+  <string name="enter_exit_nodes">Kilépési csomópontok megadása</string>
+  <string name="exclude_nodes">Csomópontok kizárása</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Kizárandó ujjlenyomatok, becenevek, országok és címek</string>
+  <string name="enter_exclude_nodes">Add meg a kizárandó csomópontokat</string>
+  <string name="strict_nodes">Szigorú csomópontok</string>
+  <string name="use_only_these_specified_nodes">*Csak* ezeknek a megadott csomópontoknak a használata</string>
+  <string name="bridges">Hidak</string>
+  <string name="use_bridges">Hidak használata</string>
+  <string name="bridges_obfuscated">Fedőhidak</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Alternatív belépési pontok engedélyezése a Tor hálózatba</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Bekapcsolva, ha a konfigurált hidak fedőhidak</string>
+  <string name="ip_address_and_port_of_bridges">A hidak IP címe és portja</string>
+  <string name="enter_bridge_addresses">Add meg a híd címeit</string>
+  <string name="relays">Átjátszók</string>
+  <string name="relaying">Átjátszás</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Engedélyezd az eszközödnek, hogy nem-átjátszó elosztó legyen</string>
+  <string name="relay_port">Átjátszó port</string>
+  <string name="listening_port_for_your_tor_relay">Hallgató port a Tor átjátszódnak</string>
+  <string name="enter_or_port">Enter VAGY port</string>
+  <string name="relay_nickname">Átjátszó becenév</string>
+  <string name="the_nickname_for_your_tor_relay">A Tor átjátszód beceneve</string>
+  <string name="enter_a_custom_relay_nickname">Adj meg egy egyedi átjátszó becenevet</string>
+  <string name="reachable_addresses">Elérhető címek</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Futtatás kliensként egy tűzfal mögül, korlátozó rendelkezésekkel</string>
+  <string name="reachable_ports">Elérhető portok</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">A tűzfal mögött elérhető portok</string>
+  <string name="enter_ports">Add meg a portokat</string>
+  <string name="enable_hidden_services">Rejtett szolgáltatás kiszolgálás</string>
+  <string name="run_servers_accessible_via_the_tor_network">a készülék szerver elérhetőségének engedélyezése a Tor hálózaton keresztül</string>
+  <string name="enter_localhost_ports_for_hidden_services">add meg a localhost portokat a rejtett szolgáltatásokhoz</string>
+  <string name="hidden_service_ports">Rejtett szolgáltatás portok</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">a címezhető neve a rejtett szolgáltatásaidnak (automatikusan generált)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">a hibakeresési napló engedélyezése a kimenetre (adb -t vagy aLogCat -t kell használni a megtekintéshez)</string>
+  <string name="project_home">Projekt honlap(ok):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">A Tor Licenc</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3. fél szoftver:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Egy alkalmazás a %S rejtett szerver portot akarja megnyitni a Tor hálózathoz. Ez biztonságos, ha megbízol az alkalmazásban.</string>
+  <string name="found_existing_tor_process">létező Tor folyamat találva...</string>
+  <string name="something_bad_happened">Valami rossz történt. Nézd meg a naplót.</string>
+  <string name="hidden_service_on">rejtett szolgáltatás itt:</string>
+  <string name="unable_to_read_hidden_service_name">nem olvasható a rejtett szolgáltatás neve</string>
+  <string name="unable_to_start_tor">A Tor indítása sikertelen:</string>
+  <string name="unable_to_reset_tor">Indítsd újra a készüléked, nem lehet helyreállítani a Tor-t!</string>
+  <string name="pref_use_sys_iptables_title">Alapértelmezett Iptables használata</string>
+  <string name="pref_use_sys_iptables_summary">a beépített iptables bináris használata az Orbot-tal egybecsomagolt helyett</string>
+  <string name="error_installing_binares">A Tor binárisok nem telepíthetőek, vagy frissíthetőek.</string>
+  <string name="pref_use_persistent_notifications">Mindig tartsa az ikont az eszköztáron, ha az Orbot csatlakoztatva van.</string>
+  <string name="pref_use_persistent_notifications_title">Mindig-bekapcsolt értesítések</string>
+  <string name="pref_use_expanded_notifications">Mutassa a bővített értesítést a Tor kilépő országgal és IP-vel</string>
+  <string name="pref_use_expanded_notifications_title">Bővített értesítések</string>
+  <string name="notification_using_bridges">Hidak engedélyezve!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Nyelv</string>
+  <string name="set_locale_summary">Válaszd ki a helyszínt és nyelvet az Orbot-nak</string>
+  <string name="wizard_locale_title">Válassz nyelvet</string>
+  <string name="wizard_locale_msg">Hagyd alapértelmezetten vagy válts az aktuális nyelvre</string>
+  <string name="powered_by">powered by Tor</string>
+  <string name="btn_save_settings">Beállítások mentése</string>
+  <string name="no_internet_connection_tor">Nincs internetkapcsolat; Tor készenlétben...</string>
+  <string name="bandwidth_">Sávszélesség:</string>
+  <string name="down">le</string>
+  <string name="up">fel</string>
+  <string name="pref_disable_network_title">Nincs hálózati auto-alvás</string>
+  <string name="pref_disable_network_summary">A Tor alvó módba helyezése, ha internet nem elérhető</string>
+  <string name="newnym">Új Tor identitásra váltottál!</string>
+  <string name="menu_verify_browser">Böngésző</string>
+  <string name="menu_use_chatsecure">ChatSecure használata</string>
+  <string name="permission_manage_tor_label">Tor kezelése</string>
+  <string name="permission_manage_tor_description">Engedélyezi ennek az alkalmazásnak, hogy a Tor szolgáltatást vezérelje</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Úgy tűnik, hogy neked nincs Orfox telepítve. Kérsz segítséget benne, vagy csak nyissuk meg böngészőt?</string>
+  <string name="install_apps_">Alkalmazások telepítése?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Nincs hálózati kapcsolat. Tor alvó állapotba helyezése...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">A hálózati kapcsolat jó. Tor felébresztése...</string>
+  <string name="updating_settings_in_tor_service">a Tor szolgáltatás beállításainak frissítése</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Port amelyen a Tor a SOCKS proxyt biztosítja (alapértelmezett: 9050 vagy 0 a tiltáshoz)</string>
+  <string name="pref_socks_dialog">SOCKS port konfiguráció</string>
+  <string name="pref_transport_title">Tor TransProxy port</string>
+  <string name="pref_transport_summary">Port, amelyen a Tor a transzparens proxyt ajánl (alapértelmezett: 9040 vagy 0 a tiltáshoz)</string>
+  <string name="pref_transport_dialog">TransProxy port konfiguráció</string>
+  <string name="pref_dnsport_title">Tor DNS port</string>
+  <string name="pref_dnsport_summary">Port, amelyen a Tor a saját DNS-t ajánlja (alapértelmezett: 5400 vagy 0 a letiltáshoz)</string>
+  <string name="pref_dnsport_dialog">DNS port konfiguráció</string>
+  <string name="pref_torrc_title">Torrc egyedi konfiguráció</string>
+  <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 emberi jogok dokumentációja alkalmazás</string>
+  <string name="your_tor_public_ips_">A Tor-od publikus IP-jei:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Kérlek tiltsd le ezt az alkalmazást az Android->Beállítások->Alkalmazások-ban, ha az Orbot-tal problémáid vannak: </string>
+  <string name="app_conflict">Alkalmazás ütközés</string>
+  <string name="pref_transproxy_refresh_title">Transproxy auto-frissítés</string>
+  <string name="pref_transproxy_refresh_summary">A Transproxy szabályok újraalkalmazása, ha a hálózati állapot változik</string>
+  <string name="pref_transproxy_flush_title">Transproxy KÉNYSZERÍTETT ELTÁVOLÍTÁSA</string>
+  <string name="pref_transproxy_flush_summary">Érintsd meg itt, az összes transproxy hálózati szabály AZONNALI kiürítéséhez</string>
+  <string name="transparent_proxy_rules_flushed_">Transzparens proxy szabályok kiürítve!</string>
+  <string name="you_do_not_have_root_access_enabled">Nincs ROOT hozzáférésed engedélyezve</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Szükséged lehet az Orbot megállítására és indítására, hogy a beállítások megváltoztatása engedélyezve legyen.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Hidak frissítve</string>
+  <string name="restart_orbot_to_use_this_bridge_">Kérlek indítsd újra az Orbot-ot a változások engedélyezéséhez</string>
+  <string name="menu_qr">QR kódok</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Ha a mobilhálózatod aktívan blokkolja a Tor-t, használhatsz Hidat, hogy hozzáférj a hálózathoz. VÁLASSZ egyet a fenti híd típusokból, hogy engedélyezd a hidakat.</string>
+  <string name="bridge_mode">Híd mód</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Aktiválás</string>
+  <string name="apps_mode">Alkalmazások VPN mód</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Engedélyezhetsz minden alkalmazást, hogy Tor hálózaton keresztül fussanak az Android VPN funkcióját használva.\n\n*FIGYELMEZTETÉS* Ez egy új, kísérleti funkció és néhány esetben nem indulhat automatikusan, vagy leállhat. NEM kéne névtelenségre használni, CSAK a tűzfalakon és szűrőkön való átjutáshoz.</string>
+  <string name="send_email">Email küldése</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Kaphatsz egy híd-címet emailen, weben keresztül vagy a híd QR kódjának beszkennelésével. Válaszd az \'Email\'-t vagy a \'Web\'-et alább a híd-cím kéréséhez.\n\nAmikor már van egy címed, másold & illeszd be \"Hidak\" preferenciákba az Orbot beállításaiban és indítsd újra.</string>
+  <string name="install_orweb">Orweb telepítése</string>
+  <string name="standard_browser">Standard böngésző</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">MEGJEGYZÉS: Csak standard Tor hidak működnek az Intel X86/ATOM eszközökön</string>
+  <string name="vpn_default_world">Világ</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-hy-rAM/strings.xml b/orbotservice/src/main/res/values-hy-rAM/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/orbotservice/src/main/res/values-hy-rAM/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-ia/strings.xml b/orbotservice/src/main/res/values-ia/strings.xml
new file mode 100644
index 0000000..db863c6
--- /dev/null
+++ b/orbotservice/src/main/res/values-ia/strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_home">Initio</string>
+  <string name="menu_browse">Navigar</string>
+  <string name="menu_settings">Configurationes</string>
+  <string name="menu_info">Adjuta</string>
+  <string name="menu_about">Circa</string>
+  <string name="button_help">Adjuta</string>
+  <string name="button_close">Clauder</string>
+  <string name="button_about">Circa</string>
+  <string name="menu_exit">Sortir</string>
+  <string name="btn_back">Retro</string>
+  <string name="btn_cancel">Cancellar</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Configurationes de proxy:</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">General</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Advertimento</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">Nulle</string>
+  <string name="status">Stato</string>
+  <string name="error">Error</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Salveguardar configurationes</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-id/strings.xml b/orbotservice/src/main/res/values-id/strings.xml
new file mode 100644
index 0000000..344037a
--- /dev/null
+++ b/orbotservice/src/main/res/values-id/strings.xml
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot adalah aplikasi proxy gratis yang membuat aplikasi-aplikasi lainnya dapat terkoneksi dengan internet secara aman. Orbot menggunakan Tor untuk mengenkripsi hubungan internet anda dan menyalurkannya melewati berbagai komputer di seluruh dunia. Tor adalah software gratis dan suatu network terbuka, yang membantu anda menghindari pengawasan network yang mengancam kebebasan pribadi dan privasi, aktivitas bisnis rahasia dan relasi, serta keamanan negara yang dikenal dengan analisa traffic.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">mulai dan akhiri Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot sedang dimulai...</string>
+  <string name="status_activated">Tersambung ke Jaringan Tor</string>
+  <string name="status_disabled">Orbot telah dibatalkan</string>
+  <string name="status_shutting_down">TorService dimatikan</string>
+  <string name="tor_process_starting">Memulai klien Tor...</string>
+  <string name="tor_process_complete">selesai.</string>
+  <string name="tor_process_waiting">menunggu.</string>
+  <string name="not_anonymous_yet">PERINGATAN: Trafik anda belum anonim! Silahkan konfigurasikan aplikasi anda untuk dapat menggunakan proxy HTTP 127.0.0.1:8118 atau SOCKS4A atau proxy SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Beranda</string>
+  <string name="menu_browse">Jelajah</string>
+  <string name="menu_settings">Pengaturan</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Bantuan</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Mulai</string>
+  <string name="menu_stop">Berhenti</string>
+  <string name="menu_about">Tentang</string>
+  <string name="menu_promo_apps">Dapatkan aplikasi...</string>
+  <string name="main_layout_download">Unduh</string>
+  <string name="main_layout_upload">Unggah</string>
+  <string name="button_help">Bantuan</string>
+  <string name="button_close">Tutup</string>
+  <string name="button_about">Tentang</string>
+  <string name="button_clear_log">Hapus Log</string>
+  <string name="menu_verify">Periksa</string>
+  <string name="menu_exit">Keluar</string>
+  <string name="menu_scan">Pindai BridgeQR</string>
+  <string name="menu_share_bridge">Bagikan BridgeQR</string>
+  <string name="press_to_start">- sentuh dan tahan untuk memulai -</string>
+  <string name="pref_trans_proxy_group">Proxy Transparan (Dibutuhkan Root)</string>
+  <string name="pref_trans_proxy_title">Proxy Transparan</string>
+  <string name="pref_trans_proxy_summary">Otomatis Torfying Aplikasi</string>
+  <string name="pref_transparent_all_title">Tor Semuanya</string>
+  <string name="pref_transparent_all_summary">Trafik proxy untuk semua aplikasi melalui Tor</string>
+  <string name="pref_transparent_port_fallback_title">Alternatif Port Proxy</string>
+  <string name="pref_transparent_port_fallback_summary">PERINGATAN: Temukan port umum (80, 443, dll). *Gunakan Hanya* jika \'Semua\' atau \'Aplikasi\' mode tidak bekerja.</string>
+  <string name="pref_transparent_port_title">Daftar Port</string>
+  <string name="pref_transparent_port_summary">Daftar port untuk proxy. *GUNAKAN HANYA* jika modus \'Semua\' atau \'Apl\' tidak bekerja</string>
+  <string name="pref_transparent_port_dialog">Masukkan port untuk proxy</string>
+  <string name="pref_has_root">Minta Akses Root</string>
+  <string name="pref_has_root_summary">Meminta akses root untuk proxy transparan</string>
+  <string name="status_install_success">Binary Tor berhasil dipasang!</string>
+  <string name="status_install_fail">File binary Tor tidak dapat dipasang. Silahkan periksa log dan beritahukan ke tor-assistants at torprojects.org</string>
+  <string name="title_error">Kesalahan Pada Aplikasi</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Tentang Orbot</string>
+  <string name="btn_next">Berikutnya</string>
+  <string name="btn_back">Kembali</string>
+  <string name="btn_finish">Selesai</string>
+  <string name="btn_okay">Oke</string>
+  <string name="btn_cancel">Batal</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Beberapa Rincian Orbot</string>
+  <string name="wizard_details_msg">Orbot adalah aplikasi open-source yang mengandung Tor, LibEvent dan Polipo. Tor menyediakan HTTP proxy (8118) dan SOCKS proxy (9050) lokal menuju jaringan Tor. Orbot juga dapat, pada perangkat yang di-root, untuk mengirimkan semua lalu-lintas data internet melalui Tor.</string>
+  <string name="wizard_permissions_root">Izin Diberikan</string>
+  <string name="wizard_permissions_stock">Perizinan Orbot</string>
+  <string name="wizard_premissions_msg_root">Baik sekali! Kami telah mendeteksi bahwa anda telah mengaktifkan perizinan root untuk Orbot. Kami akan menggunakan kekuatan ini secara bijak.</string>
+  <string name="wizard_permissions_msg_stock">Sementara itu tidak diperlukan, Orbot dapat menjadi tool yang lebih kuat jika perangkat anda memiliki akses root. Gunakan tombol dibawah untuk memberikan kekuatan super kepada Orbot!</string>
+  <string name="wizard_permissions_no_root">Jika anda tidak memiliki akses root atau tidak tahu tentang apa yang kita bicarakan, pastikan untuk menggunakan aplikasi yang dibuat untuk bekerja dengan Orbot.</string>
+  <string name="wizard_permissions_consent">Saya mengerti dan ingin melanjutkan tanpa Superuser</string>
+  <string name="wizard_permission_enable_root">Berikan Akses Root untuk Orbot</string>
+  <string name="wizard_configure">Konfigurasi Torifikasi</string>
+  <string name="wizard_configure_msg">Orbot memberikan pilihan kepada anda untuk mengerahkan semua trafik aplikasi melalui Tor ATAU untuk memilih aplikasi anda secara individu.</string>
+  <string name="wizard_configure_all">Proxy Semua Aplikasi Melalui Tor</string>
+  <string name="wizard_configure_select_apps">Pilih Individu Aplikasi untuk Tor</string>
+  <string name="wizard_tips_tricks">Orbot- Aplikasi teraktifkan</string>
+  <string name="wizard_tips_msg">Aplikasi dibawah ini dikembangkan untuk bekerja dengan Orbot. Klik pada setiap tombol untuk memasangnya sekarang, atau anda dapat menemukan mereka di lain waktu pada Google Play, website GuardianProject.info atau melalui F-Droid.org</string>
+  <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="wizard_tips_twitter">Setel proxy Twitter ke host \"localhost\" dan port 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Tulis cerita dan biarkan Tor yang mengurus keamanannya!</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>
+  <string name="wizard_proxy_help_msg">Jika aplikasi Android yang anda gunakan mendukung penggunaan proxy HTTP atau SOCKS, maka anda dapat mengaturnya untuk terhubung ke Orbot dan menggunakan Tor. Setting host-nya 127.0.0.1 atau \"localhost\". Untuk HTTP, setting port-nya adalah 8118. Untuk SOCKS, proxy-nya adalah 9050. Anda disarankan menggunakan SOCKS4A atau SOCKS5 jika memungkinkan. Anda dapat mempelajari lebih lanjut mengenai pemakaian proxy pada Android melalui FAQ di: http://tinyurl.com/proxyandroid</string>
+  <string name="wizard_final">Orbot sudah siap!</string>
+  <string name="wizard_final_msg">Jutaan orang di seluruh dunia menggunakan Tor untuk berbagai tujuan. Jurnalis dan blogger, pembela hak asasi manusia, penegak hukum, prajurit, perusahaan, warga negara di rezim yang represif, dan warga biasa... dan kini anda sudah siap juga!</string>
+  <string name="wizard_exit_at_first_screen_toast">Konfigurasi Orbot terlebih dahulu sebelum anda menggunakannya!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Hal ini akan membuka peramban web anda ke https://check.torproject.org agar dapat melihat jika Orbot kemungkinan sudah dikonfigurasikan dan anda telah terhubung dengan Tor.</string>
+  <string name="pref_hs_group">Jasa Penyimpanan Rahasia</string>
+  <string name="pref_general_group">Umum</string>
+  <string name="pref_start_boot_title">Mulai Orbot saat Boot</string>
+  <string name="pref_start_boot_summary">Secara otomatis memulai Orbot dan menghubungkan dengan Tor ketika perangkat Android anda boot</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot membawa Tor ke Android! Tor membantu anda melawan penyaringan konten, analisis trafik dan pengawasan jaringan yang mengancam privasi, informasi rahasia dan hubungan pribadi. Wizard ini akan membantu anda mengkonfigurasikan Orbot dan Tor pada perangkat anda.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Peringatan</string>
+  <string name="wizard_warning_msg">Pemasangan Orbot tidak otomatis membuat trafik mobile anda anonim. Anda harus melakukan konfigurasi Orbot, perangkat anda dan aplikasi lainnya untuk dapat menggunakan Tor dengan baik.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Perizinan</string>
+  <string name="wizard_permissions_root_msg1">Anda dapat secara opsional memberikan Orbot akses \'Superuser\' untuk mengaktifkan fitur lanjutan, seperti Transparan Proxying.</string>
+  <string name="wizard_permissions_root_msg2">Jika anda tidak ingin melakukan ini, mohon pastikan bahwa anda menggunakan aplikasi yang dibuat untuk dapat bekerja dengan Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Perangkat anda belum di-root atau tidak punya akses \'Superuser\'. Silakan coba mode \'Aplikasi\' di tampilan utama.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Temukan semua aplikasi Guardian Project di Google Play</string>
+  <string name="wizard_tips_fdroid">Temukan semua aplikasi Guardian Project di F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Temukan semua aplikasi Guardian Project di https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparan Proxying</string>
+  <string name="wizard_transproxy_msg">Hal ini akan memungkinkan aplikasi anda untuk secara otomatis berjalan melalui jaringan Tor tanpa konfigurasi apapun.</string>
+  <string name="wizard_transproxy_hint">(Tandai box ini jika anda tidak tahu apa yang kita bicarakan)</string>
+  <string name="wizard_transproxy_none">Tidak ada</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Mengaktifkan Transparan Proxying Tor untuk Wifi dan Perangkat Tether USB (diperlukan restart)</string>
+  <string name="button_grant_superuser">Meminta Akses Superuser</string>
+  <string name="pref_select_apps">Pilih Aplikasi</string>
+  <string name="pref_select_apps_summary">Pilih Aplikasi untuk Mengerahkan Melalui Tor</string>
+  <string name="pref_node_configuration">Konfigurasi Simpul</string>
+  <string name="pref_node_configuration_summary">Itu adalah pengaturan lanjutan yang dapat mengurangi anonimitas anda</string>
+  <string name="pref_entrance_node">Simpul Masuk</string>
+  <string name="pref_entrance_node_summary">Sidik jari, alias, negara dan alamat untuk loncatan pertama</string>
+  <string name="pref_entrance_node_dialog">Masukkan Simpul Masuk</string>
+  <string name="pref_allow_background_starts_title">Ijinkan Latar Belakang Berjalan</string>
+  <string name="button_proxy_all">Proxy Semuanya</string>
+  <string name="button_proxy_none">Tanpa Proxy</string>
+  <string name="button_invert_selection">Balik Pilihan</string>
+  <string name="pref_proxy_title">Outbound Proxy Jaringan (Opsional)</string>
+  <string name="pref_proxy_type_title">Outbound Jenis Proxy</string>
+  <string name="pref_proxy_type_summary">Protokol yang digunakan untuk server proxy: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Masukkan Jenis Proxy</string>
+  <string name="pref_proxy_host_title">Outbound Host Proxy</string>
+  <string name="pref_proxy_host_summary">Nama host Server Proxy</string>
+  <string name="pref_proxy_host_dialog">Masukkan Host Proxy</string>
+  <string name="pref_proxy_port_title">Outbound Port Proxy</string>
+  <string name="pref_proxy_port_summary">Port Server Proxy</string>
+  <string name="pref_proxy_port_dialog">Masukkan port Proxy</string>
+  <string name="pref_proxy_username_title">Outbound Nama Pengguna Proxy</string>
+  <string name="pref_proxy_username_summary">Nama Pengguna Proxy (Opsional)</string>
+  <string name="pref_proxy_username_dialog">Masukkan Nama Pengguna Proxy</string>
+  <string name="pref_proxy_password_title">Outbound Sandi Proxy</string>
+  <string name="pref_proxy_password_summary">Sandi Proxy (Opsional)</string>
+  <string name="pref_proxy_password_dialog">Masukkan Sandi Proxy</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Menyetel transparan proxying penuh...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Menyetel apl-berbasis proxying transparan...</string>
+  <string name="transparent_proxying_enabled">Proxying transparan DIAKTIFKAN</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy diaktifkan untuk Tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">PERINGATAN: kesalahan dalam memulai proxying transparan!</string>
+  <string name="transproxy_rules_cleared">Aturan TransProxy dibersihkan</string>
+  <string name="couldn_t_start_tor_process_">Tidak dapat memulai proses Tor:</string>
+  <string name="privoxy_is_running_on_port_">Polipo aktif di port:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Menyetel proxying transparan berbasis-port...</string>
+  <string name="bridge_error">Kesalahan pada Bridge</string>
+  <string name="bridge_requires_ip">Agar dapat menggunakan fitur bridge, anda perlu memasukkan minimal satu alamat IP bridge.</string>
+  <string name="send_email_for_bridges">Kirimkan email ke bridges at torproject.org dengan baris \"get bridges\" dengan sendirinya dalam tubuh surat dari akun gmail.</string>
+  <string name="error">Kesalahan</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Pengaturan ReachableAddresses anda menyebabkan kesalahan!</string>
+  <string name="your_relay_settings_caused_an_exception_">Pengaturan relay anda menyebabkan kesalahan!</string>
+  <string name="exit_nodes">Node Keluar</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">fingerprints, nama, negara dan alamat untuk hop terakhir</string>
+  <string name="enter_exit_nodes">Memasuki Node Keluar</string>
+  <string name="exclude_nodes">Node pengecualian</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Pengecualian fingerprints,nama, negara dan alamat</string>
+  <string name="enter_exclude_nodes">Memasuki Node Pengecualian</string>
+  <string name="strict_nodes">Node Terlarang</string>
+  <string name="use_only_these_specified_nodes">Pakai *hanya* spesifik node</string>
+  <string name="bridges">Bridges</string>
+  <string name="use_bridges">Pakai Bridges</string>
+  <string name="bridges_obfuscated">Bridges Terobfuskasi</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Nyalakan alternatif node masuk ke dalam Tor Network</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Nyalakan jika pengaturan bridges adalah bridges terobfuskasi</string>
+  <string name="ip_address_and_port_of_bridges">Alamat IP dan port bridges</string>
+  <string name="enter_bridge_addresses">Memasuki Alamat Bridge</string>
+  <string name="relays">Relays</string>
+  <string name="relaying">Sedang me-Relay</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Nyalakan perangkat anda menjadi non-exit relay</string>
+  <string name="relay_port">Port Relay</string>
+  <string name="listening_port_for_your_tor_relay">Port mendengarkan untuk TOR relay anda</string>
+  <string name="enter_or_port">Memasuki OR port</string>
+  <string name="relay_nickname">Nama Relay</string>
+  <string name="the_nickname_for_your_tor_relay">sebuah nama untuk Tor Relay anda</string>
+  <string name="enter_a_custom_relay_nickname">Masukkan nama relay</string>
+  <string name="reachable_addresses">Addresses Terjangkau</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Jalankan sebagai client dibalik firewall dengan ketentuan ketat</string>
+  <string name="reachable_ports">Ports terjangkau</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Port terjangkau dibalik firewall ketat</string>
+  <string name="enter_ports">Memasuki ports</string>
+  <string name="enable_hidden_services">Layanan Penyimpanan Rahasia</string>
+  <string name="run_servers_accessible_via_the_tor_network">Membolehkan perangkat-nyala untuk diakses lewat Tor Network</string>
+  <string name="enter_localhost_ports_for_hidden_services">memasuki localhost port untuk layanan rahasia</string>
+  <string name="hidden_service_ports">Ports Layanan Rahasia</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">nama teralamatkan untuk layanan rahasia anda (otomatis dibuat)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">nyalakan debug log untuk output (harus menggunakan adb atau aLogCat untuk menampilkan)</string>
+  <string name="project_home">Beranda Projek:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android https://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Lisensi Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Perangkat Lunak Pihak Ke-3:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Sebuah aplikasi ingin membuka port %S server tersembunyi ke jaringan Tor. Hal ini aman jika anda mempercayai aplikasi tersebut.</string>
+  <string name="found_existing_tor_process">menemukan proses Tor yang ada...</string>
+  <string name="something_bad_happened">Sesuatu yang buruk terjadi. Periksa log</string>
+  <string name="hidden_service_on">layanan tersembunyi pada:</string>
+  <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string>
+  <string name="unable_to_start_tor">Tidak dapat memulai Tor:</string>
+  <string name="unable_to_reset_tor">Boot ulang perangkat anda, gagal me-reset Tor!</string>
+  <string name="pref_use_sys_iptables_title">Gunakan Iptables Default</string>
+  <string name="pref_use_sys_iptables_summary">menggunakan binary iptables built-in daripada yang disertakan dengan Orbot</string>
+  <string name="error_installing_binares">Binary Tor tidak dapat dipasang atau ditingkatkan</string>
+  <string name="pref_use_persistent_notifications">Selalu pelihara icon dalam toolbar ketika Orbot terhubung</string>
+  <string name="pref_use_persistent_notifications_title">Pemberitahuan Selalu-Hidup</string>
+  <string name="pref_use_expanded_notifications">Tampilkan notifikasi melebar dengan negara dan IP keluar Tor</string>
+  <string name="pref_use_expanded_notifications_title">Notifikasi Melebar</string>
+  <string name="notification_using_bridges">Bridge diaktifkan!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Bahasa</string>
+  <string name="set_locale_summary">Pilih lokal dan bahasa untuk Orbot</string>
+  <string name="wizard_locale_title">Pilih Bahasa</string>
+  <string name="wizard_locale_msg">Biarkan default atau berlaih ke bahasa saat ini</string>
+  <string name="powered_by">diperkuat dengan Tor</string>
+  <string name="btn_save_settings">Simpan Pengaturan</string>
+  <string name="no_internet_connection_tor">Tidak ada koneksi internet; Tor sedang standby...</string>
+  <string name="bandwidth_">Bandwidth:</string>
+  <string name="down">unduh</string>
+  <string name="up">unggah</string>
+  <string name="pref_disable_network_title">Auto-Tidur Tidak Ada Jaringan</string>
+  <string name="pref_disable_network_summary">Menempatkan Tor untuk tidur ketika tidak ada internet yang tersedia</string>
+  <string name="newnym">Anda telah beralih ke identitas Tor baru!</string>
+  <string name="menu_verify_browser">Peramban</string>
+  <string name="menu_use_chatsecure">Gunakan ChatSecure</string>
+  <string name="permission_manage_tor_label">Kelola Tor</string>
+  <string name="permission_manage_tor_description">Aktifkan aplikasi ini untuk mengontrol layanan Tor</string>
+  <string name="install_apps_">Pasang aplikasi?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Tidak ada jaringan terhubung. Menidurkan Tor...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Jaringan terhubung baik. Memanggil Tor...</string>
+  <string name="updating_settings_in_tor_service">memperbarui setting pada layanan Tor</string>
+  <string name="pref_socks_title">SOCKS Tor</string>
+  <string name="pref_socks_summary">Port tempat proxy SOCKS Tor aktif (standar: 9050 atau 0 untuk mematikan)</string>
+  <string name="pref_socks_dialog">Konfigurasi Port SOCKS</string>
+  <string name="pref_transport_title">Port TransProxy Tor</string>
+  <string name="pref_transport_summary">Port tempat Proxy Transparan Tor aktif (standar: 9040 atau 0 untuk mematikan)</string>
+  <string name="pref_transport_dialog">Konfigurasi Port TransProxy</string>
+  <string name="pref_dnsport_title">Port DNS Tor</string>
+  <string name="pref_dnsport_summary">Port tempat DNS Tor aktif (standar: 5400 atau 0 untuk mematikan)</string>
+  <string name="pref_dnsport_dialog">Konfigurasi Port DNS</string>
+  <string name="pref_torrc_title">Konfigurasi Torrc</string>
+  <string name="pref_torrc_summary">HANYA UNTUK AHLI: masukkan baris konfigurasi direct Torrc</string>
+  <string name="pref_torrc_dialog">Torrc Custom</string>
+  <string name="wizard_tips_martus">Mobile Martus - Aplikasi Dokumentasi Hak Asasi Manusia milik Benetech</string>
+  <string name="your_tor_public_ips_">IP Publik Tor Anda:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Mohon nonaktifkan aplikasi ini di Android Settings Apps jika Orbot anda bermasalah</string>
+  <string name="app_conflict">Konflik Aplikasi</string>
+  <string name="pref_transproxy_refresh_title">Auto-Refresh Transproxy</string>
+  <string name="pref_transproxy_refresh_summary">Pasang ulang rule Transproxy saat status jaringan berubah</string>
+  <string name="pref_transproxy_flush_title">BUANG PAKSA Transproxy</string>
+  <string name="pref_transproxy_flush_summary">Ketuk disini untuk mengosongkan semua rule jaringan Transproxy SEKARANG</string>
+  <string name="transparent_proxy_rules_flushed_">Rule proxy transparan telah kosong!</string>
+  <string name="you_do_not_have_root_access_enabled">Anda tidak punya akses ROOT</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Anda mungkin harus stop lalu start kembali Orbot agar perubahan setting menjadi aktif.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Bridge Telah Diperbarui</string>
+  <string name="restart_orbot_to_use_this_bridge_">Silakan start ulang Orbot untuk mengaktifkan perubahan</string>
+  <string name="menu_qr">Kode QR</string>
+  <string name="bridge_mode">Mode Bridge</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Laman</string>
+  <string name="activate">Aktivasi</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Anda dapat membuat semua aplikasi di perangkat anda bekerja melalui jaringan Tor menggunakan fitur VPN dari Android. *AWAS* Fitur ini masih baru, percobaan dan pada beberapa kasus tidak start otomatis, atau bahkan berhenti. Tidak untuk anonimitas, dan HANYA untuk melewati firewall dan penyaringan.</string>
+  <string name="send_email">Kirim Email</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Anda bisa mendapatkan alamat bridge melalui email, halaman web atau dengan memindai kode QR bridge tersebut. Pilih \'Email\' atau \'Laman\' di bawah untuk meminta alamat bridge. Setelah anda mendapatkannya, salin lalu tempel di pilihan \"Bridges\" pada setting Orbot lalu start ulang.</string>
+  <string name="standard_browser">Peramban Standar</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">CATATAN: Hanya bridge Tor yang standar yang bekerja di perangkat Intel X86/ATOM</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-in-rID/strings.xml b/orbotservice/src/main/res/values-in-rID/strings.xml
new file mode 100644
index 0000000..344037a
--- /dev/null
+++ b/orbotservice/src/main/res/values-in-rID/strings.xml
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot adalah aplikasi proxy gratis yang membuat aplikasi-aplikasi lainnya dapat terkoneksi dengan internet secara aman. Orbot menggunakan Tor untuk mengenkripsi hubungan internet anda dan menyalurkannya melewati berbagai komputer di seluruh dunia. Tor adalah software gratis dan suatu network terbuka, yang membantu anda menghindari pengawasan network yang mengancam kebebasan pribadi dan privasi, aktivitas bisnis rahasia dan relasi, serta keamanan negara yang dikenal dengan analisa traffic.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">mulai dan akhiri Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot sedang dimulai...</string>
+  <string name="status_activated">Tersambung ke Jaringan Tor</string>
+  <string name="status_disabled">Orbot telah dibatalkan</string>
+  <string name="status_shutting_down">TorService dimatikan</string>
+  <string name="tor_process_starting">Memulai klien Tor...</string>
+  <string name="tor_process_complete">selesai.</string>
+  <string name="tor_process_waiting">menunggu.</string>
+  <string name="not_anonymous_yet">PERINGATAN: Trafik anda belum anonim! Silahkan konfigurasikan aplikasi anda untuk dapat menggunakan proxy HTTP 127.0.0.1:8118 atau SOCKS4A atau proxy SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Beranda</string>
+  <string name="menu_browse">Jelajah</string>
+  <string name="menu_settings">Pengaturan</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Bantuan</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Mulai</string>
+  <string name="menu_stop">Berhenti</string>
+  <string name="menu_about">Tentang</string>
+  <string name="menu_promo_apps">Dapatkan aplikasi...</string>
+  <string name="main_layout_download">Unduh</string>
+  <string name="main_layout_upload">Unggah</string>
+  <string name="button_help">Bantuan</string>
+  <string name="button_close">Tutup</string>
+  <string name="button_about">Tentang</string>
+  <string name="button_clear_log">Hapus Log</string>
+  <string name="menu_verify">Periksa</string>
+  <string name="menu_exit">Keluar</string>
+  <string name="menu_scan">Pindai BridgeQR</string>
+  <string name="menu_share_bridge">Bagikan BridgeQR</string>
+  <string name="press_to_start">- sentuh dan tahan untuk memulai -</string>
+  <string name="pref_trans_proxy_group">Proxy Transparan (Dibutuhkan Root)</string>
+  <string name="pref_trans_proxy_title">Proxy Transparan</string>
+  <string name="pref_trans_proxy_summary">Otomatis Torfying Aplikasi</string>
+  <string name="pref_transparent_all_title">Tor Semuanya</string>
+  <string name="pref_transparent_all_summary">Trafik proxy untuk semua aplikasi melalui Tor</string>
+  <string name="pref_transparent_port_fallback_title">Alternatif Port Proxy</string>
+  <string name="pref_transparent_port_fallback_summary">PERINGATAN: Temukan port umum (80, 443, dll). *Gunakan Hanya* jika \'Semua\' atau \'Aplikasi\' mode tidak bekerja.</string>
+  <string name="pref_transparent_port_title">Daftar Port</string>
+  <string name="pref_transparent_port_summary">Daftar port untuk proxy. *GUNAKAN HANYA* jika modus \'Semua\' atau \'Apl\' tidak bekerja</string>
+  <string name="pref_transparent_port_dialog">Masukkan port untuk proxy</string>
+  <string name="pref_has_root">Minta Akses Root</string>
+  <string name="pref_has_root_summary">Meminta akses root untuk proxy transparan</string>
+  <string name="status_install_success">Binary Tor berhasil dipasang!</string>
+  <string name="status_install_fail">File binary Tor tidak dapat dipasang. Silahkan periksa log dan beritahukan ke tor-assistants at torprojects.org</string>
+  <string name="title_error">Kesalahan Pada Aplikasi</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Tentang Orbot</string>
+  <string name="btn_next">Berikutnya</string>
+  <string name="btn_back">Kembali</string>
+  <string name="btn_finish">Selesai</string>
+  <string name="btn_okay">Oke</string>
+  <string name="btn_cancel">Batal</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Beberapa Rincian Orbot</string>
+  <string name="wizard_details_msg">Orbot adalah aplikasi open-source yang mengandung Tor, LibEvent dan Polipo. Tor menyediakan HTTP proxy (8118) dan SOCKS proxy (9050) lokal menuju jaringan Tor. Orbot juga dapat, pada perangkat yang di-root, untuk mengirimkan semua lalu-lintas data internet melalui Tor.</string>
+  <string name="wizard_permissions_root">Izin Diberikan</string>
+  <string name="wizard_permissions_stock">Perizinan Orbot</string>
+  <string name="wizard_premissions_msg_root">Baik sekali! Kami telah mendeteksi bahwa anda telah mengaktifkan perizinan root untuk Orbot. Kami akan menggunakan kekuatan ini secara bijak.</string>
+  <string name="wizard_permissions_msg_stock">Sementara itu tidak diperlukan, Orbot dapat menjadi tool yang lebih kuat jika perangkat anda memiliki akses root. Gunakan tombol dibawah untuk memberikan kekuatan super kepada Orbot!</string>
+  <string name="wizard_permissions_no_root">Jika anda tidak memiliki akses root atau tidak tahu tentang apa yang kita bicarakan, pastikan untuk menggunakan aplikasi yang dibuat untuk bekerja dengan Orbot.</string>
+  <string name="wizard_permissions_consent">Saya mengerti dan ingin melanjutkan tanpa Superuser</string>
+  <string name="wizard_permission_enable_root">Berikan Akses Root untuk Orbot</string>
+  <string name="wizard_configure">Konfigurasi Torifikasi</string>
+  <string name="wizard_configure_msg">Orbot memberikan pilihan kepada anda untuk mengerahkan semua trafik aplikasi melalui Tor ATAU untuk memilih aplikasi anda secara individu.</string>
+  <string name="wizard_configure_all">Proxy Semua Aplikasi Melalui Tor</string>
+  <string name="wizard_configure_select_apps">Pilih Individu Aplikasi untuk Tor</string>
+  <string name="wizard_tips_tricks">Orbot- Aplikasi teraktifkan</string>
+  <string name="wizard_tips_msg">Aplikasi dibawah ini dikembangkan untuk bekerja dengan Orbot. Klik pada setiap tombol untuk memasangnya sekarang, atau anda dapat menemukan mereka di lain waktu pada Google Play, website GuardianProject.info atau melalui F-Droid.org</string>
+  <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="wizard_tips_twitter">Setel proxy Twitter ke host \"localhost\" dan port 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Tulis cerita dan biarkan Tor yang mengurus keamanannya!</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>
+  <string name="wizard_proxy_help_msg">Jika aplikasi Android yang anda gunakan mendukung penggunaan proxy HTTP atau SOCKS, maka anda dapat mengaturnya untuk terhubung ke Orbot dan menggunakan Tor. Setting host-nya 127.0.0.1 atau \"localhost\". Untuk HTTP, setting port-nya adalah 8118. Untuk SOCKS, proxy-nya adalah 9050. Anda disarankan menggunakan SOCKS4A atau SOCKS5 jika memungkinkan. Anda dapat mempelajari lebih lanjut mengenai pemakaian proxy pada Android melalui FAQ di: http://tinyurl.com/proxyandroid</string>
+  <string name="wizard_final">Orbot sudah siap!</string>
+  <string name="wizard_final_msg">Jutaan orang di seluruh dunia menggunakan Tor untuk berbagai tujuan. Jurnalis dan blogger, pembela hak asasi manusia, penegak hukum, prajurit, perusahaan, warga negara di rezim yang represif, dan warga biasa... dan kini anda sudah siap juga!</string>
+  <string name="wizard_exit_at_first_screen_toast">Konfigurasi Orbot terlebih dahulu sebelum anda menggunakannya!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Hal ini akan membuka peramban web anda ke https://check.torproject.org agar dapat melihat jika Orbot kemungkinan sudah dikonfigurasikan dan anda telah terhubung dengan Tor.</string>
+  <string name="pref_hs_group">Jasa Penyimpanan Rahasia</string>
+  <string name="pref_general_group">Umum</string>
+  <string name="pref_start_boot_title">Mulai Orbot saat Boot</string>
+  <string name="pref_start_boot_summary">Secara otomatis memulai Orbot dan menghubungkan dengan Tor ketika perangkat Android anda boot</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot membawa Tor ke Android! Tor membantu anda melawan penyaringan konten, analisis trafik dan pengawasan jaringan yang mengancam privasi, informasi rahasia dan hubungan pribadi. Wizard ini akan membantu anda mengkonfigurasikan Orbot dan Tor pada perangkat anda.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Peringatan</string>
+  <string name="wizard_warning_msg">Pemasangan Orbot tidak otomatis membuat trafik mobile anda anonim. Anda harus melakukan konfigurasi Orbot, perangkat anda dan aplikasi lainnya untuk dapat menggunakan Tor dengan baik.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Perizinan</string>
+  <string name="wizard_permissions_root_msg1">Anda dapat secara opsional memberikan Orbot akses \'Superuser\' untuk mengaktifkan fitur lanjutan, seperti Transparan Proxying.</string>
+  <string name="wizard_permissions_root_msg2">Jika anda tidak ingin melakukan ini, mohon pastikan bahwa anda menggunakan aplikasi yang dibuat untuk dapat bekerja dengan Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Perangkat anda belum di-root atau tidak punya akses \'Superuser\'. Silakan coba mode \'Aplikasi\' di tampilan utama.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Temukan semua aplikasi Guardian Project di Google Play</string>
+  <string name="wizard_tips_fdroid">Temukan semua aplikasi Guardian Project di F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Temukan semua aplikasi Guardian Project di https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparan Proxying</string>
+  <string name="wizard_transproxy_msg">Hal ini akan memungkinkan aplikasi anda untuk secara otomatis berjalan melalui jaringan Tor tanpa konfigurasi apapun.</string>
+  <string name="wizard_transproxy_hint">(Tandai box ini jika anda tidak tahu apa yang kita bicarakan)</string>
+  <string name="wizard_transproxy_none">Tidak ada</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Mengaktifkan Transparan Proxying Tor untuk Wifi dan Perangkat Tether USB (diperlukan restart)</string>
+  <string name="button_grant_superuser">Meminta Akses Superuser</string>
+  <string name="pref_select_apps">Pilih Aplikasi</string>
+  <string name="pref_select_apps_summary">Pilih Aplikasi untuk Mengerahkan Melalui Tor</string>
+  <string name="pref_node_configuration">Konfigurasi Simpul</string>
+  <string name="pref_node_configuration_summary">Itu adalah pengaturan lanjutan yang dapat mengurangi anonimitas anda</string>
+  <string name="pref_entrance_node">Simpul Masuk</string>
+  <string name="pref_entrance_node_summary">Sidik jari, alias, negara dan alamat untuk loncatan pertama</string>
+  <string name="pref_entrance_node_dialog">Masukkan Simpul Masuk</string>
+  <string name="pref_allow_background_starts_title">Ijinkan Latar Belakang Berjalan</string>
+  <string name="button_proxy_all">Proxy Semuanya</string>
+  <string name="button_proxy_none">Tanpa Proxy</string>
+  <string name="button_invert_selection">Balik Pilihan</string>
+  <string name="pref_proxy_title">Outbound Proxy Jaringan (Opsional)</string>
+  <string name="pref_proxy_type_title">Outbound Jenis Proxy</string>
+  <string name="pref_proxy_type_summary">Protokol yang digunakan untuk server proxy: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Masukkan Jenis Proxy</string>
+  <string name="pref_proxy_host_title">Outbound Host Proxy</string>
+  <string name="pref_proxy_host_summary">Nama host Server Proxy</string>
+  <string name="pref_proxy_host_dialog">Masukkan Host Proxy</string>
+  <string name="pref_proxy_port_title">Outbound Port Proxy</string>
+  <string name="pref_proxy_port_summary">Port Server Proxy</string>
+  <string name="pref_proxy_port_dialog">Masukkan port Proxy</string>
+  <string name="pref_proxy_username_title">Outbound Nama Pengguna Proxy</string>
+  <string name="pref_proxy_username_summary">Nama Pengguna Proxy (Opsional)</string>
+  <string name="pref_proxy_username_dialog">Masukkan Nama Pengguna Proxy</string>
+  <string name="pref_proxy_password_title">Outbound Sandi Proxy</string>
+  <string name="pref_proxy_password_summary">Sandi Proxy (Opsional)</string>
+  <string name="pref_proxy_password_dialog">Masukkan Sandi Proxy</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Menyetel transparan proxying penuh...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Menyetel apl-berbasis proxying transparan...</string>
+  <string name="transparent_proxying_enabled">Proxying transparan DIAKTIFKAN</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy diaktifkan untuk Tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">PERINGATAN: kesalahan dalam memulai proxying transparan!</string>
+  <string name="transproxy_rules_cleared">Aturan TransProxy dibersihkan</string>
+  <string name="couldn_t_start_tor_process_">Tidak dapat memulai proses Tor:</string>
+  <string name="privoxy_is_running_on_port_">Polipo aktif di port:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Menyetel proxying transparan berbasis-port...</string>
+  <string name="bridge_error">Kesalahan pada Bridge</string>
+  <string name="bridge_requires_ip">Agar dapat menggunakan fitur bridge, anda perlu memasukkan minimal satu alamat IP bridge.</string>
+  <string name="send_email_for_bridges">Kirimkan email ke bridges at torproject.org dengan baris \"get bridges\" dengan sendirinya dalam tubuh surat dari akun gmail.</string>
+  <string name="error">Kesalahan</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Pengaturan ReachableAddresses anda menyebabkan kesalahan!</string>
+  <string name="your_relay_settings_caused_an_exception_">Pengaturan relay anda menyebabkan kesalahan!</string>
+  <string name="exit_nodes">Node Keluar</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">fingerprints, nama, negara dan alamat untuk hop terakhir</string>
+  <string name="enter_exit_nodes">Memasuki Node Keluar</string>
+  <string name="exclude_nodes">Node pengecualian</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Pengecualian fingerprints,nama, negara dan alamat</string>
+  <string name="enter_exclude_nodes">Memasuki Node Pengecualian</string>
+  <string name="strict_nodes">Node Terlarang</string>
+  <string name="use_only_these_specified_nodes">Pakai *hanya* spesifik node</string>
+  <string name="bridges">Bridges</string>
+  <string name="use_bridges">Pakai Bridges</string>
+  <string name="bridges_obfuscated">Bridges Terobfuskasi</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Nyalakan alternatif node masuk ke dalam Tor Network</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Nyalakan jika pengaturan bridges adalah bridges terobfuskasi</string>
+  <string name="ip_address_and_port_of_bridges">Alamat IP dan port bridges</string>
+  <string name="enter_bridge_addresses">Memasuki Alamat Bridge</string>
+  <string name="relays">Relays</string>
+  <string name="relaying">Sedang me-Relay</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Nyalakan perangkat anda menjadi non-exit relay</string>
+  <string name="relay_port">Port Relay</string>
+  <string name="listening_port_for_your_tor_relay">Port mendengarkan untuk TOR relay anda</string>
+  <string name="enter_or_port">Memasuki OR port</string>
+  <string name="relay_nickname">Nama Relay</string>
+  <string name="the_nickname_for_your_tor_relay">sebuah nama untuk Tor Relay anda</string>
+  <string name="enter_a_custom_relay_nickname">Masukkan nama relay</string>
+  <string name="reachable_addresses">Addresses Terjangkau</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Jalankan sebagai client dibalik firewall dengan ketentuan ketat</string>
+  <string name="reachable_ports">Ports terjangkau</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Port terjangkau dibalik firewall ketat</string>
+  <string name="enter_ports">Memasuki ports</string>
+  <string name="enable_hidden_services">Layanan Penyimpanan Rahasia</string>
+  <string name="run_servers_accessible_via_the_tor_network">Membolehkan perangkat-nyala untuk diakses lewat Tor Network</string>
+  <string name="enter_localhost_ports_for_hidden_services">memasuki localhost port untuk layanan rahasia</string>
+  <string name="hidden_service_ports">Ports Layanan Rahasia</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">nama teralamatkan untuk layanan rahasia anda (otomatis dibuat)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">nyalakan debug log untuk output (harus menggunakan adb atau aLogCat untuk menampilkan)</string>
+  <string name="project_home">Beranda Projek:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android https://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Lisensi Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Perangkat Lunak Pihak Ke-3:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Sebuah aplikasi ingin membuka port %S server tersembunyi ke jaringan Tor. Hal ini aman jika anda mempercayai aplikasi tersebut.</string>
+  <string name="found_existing_tor_process">menemukan proses Tor yang ada...</string>
+  <string name="something_bad_happened">Sesuatu yang buruk terjadi. Periksa log</string>
+  <string name="hidden_service_on">layanan tersembunyi pada:</string>
+  <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string>
+  <string name="unable_to_start_tor">Tidak dapat memulai Tor:</string>
+  <string name="unable_to_reset_tor">Boot ulang perangkat anda, gagal me-reset Tor!</string>
+  <string name="pref_use_sys_iptables_title">Gunakan Iptables Default</string>
+  <string name="pref_use_sys_iptables_summary">menggunakan binary iptables built-in daripada yang disertakan dengan Orbot</string>
+  <string name="error_installing_binares">Binary Tor tidak dapat dipasang atau ditingkatkan</string>
+  <string name="pref_use_persistent_notifications">Selalu pelihara icon dalam toolbar ketika Orbot terhubung</string>
+  <string name="pref_use_persistent_notifications_title">Pemberitahuan Selalu-Hidup</string>
+  <string name="pref_use_expanded_notifications">Tampilkan notifikasi melebar dengan negara dan IP keluar Tor</string>
+  <string name="pref_use_expanded_notifications_title">Notifikasi Melebar</string>
+  <string name="notification_using_bridges">Bridge diaktifkan!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Bahasa</string>
+  <string name="set_locale_summary">Pilih lokal dan bahasa untuk Orbot</string>
+  <string name="wizard_locale_title">Pilih Bahasa</string>
+  <string name="wizard_locale_msg">Biarkan default atau berlaih ke bahasa saat ini</string>
+  <string name="powered_by">diperkuat dengan Tor</string>
+  <string name="btn_save_settings">Simpan Pengaturan</string>
+  <string name="no_internet_connection_tor">Tidak ada koneksi internet; Tor sedang standby...</string>
+  <string name="bandwidth_">Bandwidth:</string>
+  <string name="down">unduh</string>
+  <string name="up">unggah</string>
+  <string name="pref_disable_network_title">Auto-Tidur Tidak Ada Jaringan</string>
+  <string name="pref_disable_network_summary">Menempatkan Tor untuk tidur ketika tidak ada internet yang tersedia</string>
+  <string name="newnym">Anda telah beralih ke identitas Tor baru!</string>
+  <string name="menu_verify_browser">Peramban</string>
+  <string name="menu_use_chatsecure">Gunakan ChatSecure</string>
+  <string name="permission_manage_tor_label">Kelola Tor</string>
+  <string name="permission_manage_tor_description">Aktifkan aplikasi ini untuk mengontrol layanan Tor</string>
+  <string name="install_apps_">Pasang aplikasi?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Tidak ada jaringan terhubung. Menidurkan Tor...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Jaringan terhubung baik. Memanggil Tor...</string>
+  <string name="updating_settings_in_tor_service">memperbarui setting pada layanan Tor</string>
+  <string name="pref_socks_title">SOCKS Tor</string>
+  <string name="pref_socks_summary">Port tempat proxy SOCKS Tor aktif (standar: 9050 atau 0 untuk mematikan)</string>
+  <string name="pref_socks_dialog">Konfigurasi Port SOCKS</string>
+  <string name="pref_transport_title">Port TransProxy Tor</string>
+  <string name="pref_transport_summary">Port tempat Proxy Transparan Tor aktif (standar: 9040 atau 0 untuk mematikan)</string>
+  <string name="pref_transport_dialog">Konfigurasi Port TransProxy</string>
+  <string name="pref_dnsport_title">Port DNS Tor</string>
+  <string name="pref_dnsport_summary">Port tempat DNS Tor aktif (standar: 5400 atau 0 untuk mematikan)</string>
+  <string name="pref_dnsport_dialog">Konfigurasi Port DNS</string>
+  <string name="pref_torrc_title">Konfigurasi Torrc</string>
+  <string name="pref_torrc_summary">HANYA UNTUK AHLI: masukkan baris konfigurasi direct Torrc</string>
+  <string name="pref_torrc_dialog">Torrc Custom</string>
+  <string name="wizard_tips_martus">Mobile Martus - Aplikasi Dokumentasi Hak Asasi Manusia milik Benetech</string>
+  <string name="your_tor_public_ips_">IP Publik Tor Anda:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Mohon nonaktifkan aplikasi ini di Android Settings Apps jika Orbot anda bermasalah</string>
+  <string name="app_conflict">Konflik Aplikasi</string>
+  <string name="pref_transproxy_refresh_title">Auto-Refresh Transproxy</string>
+  <string name="pref_transproxy_refresh_summary">Pasang ulang rule Transproxy saat status jaringan berubah</string>
+  <string name="pref_transproxy_flush_title">BUANG PAKSA Transproxy</string>
+  <string name="pref_transproxy_flush_summary">Ketuk disini untuk mengosongkan semua rule jaringan Transproxy SEKARANG</string>
+  <string name="transparent_proxy_rules_flushed_">Rule proxy transparan telah kosong!</string>
+  <string name="you_do_not_have_root_access_enabled">Anda tidak punya akses ROOT</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Anda mungkin harus stop lalu start kembali Orbot agar perubahan setting menjadi aktif.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Bridge Telah Diperbarui</string>
+  <string name="restart_orbot_to_use_this_bridge_">Silakan start ulang Orbot untuk mengaktifkan perubahan</string>
+  <string name="menu_qr">Kode QR</string>
+  <string name="bridge_mode">Mode Bridge</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Laman</string>
+  <string name="activate">Aktivasi</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Anda dapat membuat semua aplikasi di perangkat anda bekerja melalui jaringan Tor menggunakan fitur VPN dari Android. *AWAS* Fitur ini masih baru, percobaan dan pada beberapa kasus tidak start otomatis, atau bahkan berhenti. Tidak untuk anonimitas, dan HANYA untuk melewati firewall dan penyaringan.</string>
+  <string name="send_email">Kirim Email</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Anda bisa mendapatkan alamat bridge melalui email, halaman web atau dengan memindai kode QR bridge tersebut. Pilih \'Email\' atau \'Laman\' di bawah untuk meminta alamat bridge. Setelah anda mendapatkannya, salin lalu tempel di pilihan \"Bridges\" pada setting Orbot lalu start ulang.</string>
+  <string name="standard_browser">Peramban Standar</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">CATATAN: Hanya bridge Tor yang standar yang bekerja di perangkat Intel X86/ATOM</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-in/strings.xml b/orbotservice/src/main/res/values-in/strings.xml
new file mode 100644
index 0000000..42c4461
--- /dev/null
+++ b/orbotservice/src/main/res/values-in/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">mulai dan akhiri Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot sedang dimulai…</string>
+  <string name="status_activated">Tersambung ke Jaringan Tor</string>
+  <string name="status_disabled">Orbot telah dibatalkan</string>
+  <string name="status_shutting_down">Orbot sedang dimatikan</string>
+  <string name="not_anonymous_yet">PERINGATAN: </string>
+  <string name="menu_home">Home</string>
+  <string name="menu_browse">Jelajahi</string>
+  <string name="menu_settings">Pengaturan</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Bantuan</string>
+  <string name="menu_about">Mengenai</string>
+  <string name="button_help">Bantuan</string>
+  <string name="button_close">Dekat</string>
+  <string name="button_about">Mengenai</string>
+  <string name="button_clear_log">Hapus Log</string>
+  <string name="menu_verify">Periksa</string>
+  <string name="menu_exit">Keluar</string>
+  <string name="pref_transparent_all_title">Tor Semuanya</string>
+  <string name="pref_transparent_port_title">Daftar Port</string>
+  <string name="pref_has_root">Minta Akses Dasar</string>
+  <string name="btn_back">Kembali</string>
+  <string name="btn_cancel">Batal</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Pengaturan Proxy</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Umum</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Peringatan</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">Tidak ada</string>
+  <string name="status">Status</string>
+  <string name="error">Kesalahan</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Simpan Pengaturan</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-is/strings.xml b/orbotservice/src/main/res/values-is/strings.xml
new file mode 100644
index 0000000..ca2f9cb
--- /dev/null
+++ b/orbotservice/src/main/res/values-is/strings.xml
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot er ókeypis proxy smáforrit sem gerir öðrum smáforritum kleift að nota veraldarvefinn á öruggari hátt. Orbot notar Tor til að dulkóða umferð þína á netinu og felur hana svo með að hoppa í gegnum fjölda tölva um allan heim. Tor er ókeypis hugbúnaður og opið net sem aðstoðar þig við að verjast gegn eftirliti á netinu sem vinnur gegn frelsi einkalífsins og friðhelgi, trúnaðar viðskiptamálum og samböndum, og ríkisöryggi þekkt sem umferðargreining.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">ræsa og stöðva Tor</string>
+  <string name="tor_proxy_service_process">torproxyþjónusta</string>
+  <string name="status_starting_up">Orbot er að ræsa...</string>
+  <string name="status_activated">Tengdur við Tor netið</string>
+  <string name="status_disabled">Orbot er slökkt</string>
+  <string name="tor_process_starting">Kveiki á Tor notanda...</string>
+  <string name="tor_process_complete">lokið.</string>
+  <string name="tor_process_waiting">bíða.</string>
+  <string name="not_anonymous_yet">AÐVÖRUN: Netumferðin þín er ekki nafnlaus enn! Vinsamlegast stilltu hugbúnaðinn þinn til að nota HTTP proxy 127.0.0.1:8118 eða SOCK4A eða SOCK5 proxy 127.0.0.1:9050</string>
+  <string name="menu_home">Heim</string>
+  <string name="menu_browse">Vafra</string>
+  <string name="menu_settings">Stillingar</string>
+  <string name="menu_log">Skráning</string>
+  <string name="menu_info">Hjálp</string>
+  <string name="menu_start">Byrja</string>
+  <string name="menu_stop">Stöðva</string>
+  <string name="menu_about">Um</string>
+  <string name="main_layout_download">Niðurhal</string>
+  <string name="main_layout_upload">Upphal</string>
+  <string name="button_help">Hjálp</string>
+  <string name="button_close">Loka</string>
+  <string name="button_about">Um</string>
+  <string name="button_clear_log">Hreinsa Skráningu</string>
+  <string name="menu_verify">Athuga</string>
+  <string name="menu_exit">Hætta</string>
+  <string name="menu_scan">Skanna BridgeQR</string>
+  <string name="menu_share_bridge">Deila BridgeQR</string>
+  <string name="press_to_start">- ýttu lengi til að byrja -</string>
+  <string name="pref_trans_proxy_group">Gegnsætt Proxy (Þarfnast Rótaraðgangs)</string>
+  <string name="pref_trans_proxy_title">Gegnsætt Proxy</string>
+  <string name="pref_trans_proxy_summary">Sjálfkrafa Tor-gera smáforrit</string>
+  <string name="pref_transparent_all_title">Tor Allt</string>
+  <string name="pref_transparent_all_summary">Beina umferð fyrir öll smáforrit í gegnum Tor</string>
+  <string name="pref_transparent_port_fallback_title">Port Beinir til vara</string>
+  <string name="pref_transparent_port_fallback_summary">AÐVÖRUN: Fer framhjá algengum portum (80, 443, etc). *NOTA AÐEINS* ef \'Allt\' eða \'Smáforrit\' stilling virkar ekki.</string>
+  <string name="pref_transparent_port_title">Porta Listi</string>
+  <string name="pref_transparent_port_summary">Listi yfir port til að proxya. *NOTA AÐEINS* ef \'Allt\' eða \'Smáforrit\' stilling virkar ekki</string>
+  <string name="pref_transparent_port_dialog">Settu inn port til að proxya</string>
+  <string name="pref_has_root">Biðja um Rótaraðgang</string>
+  <string name="pref_has_root_summary">Þarfnast rótaraðgangs fyrir gegnsæja proxýun</string>
+  <string name="status_install_success">Uppsetning Tor skráa tókst!</string>
+  <string name="status_install_fail">Tor binary skrár gátu ekki verið settar upp. Vinsamlegast athugaðu Skráninguna og láttu vita til tor-assistants at torproject.org</string>
+  <string name="title_error">Villa í Forriti</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Um Orbot</string>
+  <string name="btn_next">Næsta</string>
+  <string name="btn_back">Til baka</string>
+  <string name="btn_finish">Enda</string>
+  <string name="btn_okay">Ókei</string>
+  <string name="btn_cancel">Hætta við</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Fáein Orbot Smáatriði</string>
+  <string name="wizard_details_msg">Orbot er open-source forrit sem inniheldur Tor, LibEvent og Polipo. Það veitir staðbundinn HTTP proxy (8118) og SOCKS proxy (9050) inná Tor netið. Orbot hefur líka eiginleika, á tæki með rótaraðgang, til að senda alla vefumferð í gegnum Tor.</string>
+  <string name="wizard_permissions_root">Aðgangur Heimilaður</string>
+  <string name="wizard_permissions_stock">Orbot Leyfisveiting</string>
+  <string name="wizard_premissions_msg_root">Frábært! Við höfum skynjað að þú hefur rótaraðgang heimilaðan fyrir Orbot. Við munum nota þetta vald skynsamlega.</string>
+  <string name="wizard_permissions_msg_stock">Þrátt fyrir að vera ekki nauðsynlegt, getur Orbot orðið öflugra verkfæri ef tækið þitt hefur rótaraðgang. Notaðu hnappinn fyrir neðan til að veita Orbot ofurkrafta!</string>
+  <string name="wizard_permissions_no_root">Ef þú hefur ekki rótaraðgang eða hefur enga hugmynd um hvað við erum að tala, vertu viss um að nota smáforrit sem gerð eru til að vinna með Orbot.</string>
+  <string name="wizard_permissions_consent">Ég skil og vil halda áfram án réttinda Ofurnotanda</string>
+  <string name="wizard_permission_enable_root">Veita rótaraðgang fyrir Orbot</string>
+  <string name="wizard_configure">Stilla Torinleika</string>
+  <string name="wizard_configure_msg">Orbot gefur þér möguleikann á að beina allri umferð smáforrita í gegnum Tor EÐA að velja smáforrit hvert fyrir sig.</string>
+  <string name="wizard_configure_all">Beina umferð fyrir öll smáforrit í gegnum Tor</string>
+  <string name="wizard_configure_select_apps">Velja Einstök Smáforrit fyrir Tor</string>
+  <string name="wizard_tips_tricks">Orbot-virk Smáforrit</string>
+  <string name="wizard_tips_msg">Smáforritin fyrir neðan voru þróuð til að virka með Orbot. Klikkaðu hvern takka til að setja upp núna, eða þú getur fundið þá seinna á Google Play, á heimasíðu GuardianProject.info eða í gegnum F-Droid.org.</string>
+  <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="wizard_tips_twitter">Setja Twitter proxy hýsir til \"localhost\" and port 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Búða til sögu og skildu það eftir fyrir tor vegna öryggis!</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>
+  <string name="wizard_proxy_help_msg">Ef að Android smáforritið sem þú notar, styður notkun af HTTP eða SOCKS proxy, getur þú stillt það til að tengjast Orbot og nota Tor.\n\n\nStillingar þjóns er 127.0.0.1 eða \"localhost\". Fyrir HTTP, port stillingin er 8118. Fyrir SOCKS, proxyinn er 9050. Þú ættir að nota SOCKS4A eða SOCKS5 ef mögulegt. Þú getur lært meira um proxýun á Android með FAQ á: http://tinyurl.com/proxyandroid</string>
+  <string name="wizard_final">Orbot er tilbúinn!</string>
+  <string name="wizard_final_msg">Milljónir manneskja um allan heim nota Tor útaf mörgum mismunandi ástæðum.\n\nBlaðamenn og bloggarar, mannréttindasinnar, lögreglufólk, hermenn, stórfyrirtæki, þegnar bælandi ríkisstjórna og bara venjulegir borgarar... og núna þú ert líka tilbúinn!</string>
+  <string name="wizard_exit_at_first_screen_toast">Vinsamlegast stilltu Orbot áður en þú getur byrjað að nota það!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Þetta mun opna vef vafrann þinn að https://check.torproject.org til að sjá hvort Orbot sé rétt tengdur og að þú sért tengdur Tor.</string>
+  <string name="pref_hs_group">Falin Þjónusta Hýsing</string>
+  <string name="pref_general_group">Almennt</string>
+  <string name="pref_start_boot_title">Virkja Orbot við Ræsingu</string>
+  <string name="pref_start_boot_summary">Sjálfkrafa virkja Orbot og tengja Tor þegar Android tækið þitt ræsist</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot kemur með Tor til Android!\n\nTor hjálpar þér að verjast gegn síun innihalds, umferðargreiningu og net eftirliti sem er hættulegt friðhelgi einkalífsins, trúnaðarupplýsingum og persónulegum samböndum.\n\nÞessi leiðbeinandi hjálpar þér að stilla Orbot og Tor á tækinu þínu.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Aðvörun</string>
+  <string name="wizard_warning_msg">Aðeins með að setja Orbot upp mun ekki sjálfkrafa gera netumferð þína nafnlausa.\n\nÞú verður að stilla Orbot rétt, tækið þitt og önnur smáforrit til að nota Tor rétt.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Leyfisveitingar</string>
+  <string name="wizard_permissions_root_msg1">Þú getur valfrjálst veitt Orbot \'Ofurnotanda\' aðgang til að virkja stillingar fyrir lengra komna, eins og Gegnsæ Proxýun.</string>
+  <string name="wizard_permissions_root_msg2">Ef þú vilt ekki gera þetta, vinsamlegast vertu viss um að nota smáforrit sem gerð eru til að vinna með Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Tækið þitt virðist ekki vera með rótaraðgang eða veita \'Ofurnotanda\' réttindi.\n\nVinsamlegast prófaðu \'Smáforrit\' viðmótið á aðalskjánum í staðinn.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Finndu öll Guardian Verkefnis smáforrit á Google Play</string>
+  <string name="wizard_tips_fdroid">Finndu öll smáforrit úr Guardian Verkefninu á F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Finndu öll smáforrit úr Guardian Verkefninu á https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Gegnsæ Proxýun</string>
+  <string name="wizard_transproxy_msg">Þetta leyfir smáforritunum þínum sjálfkrafa að keyra í gengum Tor netið án nokkurra stillinga.</string>
+  <string name="wizard_transproxy_hint">(Hakaðu í þenna reit ef þú hefur enga hugmynd um hvað við erum að tala)</string>
+  <string name="wizard_transproxy_none">Engin</string>
+  <string name="pref_transparent_tethering_title">Tor Netaðgangspunktur</string>
+  <string name="pref_transparent_tethering_summary">Leyfa Tor Gegnsæja Proxýun fyrir WiFi og USB Tæki með Netaðgengi (þarfnast endurræsingar)</string>
+  <string name="button_grant_superuser">Biðja um Ofurnotandaréttindi</string>
+  <string name="pref_select_apps">Velja Smáforrit</string>
+  <string name="pref_select_apps_summary">Velja Smáforrit til að Beina í gegnum Tor</string>
+  <string name="pref_node_configuration">Punkta Stilling</string>
+  <string name="pref_node_configuration_summary">Þetta eru flóknari stillingar sem geta minnkað nafnleysið þitt</string>
+  <string name="pref_entrance_node">Inngangs Punktur</string>
+  <string name="pref_entrance_node_summary">Fingraför, uppnefni, lönd og heimilisföng fyrir fyrsta hoppið</string>
+  <string name="pref_entrance_node_dialog">Sláðu Inn Inngangspunkt</string>
+  <string name="button_proxy_all">Proxy Allt</string>
+  <string name="button_proxy_none">Proxy Ekkert</string>
+  <string name="button_invert_selection">Öfugt Val</string>
+  <string name="pref_proxy_title">Útistandandi Net Proxy (Valfrjálst)</string>
+  <string name="pref_proxy_type_title">Útistandandi Proxy Gerð</string>
+  <string name="pref_proxy_type_summary">Protocol til að nota fyrir proxy þjón: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Sláðu Inn Gerð Proxýs</string>
+  <string name="pref_proxy_host_title">Útistandandi Proxy Hýsir</string>
+  <string name="pref_proxy_host_summary">Proxy Netþjóns nafn</string>
+  <string name="pref_proxy_host_dialog">Sláðu Inn Proxy Þjón</string>
+  <string name="pref_proxy_port_title">Útistandandi Proxy Port</string>
+  <string name="pref_proxy_port_summary">Proxy Netþjóns port</string>
+  <string name="pref_proxy_port_dialog">Sláðu Inn Proxy port</string>
+  <string name="pref_proxy_username_title">Útistandandi Proxy Notendanafn</string>
+  <string name="pref_proxy_username_summary">Proxy Notendanafn (Valfrjálst)</string>
+  <string name="pref_proxy_username_dialog">Sláðu Inn Proxy Notendanafn</string>
+  <string name="pref_proxy_password_title">Útistandandi Proxy Lykilorð</string>
+  <string name="pref_proxy_password_summary">Proxy Lykilorð (Valfrjálst)</string>
+  <string name="pref_proxy_password_dialog">Sláðu Inn Proxy Lykilorð</string>
+  <string name="status">Staða</string>
+  <string name="setting_up_full_transparent_proxying_">Set upp full-gegnsæjan proxy...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Set upp smáforrita-byggðan gegnsæjan proxy... </string>
+  <string name="transparent_proxying_enabled">Gegnsæ proxýun KVEIKT</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy kveikt fyrir Netaðgangspunkt!</string>
+  <string name="warning_error_starting_transparent_proxying_">AÐVÖRUN: villa við að kveikja á gegnsærri proxýun</string>
+  <string name="transproxy_rules_cleared">TransProxy reglur hreinsaðar</string>
+  <string name="couldn_t_start_tor_process_">Gat ekki kveikt á Tor þráð:</string>
+  <string name="privoxy_is_running_on_port_">Polipo keyrir á porti:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Set upp port-byggða gegnsæja proxýun...</string>
+  <string name="bridge_error">Brúar Villa</string>
+  <string name="bridge_requires_ip">Til að nota brúar viðbótina, verðuru að slá inn að minnsta kosti eina IP addressu fyrir brú.</string>
+  <string name="send_email_for_bridges">Sendu tölvupóst til bridges at torproject.org með setningunni \"get bridges\" eitt og sér í innihaldi skeytisins frá gmail aðgangi.</string>
+  <string name="error">Villa</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Þitt ReachableAddressur stillingar ollu undanþágu!</string>
+  <string name="your_relay_settings_caused_an_exception_">Endurvarp stillingar þínar ollu undanþágu!</string>
+  <string name="exit_nodes">Útgangspunktar</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingraför, uppnefni, lönd og heimilisföng fyrir síðasta hoppið</string>
+  <string name="enter_exit_nodes">Sláðu Inn Útgangspunkta</string>
+  <string name="exclude_nodes">Útiloka Punkta</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingraför, uppnefni, lönd og heimilisföng til að útiloka</string>
+  <string name="enter_exclude_nodes">Sláðu Inn Útiloka Punkta</string>
+  <string name="strict_nodes">Strangir Punktar</string>
+  <string name="use_only_these_specified_nodes">Nota *aðeins* þessa tilgreindu punkta</string>
+  <string name="bridges">Brýr</string>
+  <string name="use_bridges">Nota Brýr</string>
+  <string name="bridges_obfuscated">Villandi Brýr</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Kveikja hliðstæðan inngangspunkt inná Tor Netið</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Leyfa ef stilltar brýr eru villandi brýr</string>
+  <string name="ip_address_and_port_of_bridges">IP addressa og brúarport</string>
+  <string name="enter_bridge_addresses">Sláðu Inn Brúar Addressur</string>
+  <string name="relays">Endurvarpar</string>
+  <string name="relaying">Endurvörpun</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Leyfa tækinu þínu að vera útgangslaus endurvarpi</string>
+  <string name="relay_port">Endurvörpunar Port</string>
+  <string name="listening_port_for_your_tor_relay">Hlustunar port fyrir Tor endurvarpann þinn</string>
+  <string name="enter_or_port">Sláðu Inn OR port</string>
+  <string name="relay_nickname">Endurvörpunar viðurnefni</string>
+  <string name="the_nickname_for_your_tor_relay">Viðurnefni fyrir Tor endurvarpið þitt</string>
+  <string name="enter_a_custom_relay_nickname">Sláðu Inn sérhannað endurvarp viðurnefni</string>
+  <string name="reachable_addresses">Nálgunarhæf Heimilisföng</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Keyra sem notandi bakvið eldvegg með hamlandi skilyrðum</string>
+  <string name="reachable_ports">Nálgunarhæf port</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Port nálgunarhæf bakvið hamlandi eldvegg</string>
+  <string name="enter_ports">Sláðu Inn port</string>
+  <string name="enable_hidden_services">Falin Þjónusta Hýsing</string>
+  <string name="run_servers_accessible_via_the_tor_network">leyfa á-tæki netþjón til að vera aðgengilegur í gegnum Tor netið</string>
+  <string name="enter_localhost_ports_for_hidden_services">sláðu inn localhost port fyrir faldar þjónustur</string>
+  <string name="hidden_service_ports">Falin Þjónustu Port</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">nafnið fyrir falda þjónustu þína (búið til sjálfkrafa)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">leyfa villuskráningu á verða búin til (verður að nota adb eða aLogCat til að skoða)</string>
+  <string name="project_home">Heimili Verkefni(sins):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor Leyfið</string>
+  <string name="https_torproject_org">https:torproject.org</string>
+  <string name="third_party_software">Hugbúnaður frá 3ja aðila:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Smáforrit vill opna falið port þjóns %S að Tor netinu. Þetta er öruggt ef þú treystir smáforritinu.</string>
+  <string name="found_existing_tor_process">fann annan Tor þráð...</string>
+  <string name="something_bad_happened">Eitthvað slæmt gerðist. Athugaðu skráninguna</string>
+  <string name="hidden_service_on">falin þjónusta á:</string>
+  <string name="unable_to_read_hidden_service_name">get ekki lesið nafn földu þjónustunnar</string>
+  <string name="unable_to_start_tor">Get ekki kveikt á Tor:</string>
+  <string name="unable_to_reset_tor">Endurræstu tækið þitt, ekki hægt að núllstilla Tor!</string>
+  <string name="pref_use_sys_iptables_title">Nota Upprunalegar IPtöflur</string>
+  <string name="pref_use_sys_iptables_summary">nota innbyggðar iptöflur binary í staðinn fyrir þær sem fylgja með Orbot</string>
+  <string name="error_installing_binares">Tor binary-in gátu ekki verið uppsettar eða uppfærðar.</string>
+  <string name="pref_use_persistent_notifications">Alltaf hafa smámynd í glugganum þegar Orbot er tengudr</string>
+  <string name="pref_use_persistent_notifications_title">Alltaf-Á Upplýsingar</string>
+  <string name="pref_use_expanded_notifications">Sýndu útvíkkaðar upplýsingar varðandi Tor útgangsland og IP tölu</string>
+  <string name="pref_use_expanded_notifications_title">Útvíkkaðar Upplýsingar</string>
+  <string name="notification_using_bridges">Brýr kveiktar!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Tungumál</string>
+  <string name="set_locale_summary">Veldu staðsetningu og tungumál fyrir Orbot</string>
+  <string name="wizard_locale_title">Veldu Tungumál</string>
+  <string name="wizard_locale_msg">Leyfa upprunalega eða skipta núverandi tungumáli</string>
+  <string name="powered_by">gert kleift af Tor</string>
+  <string name="btn_save_settings">Geyma Stillingar</string>
+  <string name="no_internet_connection_tor">Engin tenging við netið; Tor er í biðstöðu...</string>
+  <string name="bandwidth_">Bandvídd:</string>
+  <string name="down">niðri</string>
+  <string name="up">uppi</string>
+  <string name="pref_disable_network_title">Enginn Netkerfis Sjálfvirkur-Svefn</string>
+  <string name="pref_disable_network_summary">Svæfðu Tor þegar engin internet tenging er til staðar</string>
+  <string name="newnym">Þú ert komin með nýtt Tor auðkenni!</string>
+  <string name="menu_use_chatsecure">Nota ChatSecure</string>
+  <string name="permission_manage_tor_label">Stilla Tor</string>
+  <string name="permission_manage_tor_description">Leyfa þessu smáforriti að stjórna Tor þjónustunni</string>
+  <string name="install_apps_">Setja upp smáforrit?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Engin tenging við netið. Tor verður svæfður...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Tenging við netið er góð. Tor verður vakinn...</string>
+  <string name="updating_settings_in_tor_service">uppfæri stillingar í Tor þjónustu</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Port sem Tor býður SOCKS proxy á (upprunalegt: 9050 eða 0 til að slökkva)</string>
+  <string name="pref_socks_dialog">SOCK Port Stilling</string>
+  <string name="pref_transport_title">Tor GegnsærProxy Port</string>
+  <string name="pref_transport_summary">Port sem Tor býður Gegnsæjum Proxy á (upprunalegt: 9040 eða 0 til að slökkva)</string>
+  <string name="pref_transport_dialog">GegnsærProxy Port Stilling</string>
+  <string name="pref_dnsport_title">Tor DNS Port</string>
+  <string name="pref_dnsport_summary">Port sem Tor býður DNS á (upprunalegt: 5400 eða 0 til að slökkva)</string>
+  <string name="pref_dnsport_dialog">DNS Port Stilling</string>
+  <string name="pref_torrc_title">Torrc Mótanleg Stilling</string>
+  <string name="pref_torrc_summary">AÐEINS SÉRFRÆÐINGAR: sláðu inn beinar torrc stillingar línur</string>
+  <string name="pref_torrc_dialog">Mótanlegt Torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus - Benetech Mannréttinda Skjölunar Smáforrit</string>
+  <string name="your_tor_public_ips_">Tor Almennings IP tölurnar Þínar </string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Vinsamlegast slökktu á þessu smáforriti í Android->Settings->Apps ef þú ert í vandræðum með Orbot: </string>
+  <string name="app_conflict">Smáforrita Árekstur</string>
+  <string name="pref_transproxy_refresh_title">Gegnsærproxy Sjálfkrafa Endurnýjun</string>
+  <string name="pref_transproxy_refresh_summary">Endursetja Gegnsærproxy reglurnar þegar ástand netsins breytist</string>
+  <string name="pref_transproxy_flush_title">Gegnsærproxy ÞVINGUÐ FJARLÆGING</string>
+  <string name="pref_transproxy_flush_summary">Ýttu hér til að henda öllum gegnsærproxy net reglunum NÚNA</string>
+  <string name="transparent_proxy_rules_flushed_">Gegnsær proxy reglum hent!</string>
+  <string name="you_do_not_have_root_access_enabled">Þú ert ekki með RÓTAR aðgang kveikt</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Þú gætir þurft að stöðva og byrja Orbot til að stillinga breytingar taka gildi.</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Brýr Uppfærðar</string>
+  <string name="restart_orbot_to_use_this_bridge_">Vinsamlegast endurræstu Orbot til að breytingarnar taki gildi</string>
+  <string name="menu_qr">QR Kóðar</string>
+  <string name="bridge_mode">Brúar Viðmót</string>
+  <string name="get_bridges_email">Tölvupóstur</string>
+  <string name="get_bridges_web">Vefur</string>
+  <string name="activate">Virkja</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Þú getur leyft öllum smáforritum á tækinu þínu að fara í gegnum Tor netið með að nota VPN möguleikann í Android.\n\n*AÐVÖRUN* Þetta er ný, tilraunar möguleiki og í sumum tilfellum mun ekki byrja sjálfkrafa, eða geta stöðvast. Það ætti EKKI að notast fyrir nafnleysi, og AÐEINS notað til að komast í gegnum eldveggi og síur.</string>
+  <string name="send_email">Senda Tölvupóst</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Þú getur fengið brúar heimilisfang í gegnum tölvupóst, vefinn eða með að skanna brúar QR kóða. Veldu \'Tölvupóstur\' eða \'Vefur\' fyrir neðan til að óska eftir brúar heimilisfangi.\n\nÞegar þú hefur heimilisfang, afritaðu & límdu það inn í \'Brýr\' stillingu í stillingar og endurræsun í Orbot.</string>
+  <string name="standard_browser">Staðlaður Vafri</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">ATHUGAÐU: Aðeins staðlaðar Tor brýr virka á Intel X86/ATOM devices</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-it/strings.xml b/orbotservice/src/main/res/values-it/strings.xml
new file mode 100644
index 0000000..62f1455
--- /dev/null
+++ b/orbotservice/src/main/res/values-it/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot è un\'applicazione proxy che permette alle altre applicazioni di accedere a internet in maniera più sicura. Orbot usa Tor per cifrare il  traffico internet e lo nasconde poi facendolo rimbalzare attraverso una serie di computer attorno al mondo. Tor è un software libero e una rete aperta che aiuta a difendersi da una forma di sorveglianza della rete conosciuta come analisi del traffico. Quest\'ultima minaccia libertà e privacy personale, attività commerciali riservate, rapporti interpersonali, e persino la sicurezza di stato.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">avvia e ferma Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot è in esecuzione...</string>
+  <string name="status_activated">Connesso alla rete Tor</string>
+  <string name="status_disabled">\"Orbot è disattivato</string>
+  <string name="status_shutting_down">TorService si sta spegnendo</string>
+  <string name="tor_process_starting">Avvio client Tor...</string>
+  <string name="tor_process_complete">completa.</string>
+  <string name="tor_process_waiting">attesa.</string>
+  <string name="not_anonymous_yet">ATTENZIONE: Il traffico non è ancora anonimo! Configura le applicazioni per utilizzare il proxy HTTP 127.0.0.1:8118,  SOCKS4A o proxy SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Home</string>
+  <string name="menu_browse">Sfoglia</string>
+  <string name="menu_settings">Impostazioni</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Aiuto</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Avvio</string>
+  <string name="menu_stop">Ferma</string>
+  <string name="menu_about">About</string>
+  <string name="menu_promo_apps">Installa apps...</string>
+  <string name="main_layout_download">Download (velocità/totale)</string>
+  <string name="main_layout_upload">Upload (velocità/totale)</string>
+  <string name="button_help">Aiuto</string>
+  <string name="button_close">Chiudi</string>
+  <string name="button_about">About</string>
+  <string name="button_clear_log">Cancella log</string>
+  <string name="menu_verify">Controlla</string>
+  <string name="menu_exit">Esci</string>
+  <string name="menu_scan">Scansiona BridgeQR</string>
+  <string name="menu_share_bridge">Condividi BridgeQR</string>
+  <string name="press_to_start">- tieni premuto per avviare -</string>
+  <string name="pref_trans_proxy_group">Proxying trasparente (Richiede root)</string>
+  <string name="pref_trans_proxy_title">Proxying trasparente</string>
+  <string name="pref_trans_proxy_summary">Torifying automatico delle app</string>
+  <string name="pref_transparent_all_title">Tor ovunque</string>
+  <string name="pref_transparent_all_summary">Traffico proxy di tutte le app attraverso Tor</string>
+  <string name="pref_transparent_port_fallback_title">Fallback porte proxy</string>
+  <string name="pref_transparent_port_fallback_summary">ATTENZIONE: Aggira le porte comuni (80, 443, ecc). *USARE SOLO* se le modalità \'All\' o \'App\' non funzionano.</string>
+  <string name="pref_transparent_port_title">Elenco porte</string>
+  <string name="pref_transparent_port_summary">Lista di porte per cui fare proxy. *USARE SOLO* se le modalità \'All\' o \'App\' non funzionano.</string>
+  <string name="pref_transparent_port_dialog">Inserisci porte da proxare</string>
+  <string name="pref_has_root">Richiesto accesso root</string>
+  <string name="pref_has_root_summary">Richiede il root per il proxying trasparente</string>
+  <string name="status_install_success">I binari di Tor sono stati installati con successo!</string>
+  <string name="status_install_fail">I file binari di Tor non possono essere installati. Controlla i log e notifica l\'accaduto su tor-assistants at torproject.org</string>
+  <string name="title_error">Errore applicazione</string>
+  <string name="wizard_title">Benvenuti in Orbot</string>
+  <string name="wizard_btn_tell_me_more">About Orbot</string>
+  <string name="btn_next">Avanti</string>
+  <string name="btn_back">Indietro</string>
+  <string name="btn_finish">Fine</string>
+  <string name="btn_okay">Ok</string>
+  <string name="btn_cancel">Annulla</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Alcuni dettagli su Orbot</string>
+  <string name="wizard_details_msg">Orbot è un\'app open-source contenente Tor, LibEvent e Polipo. Fornisce un proxy HTTP locale (8118) e un proxy SOCKS (9050) nella rete Tor. Orbot, solo sui dispositivi con permessi di ROOT, offre anche la possibilità di veicolare tutto il traffico attraverso Tor.</string>
+  <string name="wizard_permissions_root">Permesso concesso</string>
+  <string name="wizard_permissions_stock">Permessi Orbot</string>
+  <string name="wizard_premissions_msg_root">Eccellente! Abbiamo rilevato la presenza dei permessi di root attivati per Orbot. Useremo questi poteri con saggezza.</string>
+  <string name="wizard_permissions_msg_stock">Anche se non è richiesto, Orbot può diventare uno strumento ancora più potente se il dispositivo ha accesso come root. Utilizza il pulsante qui sotto per concedere i superpoteri a Orbot!</string>
+  <string name="wizard_permissions_no_root">Se non hai i permessi root o non hai idea di cosa siano, assicurati solamente di utilizzare applicazioni fatte per lavorare con Orbot.</string>
+  <string name="wizard_permissions_consent">Ho capito e desidero continuare senza il root</string>
+  <string name="wizard_permission_enable_root">Concedi permessi root a Orbot</string>
+  <string name="wizard_configure">Configura Torification</string>
+  <string name="wizard_configure_msg">Orbot dà la possibilità di instradare tutto il traffico delle applicazioni tramite Tor o scegliere le applicazioni singolarmente.</string>
+  <string name="wizard_configure_all">Usa Tor come proxy per tutte le applicazioni.</string>
+  <string name="wizard_configure_select_apps">Seleziona singole App per Tor</string>
+  <string name="wizard_tips_tricks">App abilitate per Orbot</string>
+  <string name="wizard_tips_msg">Ti invitiamo a scaricare & usare app che possono connettersi direttamente a Orbot. Fai click sui pulsanti qui sotto per installare.</string>
+  <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="wizard_tips_twitter">Twitter supporta il proxy http \"localhost:8118\"</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Crea una storia e lascia a Tor la sicurezza!</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>
+  <string name="wizard_proxy_help_msg">Se l\'app Android che stai usando supporta l\'uso di Proxy HTTP o SOCKS, allora puoi configurarle per connettersi a Orbot e usare Tor.\n\n\n L\'impostazione host è 127.0.0.1 o \"localhost\". Per l\'HTTP, il valore della porta è 8118. Per SOCKS, il proxy è 9050. Dovresti utilizzare SOCKS4A o SOCKS5 se possibile.\n \n\n\n PPuoi imparare altro sul proxying in Android tramite le FAQ: http://tinyurl.com/proxyandroid</string>
+  <string name="wizard_final">Orbot è pronto!</string>
+  <string name="wizard_final_msg">Milioni di persione in giro per il mondo usano Tor per un\'ampia varietà di ragioni.\n\nGiornalisti e blogger, difensori dei diritti umani, ufficiali delle forze dell\'ordine, soldati, aziende, cittadini di paesi repressivi, e anche cittadini qualunque... e ora sei pronto a farlo anche tu!</string>
+  <string name="wizard_exit_at_first_screen_toast">Perfavore configura Orbot prima di iniziare ad usarlo!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Ti sei collegato correttamente alla rete Tor - ma questo NON significa che il tuo dispositivo è sicuro. È possibile utilizzare l\'opzione \'Browser\' dal menù per testare il browser. \n\nVisita il nostro sito web https://guardianproject.info/apps/orbot o invia una mail a help at guardianproject.info per saperne di più.</string>
+  <string name="tor_check">Si aprirà il browser web predefinito per https://check.torproject.org per controllare se Orbot probabilmente è configurato e si è connessi a Tor.</string>
+  <string name="pref_hs_group">Servizi nascosti</string>
+  <string name="pref_general_group">Generale</string>
+  <string name="pref_start_boot_title">Avvia Orbot al boot</string>
+  <string name="pref_start_boot_summary">Avvia automaticamente Orbot e connetti Tor quando il dispositivo Android viene avviato</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot porta Tor su Android!\n\nTor ti aiuta a difenderti da filtraggio di contenuti, analisi del traffico e sorveglianza della rete che minacciano la privacy, informazioni personali e relazioni personali.\n\nQuesta procedura guidata ti aiuterà a configurare Orbot e Tor sul tuo dispositivo.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Attenzione</string>
+  <string name="wizard_warning_msg">La semplice installazione di Orbot non renderà anonimo il tuo traffico di rete mobile.\n\nDevi configurare correttamente Orbot, il tuo dispositivo e le altre applicazioni per usare Tor efficacemente.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permessi</string>
+  <string name="wizard_permissions_root_msg1">Opzionalmente, è possibile concedere ad Orbot l\'accesso da superutente per abilitare funzionalità avanzate come il proxying trasparente.</string>
+  <string name="wizard_permissions_root_msg2">Se non si vuole intraprendere questa scelta, ci si assicuri di utilizzare applicazioni fatte per funzionare con Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Il vostro dispositivo non sembra essere rooted o fornire accesso da \'Superutente\'.\n\nPerfavore prova invece la modalità \'App\' nella schermata principale.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox: Browser progettato per la privacy che funziona attraverso Tor</string>
+  <string name="wizard_tips_play">Cerca tutte le app del Guardian Project su Google Play</string>
+  <string name="wizard_tips_fdroid">Trova tutte le app Guardian Projec su F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Trova tutte le app Guardian Project su https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxying trasparente</string>
+  <string name="wizard_transproxy_msg">Questo permette alle tue applicazioni di passare automaticamente attraverso la rete Tor senza necessità di ulteriore configurazione.</string>
+  <string name="wizard_transproxy_hint">(Seleziona questa casella se non hai idea di quello di cui stiamo parlando)</string>
+  <string name="wizard_transproxy_none">Nessuno</string>
+  <string name="pref_transparent_tethering_title">Tethering Tor</string>
+  <string name="pref_transparent_tethering_summary">Abilita il proxying trasparente di Tor per i dispositivi connessi in tethering via WiFi e USB (necessita di riavvio)</string>
+  <string name="button_grant_superuser">Richiede accesso superuser</string>
+  <string name="pref_select_apps">Seleziona app</string>
+  <string name="pref_select_apps_summary">Scegli le applicazioni da utilizzare attraverso Tor</string>
+  <string name="pref_node_configuration">Configurazione nodo</string>
+  <string name="pref_node_configuration_summary">Questi sono parametri di configurazione avanzati che possono ridurre il vostro anonimato</string>
+  <string name="pref_entrance_node">Nodi di entrata</string>
+  <string name="pref_entrance_node_summary">Identificativi, nicknames, paesi ed indirizzi del primo hop</string>
+  <string name="pref_entrance_node_dialog">Inserisci nodi di entrata</string>
+  <string name="pref_allow_background_starts_title">Permetti Avvii in Background</string>
+  <string name="pref_allow_background_starts_summary">Permetti a qualsiasi app di comunicare ad Orbot di avviare Tor e servizi relativi</string>
+  <string name="button_proxy_all">Proxa tutto</string>
+  <string name="button_proxy_none">Non proxare niente</string>
+  <string name="button_invert_selection">Inverti selezione</string>
+  <string name="pref_proxy_title">Proxy di Rete in Uscita (Facoltativo)</string>
+  <string name="pref_proxy_type_title">Tipo proxy</string>
+  <string name="pref_proxy_type_summary">Protocolli da utilizzare per i server proxy: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Inserisci tipo proxy</string>
+  <string name="pref_proxy_host_title">Host proxy</string>
+  <string name="pref_proxy_host_summary">Hostname server proxy</string>
+  <string name="pref_proxy_host_dialog">Inserire l\'host del proxy</string>
+  <string name="pref_proxy_port_title">Porta proxy</string>
+  <string name="pref_proxy_port_summary">Porta del server proxy</string>
+  <string name="pref_proxy_port_dialog">Inserire la porta del proxy</string>
+  <string name="pref_proxy_username_title">Nome Utente del Proxy in Uscita</string>
+  <string name="pref_proxy_username_summary">Nome Utente del Proxy (Facoltativo)</string>
+  <string name="pref_proxy_username_dialog">Inserisci Nome Utente del Proxy</string>
+  <string name="pref_proxy_password_title">Password del Proxy in Uscita</string>
+  <string name="pref_proxy_password_summary">Password del Proxy (Facoltativo)</string>
+  <string name="pref_proxy_password_dialog">Inserisci Password Proxy</string>
+  <string name="status">Stato</string>
+  <string name="setting_up_full_transparent_proxying_">Configurazione del proxying completamente trasparente...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Configurazione del proxying trasparente basato su applicazione...</string>
+  <string name="transparent_proxying_enabled">Proxying trasparente ABILITATO</string>
+  <string name="transproxy_enabled_for_tethering_">Proxying trasparente abilitato per il tethering</string>
+  <string name="warning_error_starting_transparent_proxying_">AVVERTIMENTO: errore nell\'avvio del TransProxy!</string>
+  <string name="transproxy_rules_cleared">Regole del TransProxy cancellate</string>
+  <string name="couldn_t_start_tor_process_">Impossibile avviare il processo Tor:</string>
+  <string name="privoxy_is_running_on_port_">Polipo è in esecuzione sulla porta:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Configurazione del proxying trasparente basato su porta...</string>
+  <string name="bridge_error">Errore bridge</string>
+  <string name="bridge_requires_ip">Al fine di utilizzare la funzionalità bridge, è necessario inserire almeno l\'indirizzo IP di un bridge.</string>
+  <string name="send_email_for_bridges">Si consiglia di inviare una email a bridges at torproject.org con la linea \"get bridges\" da sola nel corpo del messaggio da un account gmail.</string>
+  <string name="error">Errore</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">La tua configurazione dell\'indirizzo raggiungibile ha causato un\'eccezione!</string>
+  <string name="your_relay_settings_caused_an_exception_">La configurazione del tuo relay ha causato un\'eccezione!</string>
+  <string name="exit_nodes">Nodi di uscita</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Identificatori, nicknames, paesi ed indirizzi per l\'ultimo hop</string>
+  <string name="enter_exit_nodes">Inserire i nodi d\'uscita</string>
+  <string name="exclude_nodes">Escludere i nodi</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Identificatori, nicknames, paesi ed indirizzi da escludere</string>
+  <string name="enter_exclude_nodes">Inserire i nodi da escludere</string>
+  <string name="strict_nodes">Nodi specifici</string>
+  <string name="use_only_these_specified_nodes">Utilizza *solo* i nodi specificati</string>
+  <string name="bridges">Ponti</string>
+  <string name="use_bridges">Utilizza i bridge</string>
+  <string name="bridges_obfuscated">Bridge mascherati</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Abilita nodi alternati in entrata nella rete Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Attiva se i Bridge configurati sono mascherati</string>
+  <string name="ip_address_and_port_of_bridges">Indirizzo IP e porta dei bridge</string>
+  <string name="enter_bridge_addresses">Inserire gli indirizzi dei bridge</string>
+  <string name="relays">Relays</string>
+  <string name="relaying">Relaying</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Abilita il tuo dispositivo per essere un relay non di uscita</string>
+  <string name="relay_port">Porta del relay</string>
+  <string name="listening_port_for_your_tor_relay">Porta in ascolto per il proprio Tor relay</string>
+  <string name="enter_or_port">Inserire la porta OR</string>
+  <string name="relay_nickname">Nickname del relay</string>
+  <string name="the_nickname_for_your_tor_relay">Il nickname per il proprio relay Tor</string>
+  <string name="enter_a_custom_relay_nickname">Inserire un nickname personalizzato per il relay</string>
+  <string name="reachable_addresses">Indirizzo raggiungibile</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Esegui come un client dietro un firewall con politiche restrittive</string>
+  <string name="reachable_ports">Porte raggiungibili</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Porte raggiungibili dietro un firewall restrittivo</string>
+  <string name="enter_ports">Inserisci porte</string>
+  <string name="enable_hidden_services">Abilita servizi nascosti</string>
+  <string name="run_servers_accessible_via_the_tor_network">esegui server accessibili attraverso la rete Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">inserire la porta per l\'host locale per i servizi nascosti</string>
+  <string name="hidden_service_ports">Porta per i servizi nascosti</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">il nome di indirizzamento per i propri servizi nascosti (generato automaticamente)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">abilita i log di debug in output (richiede l\'uso di adb o aLogCat per esser visualizzato)</string>
+  <string name="project_home">Home progetto:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Licenza Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Software di terze parti:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Un applicazione ha richiesto di aprire la porta per servizi nascosti %S alla rete Tor. Questo è sicuro se ci si fida dell\'applicazione.</string>
+  <string name="found_existing_tor_process">trovato un processo Tor esistente...</string>
+  <string name="something_bad_happened">E\' accaduto un evento indesiderato. Controllare i log.</string>
+  <string name="hidden_service_on">servizio nascosto attivo:</string>
+  <string name="unable_to_read_hidden_service_name">Impossibile leggere il nome del servizio nascosto.</string>
+  <string name="unable_to_start_tor">Impossibile avviare Tor:</string>
+  <string name="unable_to_reset_tor">Riavvia il tuo dispositivo, impossibile resettare Tor!</string>
+  <string name="pref_use_sys_iptables_title">Utilizza Iptables di default</string>
+  <string name="pref_use_sys_iptables_summary">utilizza il binario di iptables installato invece di quello fornito con Orbot</string>
+  <string name="error_installing_binares">Non è stato possibile installare o aggiornare i binari di Tor.</string>
+  <string name="pref_use_persistent_notifications">Mantieni sempre l\'icona nella barra degli strumenti quando Orbot è connesso.</string>
+  <string name="pref_use_persistent_notifications_title">Notifiche sempre attive</string>
+  <string name="pref_use_expanded_notifications">Visualizza notifica espansa con nazione e ip dell\'nodo d\'uscita Tor</string>
+  <string name="pref_use_expanded_notifications_title">Espandi notifiche</string>
+  <string name="notification_using_bridges">Bridge attivati!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Lingua</string>
+  <string name="set_locale_summary">Scegli le impostazioni internazionali e la lingua di Orbot</string>
+  <string name="wizard_locale_title">Scegli Lingua</string>
+  <string name="wizard_locale_msg">Lasciare la predefinita o cambiare la lingua corrente</string>
+  <string name="powered_by">powered by Tor</string>
+  <string name="btn_save_settings">Salva impostazioni</string>
+  <string name="no_internet_connection_tor">Nessuna connessione ad internet; Tor è in standby...</string>
+  <string name="bandwidth_">Larghezza di Banda:</string>
+  <string name="down">giù</string>
+  <string name="up">su</string>
+  <string name="pref_disable_network_title">impedire spegnimento automatico della rete</string>
+  <string name="pref_disable_network_summary">Stand-by di Tor quando non c\'è un collegamento a internet disponibile</string>
+  <string name="newnym">Sei passato a una nuova identità Tor!</string>
+  <string name="menu_verify_browser">Browser</string>
+  <string name="menu_use_chatsecure">Usa ChatSecure</string>
+  <string name="permission_manage_tor_label">Gestisci Tor</string>
+  <string name="permission_manage_tor_description">Abilita questa app per controllare il servizio Tor</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Non sembra che tu abbia Orfox installato. Necessiti di aiuto, o apro semplicemente il browser?</string>
+  <string name="install_apps_">Installare applicazioni?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Nessuna connettività di rete. Mettendo Tor a riposo...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Connettività di rete buona. Svegliando Tor...</string>
+  <string name="updating_settings_in_tor_service">aggiornamento impostazioni nel servizio Tor</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Porta sulla quale Tor offre il proxy SOCKS (default: 9050 o 0 per disabilitare)</string>
+  <string name="pref_socks_dialog">Configurazione Porta SOCKS</string>
+  <string name="pref_transport_title">Porta TransProxy Tor</string>
+  <string name="pref_transport_summary">Porta sulla quale Tor offre il Proxy Trasparente (default: 9040 o 0 per disabilitare)</string>
+  <string name="pref_transport_dialog">Configurazione Porta TransProxy</string>
+  <string name="pref_dnsport_title">Porte Tor DNS</string>
+  <string name="pref_dnsport_summary">Porta sulla quale Tor offre i DNS (default: 5400 o 0 per disabilitare)</string>
+  <string name="pref_dnsport_dialog">Configurazione porte DNS</string>
+  <string name="pref_torrc_title">Configurazioni personalizzate di Torrc</string>
+  <string name="pref_torrc_summary">SOLO ESPERTI: inserisci direttamente configurazioni torrc</string>
+  <string name="pref_torrc_dialog">Torrc personalizzate</string>
+  <string name="wizard_tips_martus">Mobile Martus - App per la Documentazione dei Diritti Umani Benetech</string>
+  <string name="your_tor_public_ips_">Il tuo Tor IP pubblico è:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Perfavore disabilita quest\'app in Android->Impostazioni->Apps se stai avendo problemi con Orbot: </string>
+  <string name="app_conflict">Conflitto app</string>
+  <string name="pref_transproxy_refresh_title">Auto-Refresh TransProxy</string>
+  <string name="pref_transproxy_refresh_summary">Ri-applica regole Transproxy quando cambia lo stato della rete</string>
+  <string name="pref_transproxy_flush_title">FORZA RIMOZIONE Transproxy</string>
+  <string name="pref_transproxy_flush_summary">Clicca qui per eliminare tutte le regole di rete Transproxy IMMEDIATAMENTE</string>
+  <string name="transparent_proxy_rules_flushed_">Regole Proxy Trasparente eliminate!</string>
+  <string name="you_do_not_have_root_access_enabled">Non ci sono i permessi di ROOT abilitati</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Potrebbe essere necessario riavviare Orbot per applicare i cambiamenti delle impostazioni.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Bridge attivati</string>
+  <string name="restart_orbot_to_use_this_bridge_">Per favore riavvia Orbot per rendere effettive le modifiche</string>
+  <string name="menu_qr">Codici QR</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Se la tua rete cellulare blocca attivamente Tor puoi utilizzare un Bridge per accedere alla rete. Seleziona uno dei tipi di bridge da sopra per attivare i bridge</string>
+  <string name="bridge_mode">Modalità Bridge</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Attiva</string>
+  <string name="apps_mode">Modalità VPN per le applicazioni</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Puoi configurare tutte le app del tuo dispositivo per connettersi attraverso la rete Tor usando la modalità VPN di Android.\n\n*ATTENZIONE* Questa è una funzione nuova e sperimentale, in alcuni potrebbe non avviarsi in automatico o fermarsi. NON dovrebbe essere usata per l\'anonimato ma solo per bypassare filtri e firewall.</string>
+  <string name="send_email">Invia email</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Tu poi ricevere un indirizzo bridge via email, web o scansionando un codice QR. Seleziona \'Email\' o \'Web\' per richiedere un indirizzo bridge.\n\nUna volta che hai un indirizzo, copialo & incollalo nell\'opzione \"Bridges\" delle impostazioni di Orbot e riavvialo.</string>
+  <string name="install_orweb">Installa Orfox</string>
+  <string name="standard_browser">Browser standard</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTA: Solo i Tor Bridges standard funzionano sui dispositivi Intel x86/Atom</string>
+  <string name="vpn_default_world">Mondo</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-iw/strings.xml b/orbotservice/src/main/res/values-iw/strings.xml
new file mode 100644
index 0000000..e5e33f9
--- /dev/null
+++ b/orbotservice/src/main/res/values-iw/strings.xml
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot הינה אפליקציית פרוקסי חינמית המאפשרת לאפליקציות אחרות להשתמש באינטרנט בבטחה. Orbot נעזרת ב-Tor כדי להצפין את תעבורת האינטרנט שלך ולהסוותה באמצעותה ניתובה דרך מספר מחשבים ברחבי העולם. Tor היא תוכנה חופשית ורשת פתוחה המסייעת לך להתגונן מפני סוגים מסוימים של אמצעי ניטור ומעקב אחר רשת האינטרנט המאיימים על הפרטיות, החירות האישית, פעילויות עסקיות ומערכות יחסים חשאיות.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">התחל ועצור את Tor</string>
+  <string name="tor_proxy_service_process">שירות פרוקסי Tor</string>
+  <string name="status_starting_up">Orbot מתחיל…</string>
+  <string name="status_activated">מחובר לרשת Tor</string>
+  <string name="status_disabled">Orbot כבוי</string>
+  <string name="tor_process_starting">מתחיל לקוח Tor...</string>
+  <string name="tor_process_complete">הושלם.</string>
+  <string name="tor_process_waiting">מחכה.</string>
+  <string name="not_anonymous_yet">אזהרה: התעבורה שלך אינה אנונימית עדיין! בבקשה הגדר את האפליקציות שלך כך שיתאפשר שימוש בפרוקסי HTTP (קרי 127.0.0.1:8118) או SOCKS4A או SOCKS5 (קרי 127.0.0.1:9050)</string>
+  <string name="menu_home">בית</string>
+  <string name="menu_browse">דפדף</string>
+  <string name="menu_settings">הגדרות</string>
+  <string name="menu_log">רישום</string>
+  <string name="menu_info">עזרה</string>
+  <string name="menu_start">התחל</string>
+  <string name="menu_stop">עצור</string>
+  <string name="menu_about">אודות</string>
+  <string name="main_layout_download">הורדה</string>
+  <string name="main_layout_upload">העלאה</string>
+  <string name="button_help">עזרה</string>
+  <string name="button_close">סגור</string>
+  <string name="button_about">אודות</string>
+  <string name="button_clear_log">נקה רישום</string>
+  <string name="menu_verify">בדוק</string>
+  <string name="menu_exit">יציאה</string>
+  <string name="menu_scan">סרוק BridgeQR</string>
+  <string name="menu_share_bridge">שתף BridgeQR</string>
+  <string name="press_to_start">-נגיעה ארוכה להתחלה-</string>
+  <string name="pref_trans_proxy_group">פרוקסי שקוף (שורש נדרש)</string>
+  <string name="pref_trans_proxy_title">פרוקסי שקוף</string>
+  <string name="pref_trans_proxy_summary">עבודה אוטומטית עם אפליקציות דרך Tor</string>
+  <string name="pref_transparent_all_title">הכל דרך Tor</string>
+  <string name="pref_transparent_all_summary">תעבור דרך פרוקסי  עבור כל האפליקציות דרך Tor</string>
+  <string name="pref_transparent_port_fallback_title">מפלט פורט פרוקסי</string>
+  <string name="pref_transparent_port_fallback_summary">אזהרה: עקוף פורטים נפוצים (80,443 וכו\'). *השתמש רק* אם האופנים \'All\' או \'App\'  לא עובדים.</string>
+  <string name="pref_transparent_port_title">רשימת פורטים</string>
+  <string name="pref_transparent_port_summary">רשימת פורטים לפרוקסי. *השתמש רק* אם האופנים \'All\' או \'App\'  לא עובדים.</string>
+  <string name="pref_transparent_port_dialog">הזן פורטים לפרוקסי</string>
+  <string name="pref_has_root">דרושה גישת שורש</string>
+  <string name="pref_has_root_summary">בקש גישה עליונה עבור שימוש בפרוקסי שקוף</string>
+  <string name="status_install_success">קבצים ברי הרצה של Tor הותקנו בהצלחה!</string>
+  <string name="status_install_fail">הקבצים ברי ההרצה של Tor לא ניתנו להתקנה. בבקשה בדוק את הלוג והודע ל 
+tor-assistants at torproject.org</string>
+  <string name="title_error">שגיאת אפליקציה</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">אודות Orbot</string>
+  <string name="btn_next">הבא</string>
+  <string name="btn_back">הקודם</string>
+  <string name="btn_finish">סיים</string>
+  <string name="btn_okay">אישור</string>
+  <string name="btn_cancel">ביטול</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">פרטים מסוימים של Orbot </string>
+  <string name="wizard_details_msg">Orbot היא אפליקציית קוד פתוח הכוללת את Tor, LibEvent ו-Polipo. היא מתחבר לרשת Tor באמצעות שרת פרוקסי HTTP מקומי (8118) ושרת פרוקסי SOCKS (פורט 9050). Orbot יכולה בנוסף עם הרשאות רוט לנתב את כל תעבורת האינטרנט של המכשיר דרך Tor כברירת מחדל.</string>
+  <string name="wizard_permissions_root">ניתנה הרשאה</string>
+  <string name="wizard_permissions_stock">הרשאות Orbot</string>
+  <string name="wizard_premissions_msg_root">מצוין! גילינו כי יש לך הרשאות שורש מאופשרות בשביל Orbot. אנחנו נשתמש בכוח הזה בחוכמה.</string>
+  <string name="wizard_permissions_msg_stock">בזמן שזה לא נדרש, Orbot יכולה להפוך להיות כלי חזק יותר אם למכשיר שלך יש גישה עליונה. תשתמש בכפתור למטה כדי לקבל כוחות על של Orbot !</string>
+  <string name="wizard_permissions_no_root">אם אין לך גישה עליונה או אין לך מושג על מה אנחנו מדברים, רק תוודא שתשתמש באפליקציות שנועדו לעבוד עם Orbot.</string>
+  <string name="wizard_permissions_consent">הבנתי ואני מעדיף להמשיך בלי Superuser</string>
+  <string name="wizard_permission_enable_root">אפשר גישת שורש עבור Orbot</string>
+  <string name="wizard_configure">הגדר עבודה באמצעות Tor</string>
+  <string name="wizard_configure_msg">Orbot נותנת לך אפשרות לכוון את כל תעבורת האפליקציות דרך Tor או לבחור את האפליקציות שלך בנפרד.</string>
+  <string name="wizard_configure_all">השתמש בפרוקסי בכל האפליקציות דרך Tor</string>
+  <string name="wizard_configure_select_apps">בחר אפליקציות מסוימות עבור Tor</string>
+  <string name="wizard_tips_tricks">Orbot מתאפשר על ידי אפליקציות</string>
+  <string name="wizard_tips_msg">האפליקציות מתחת פותחו לעבודה עם Orbot. לחץ על כל כפתור להתקנה מיידית, או שאתה יכול למצוא אותם אחר כך ב Google Play, באתר GuardianProject.info או
+דרך  F-Droid.org</string>
+  <string name="wizard_tips_otrchat">ChatSecure - תוכנת מסרים מידיים מאובטחת לאנדרואיד</string>
+  <string name="wizard_tips_proxy">הגדרות פרוקסי - למד איך להגדיר אפליקציות לעבוד עם Orbot</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo אפליקציית מנוע חיפוש</string>
+  <string name="wizard_tips_twitter">קבע פרוקסי Twitter למארח \"localhost\" ולפורט 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - מערך שיעורים לעיתונאים על שימוש ב-Tor להגנה על עבודתם.</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_proxy_help_msg">אם אפליקצת האנדרואיד שאתה משתמש תומכת בפרוקסי מבוסס HTTP או SOCKS, תוכל להגדיר אותה לעבוד עם Orbot תחת Tor. \n\n\n ההגדרות הן: שם השרת הוא 127.0.0.1 או \"localhost\". עבור HTTP, הפורט הוא 8118. עבור SOCKS, הפורט הוא 9050. עליך להשתמש בSOCKS4A או SOCKS5 אם אפשר.\n \n\n\n תוכל ללמוד עוד אודות פרוקסי באנדרואיד תחת עמוד השאלות הנפוצות שלנו בכתובת: http://tinyurl.com/proxyandroid </string>
+  <string name="wizard_final">Orbot מוכן!</string>
+  <string name="wizard_final_msg">מיליוני אנשים ברחבי העולם משתמשים בTor מסיבות רבות.\n\n עיתונאים ובלוגרים, פעילי זכויות אדם, שוטרים, חיילים, תאגידים, אזרחי במשטרים מדוגאים וגם אזרחים פשוטים... ועכשיו גם אתה!</string>
+  <string name="wizard_exit_at_first_screen_toast">אנא הגדר את Orbot לפני שתוכל להתחיל להשתמש בה!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">דבר זה יוביל את דפדפן הרשת שלך למוד https://check.torproject.org כדי לראות אם Orbot הוגדרה כראוי וכן כי אתה מחובר לרשת Tor.</string>
+  <string name="pref_hs_group">איחסון שירותים נסתרים</string>
+  <string name="pref_general_group">כללי</string>
+  <string name="pref_start_boot_title">התחל את Orbot בהדלקת המכשיר</string>
+  <string name="pref_start_boot_summary">התחל את Orbot והתחבר לרשת Tor אוטומטית כאשר המכשיר נדלק</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">אזהרה</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">הרשאות</string>
+  <string name="wizard_permissions_root_msg1">אתה יכול להעניק לאפליקציה Orbot גישת \'Superuser\' כדי לאפשר מאפיינים מתקדמים כמו למשל, פרוקסי שקוף.</string>
+  <string name="wizard_permissions_root_msg2">אם אתה לא רוצה לעשות את זה, אנא הקפד להשתמש באפליקציות שיועדו לעבוד עם Orbot</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot-יישומים מופעלים</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: אפליקציית מסרים עם הצפנת Off-the-Record</string>
+  <string name="wizard_tips_play">מצא את כל אפליציות Guardian Project אצל Google Play</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">פרוקסי שקוף</string>
+  <string name="wizard_transproxy_msg">זה מאפשר לאפליקציות שלך לרוץ באופן אוטומטי דרך רשת Tor ללא כל תצורה.</string>
+  <string name="wizard_transproxy_hint">(סמן תיבה זו אם אין לך מושג על מה אנחנו מדברים)</string>
+  <string name="wizard_transproxy_none">כלום</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">מאפשר עבודה עם פרוקסי שקוף עבור רשת אלחוטית ומכשירי  USB Tethered (דורש אתחול מחדש)</string>
+  <string name="button_grant_superuser">דרוש אישור Superuser</string>
+  <string name="pref_select_apps">בחר אפלקציות</string>
+  <string name="pref_select_apps_summary">בחר אפלקציות</string>
+  <string name="pref_node_configuration">הגדרות Node</string>
+  <string name="pref_node_configuration_summary">קיימות הגדרות מתקדמות שיכולות להפחית את האנונימיות שלך</string>
+  <string name="pref_entrance_node">Entrance Nodes</string>
+  <string name="pref_entrance_node_summary">טביעות אצבע, כינויים, ארצות וכתובות עבור המעבר הראשון</string>
+  <string name="pref_entrance_node_dialog">הכנס Entrance Nodes</string>
+  <string name="button_proxy_all">העבר הכל דרך פרוקסי</string>
+  <string name="button_proxy_none">אל תשתמש בפרוקסי</string>
+  <string name="button_invert_selection">הפוך בחירה</string>
+  <string name="pref_proxy_type_title">Outbound Proxy Type</string>
+  <string name="pref_proxy_type_summary">פרוטוקול שימוש בשרת פרוקסי:  HTTP, HTTPS, Socks4,Socks5</string>
+  <string name="pref_proxy_type_dialog">סוג הפרוקסי</string>
+  <string name="pref_proxy_host_title">מארח של Outbound Proxy</string>
+  <string name="pref_proxy_host_summary">שם מארח שרת פרוקסי</string>
+  <string name="pref_proxy_host_dialog">הכנס מארח פרוקסי</string>
+  <string name="pref_proxy_port_title">פורט של Outbound Proxy</string>
+  <string name="pref_proxy_port_summary">פורט שרת פרוקסי</string>
+  <string name="pref_proxy_port_dialog">הכנס פורט של פרוקסי</string>
+  <string name="pref_proxy_username_title">שם משתמש של Outbound Proxy</string>
+  <string name="pref_proxy_username_summary">שם משתמש פרוקסי (רשות)</string>
+  <string name="pref_proxy_username_dialog">הזן שם משתמש פרוקסי</string>
+  <string name="pref_proxy_password_title">סיסמא של Outbound Proxy</string>
+  <string name="pref_proxy_password_summary">סיסמת פרוקסי (רשות)</string>
+  <string name="pref_proxy_password_dialog">הזן סיסמת פרוקסי</string>
+  <string name="status">סטטוס</string>
+  <string name="setting_up_full_transparent_proxying_">הכנה של הפרוקסי השקוף...</string>
+  <string name="setting_up_app_based_transparent_proxying_">הכנה של הפרוקסי השקוף מבוסס אפליקציות...</string>
+  <string name="transparent_proxying_enabled">פרוקסי שקוף מאופשר</string>
+  <string name="transproxy_enabled_for_tethering_">פרוקסי שקוף מאופשר ל Tathering!</string>
+  <string name="warning_error_starting_transparent_proxying_">אזהרה: שגיאה התחילה את הפרוקסי השקוף!</string>
+  <string name="transproxy_rules_cleared">כללי TransProxy טוהרו</string>
+  <string name="couldn_t_start_tor_process_">אין אפשרות להתחיל תהליך Tor:</string>
+  <string name="privoxy_is_running_on_port_">Polipo רץ על פורט:</string>
+  <string name="setting_up_port_based_transparent_proxying_">הכנה של הפרוקסי השקוף מבוסס פורט...</string>
+  <string name="bridge_error">שגיאת גשר</string>
+  <string name="error">שגיאה</string>
+  <string name="exit_nodes">צמתי יציאה</string>
+  <string name="enter_exit_nodes">הזן צמתי יציאה</string>
+  <string name="exclude_nodes">צמתים מוצאים</string>
+  <string name="enter_exclude_nodes">הזן צמתים מוצאים</string>
+  <string name="strict_nodes">צמתים קפדנים</string>
+  <string name="use_only_these_specified_nodes">השתמש *רק* בצמתים מצוינים אלו</string>
+  <string name="bridges">גשרים</string>
+  <string name="use_bridges">השתמש בגשרים</string>
+  <string name="bridges_obfuscated">גשרים מעורפלים</string>
+  <string name="ip_address_and_port_of_bridges">כתובת ה-IP ויציאה של הגשרים</string>
+  <string name="enter_bridge_addresses">הכנס כתובות גשר</string>
+  <string name="relays">ממסרים</string>
+  <string name="relaying">ממסור</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">אפשר למכשיר שלך להיות תחנת ממסר שאיננה יציאה</string>
+  <string name="relay_port">פורט הממסר</string>
+  <string name="listening_port_for_your_tor_relay">פורט מאזין עבור Tor relay</string>
+  <string name="enter_or_port"> הכנס יציאת OR</string>
+  <string name="relay_nickname">כינוי הממסר</string>
+  <string name="the_nickname_for_your_tor_relay">הכינוי לממסר Tor שלך</string>
+  <string name="enter_a_custom_relay_nickname">הזן כינוי עבור ממסר</string>
+  <string name="reachable_addresses">כתובות בהישג יד</string>
+  <string name="reachable_ports">פורטים בהישג יד</string>
+  <string name="enter_ports">הזן פורטים</string>
+  <string name="enable_hidden_services">אחסון שירותים נסתרים</string>
+  <string name="enter_localhost_ports_for_hidden_services">הזן פורטים של localhost עבור שירותים נסתרים</string>
+  <string name="hidden_service_ports">פורט השירותים הנסתרים</string>
+  <string name="project_home">אתרי הפרויקט:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">הרשיון של Tor</string>
+  <string name="https_torproject_org">https://torproject.org/</string>
+  <string name="third_party_software">תוכנה-צד-ג׳: </string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="found_existing_tor_process">נמצא תהליך Tor קיים…</string>
+  <string name="something_bad_happened">משהו רע התרחש. בדוק את היומן</string>
+  <string name="hidden_service_on">שירות נסתר ב:</string>
+  <string name="unable_to_read_hidden_service_name">לא מסוגל לקרוא שם שירות נסתר</string>
+  <string name="unable_to_start_tor">לא מסוגל להתחיל את Tor:</string>
+  <string name="unable_to_reset_tor">אתחל את המכשיר שלך, אין אפשרות להפעיל מחדש את Tor!</string>
+  <string name="pref_use_sys_iptables_title">השתמש בברירות המחדל של iptables</string>
+  <string name="pref_use_persistent_notifications">לשמור תמיד את האיקון בסרגל כלים כשאורבוט מחובר</string>
+  <string name="notification_using_bridges">גשרים מאופשרים!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">שפה</string>
+  <string name="set_locale_summary">בחר את המקומיות והשפה של Orbot</string>
+  <string name="wizard_locale_title">בחר שפה</string>
+  <string name="wizard_locale_msg">השאר ברירת מחדל או החלף לשפה הנוכחית</string>
+  <string name="powered_by">מופעל באמצעות Tor</string>
+  <string name="btn_save_settings">שמירת הגדרות</string>
+  <string name="no_internet_connection_tor">אין חיבור לאינטרנט; תור ממתין...</string>
+  <string name="bandwidth_">רוחב פס:</string>
+  <string name="down">מטה</string>
+  <string name="up">מעלה</string>
+  <string name="pref_disable_network_summary">כבה את Tor כאשר אין חיבור לאינטרנט</string>
+  <string name="newnym">החלפת אל זהות Tor חדשה!</string>
+  <string name="menu_use_chatsecure">הפעל את ChatSecure</string>
+  <string name="permission_manage_tor_label">נהל Tor</string>
+  <string name="permission_manage_tor_description">אפשר את אפליקציה זו כדי לשלוט בשירות Tor</string>
+  <string name="install_apps_">להתקין אפליקציה?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">אין חיבור לרשת. מכבה את Tor....</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">החיבור עובד טוב. מעיר את Tor...</string>
+  <string name="updating_settings_in_tor_service">מעדכן הגדרות Tor במכשיר</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_dialog">הגדרות SOCKS Port </string>
+  <string name="pref_transport_title">Tor TransProxy Port</string>
+  <string name="pref_transport_dialog">הגדרת הפורט של TransProxy</string>
+  <string name="pref_dnsport_title">Tor DNS Port</string>
+  <string name="your_tor_public_ips_">הIPs החיצוניים שלך עם Tor:</string>
+  <string name="you_do_not_have_root_access_enabled">אין לך גישת רוט מאופשרת</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">תצטרך לכבות ולהפעיל את Orbot על מנת להחיל את השינוי בהגדרות.</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="menu_qr">קוד QR</string>
+  <string name="get_bridges_email">דוא\"ל</string>
+  <string name="get_bridges_web">אתר</string>
+  <string name="activate">הפעל</string>
+  <string name="send_email">שלח דוא\"ל</string>
+  <string name="standard_browser">דפדפן רגיל</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-ja/strings.xml b/orbotservice/src/main/res/values-ja/strings.xml
new file mode 100644
index 0000000..1f11756
--- /dev/null
+++ b/orbotservice/src/main/res/values-ja/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbotは他のアプリがインターネットをより安全に使うことを可能にするフリーのプロキシアプリです。Orbotでは、Torを用いてあなたの端末のトラフィックを暗号化し、世界中のコンピューターを中継することで、そのトラフィックを隠します。Torはフリーのソフトウェアとオープンなネットワークであり、ユーザーの自由とプライバシーを脅かす監視活動や、機密のビジネス活動、国家によるトラフィック分析から身を守ることを助けてくれます。</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">Torを起動・停止する</string>
+  <string name="tor_proxy_service_process">Torプロクシサービス</string>
+  <string name="status_starting_up">Orbotが開始されています...</string>
+  <string name="status_activated">Torネットワークに接続しています</string>
+  <string name="status_disabled">\"Orbotが解除されました</string>
+  <string name="status_shutting_down">TorServiceが終了しています</string>
+  <string name="tor_process_starting">Torクライエントを開始しています...</string>
+  <string name="tor_process_complete">完了</string>
+  <string name="tor_process_waiting">お待ちください</string>
+  <string name="not_anonymous_yet">警告:この通信はまだ匿名化されていません! HTTP proxy 127.0.0.1:8118 か、 SOCKS4A または SOCKS5 proxy 127.0.0.1:9050 を利用するようにアプリケーション側で設定してください</string>
+  <string name="menu_home">ホーム</string>
+  <string name="menu_browse">閲覧</string>
+  <string name="menu_settings">設定</string>
+  <string name="menu_log">履歴</string>
+  <string name="menu_info">ヘルプ</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">スタート</string>
+  <string name="menu_stop">停止</string>
+  <string name="menu_about">情報</string>
+  <string name="menu_promo_apps">アプリを入手…</string>
+  <string name="main_layout_download">ダウンロード</string>
+  <string name="main_layout_upload">アップロード</string>
+  <string name="button_help">ヘルプ</string>
+  <string name="button_close">閉じる</string>
+  <string name="button_about">について</string>
+  <string name="button_clear_log">ログを削除する</string>
+  <string name="menu_verify">確認</string>
+  <string name="menu_exit">終了</string>
+  <string name="menu_scan">ブリッジQRをスキャン</string>
+  <string name="menu_share_bridge">ブリッジQRを共有</string>
+  <string name="press_to_start">- 長押しして起動 -</string>
+  <string name="pref_trans_proxy_group">透過プロキシ (要root)</string>
+  <string name="pref_trans_proxy_title">透過プロキシ</string>
+  <string name="pref_trans_proxy_summary">アプリの自動Tor化中</string>
+  <string name="pref_transparent_all_title">全てをTor化</string>
+  <string name="pref_transparent_all_summary">全てのアプリをTor経由で使う</string>
+  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
+  <string name="pref_transparent_port_fallback_summary">警告:通常のポート(80,443等)を迂回。「全て」か「指定アプリ」モードが動作しない場合にのみ使用してください。</string>
+  <string name="pref_transparent_port_title">ポート一覧</string>
+  <string name="pref_transparent_port_summary">プロキシを通すポート *警告* 「全て」か「指定アプリ」が動作しない場合にのみ使用してください。</string>
+  <string name="pref_transparent_port_dialog">プロキシのポート番号を入力</string>
+  <string name="pref_has_root">ルートアクセスの許可を要求します</string>
+  <string name="pref_has_root_summary">透過プロキシのためにroot権限が必要です</string>
+  <string name="status_install_success">Torバイナリインストールが成功しました</string>
+  <string name="status_install_fail">Torバイナリファイルがインストールできませんでした。ログを調べて、通知をtor-assistants at torproject.orgに送信してください。</string>
+  <string name="title_error">アプリケーションエラー</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Orbotについて</string>
+  <string name="btn_next">次</string>
+  <string name="btn_back">戻る</string>
+  <string name="btn_finish">終了</string>
+  <string name="btn_okay">OK</string>
+  <string name="btn_cancel">キャンセル</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Orbot詳細</string>
+  <string name="wizard_details_msg">Orbot はTor、LibEvent、Privoxyを含むオープンソース アプリケーションです。ローカルのHTTPプロキシ (8118) とSOCKSプロキシ (9050) を提供してTor接続します。root化された端末では、Orbotは全てのインターネット通信をTorを通して送信することもできます。</string>
+  <string name="wizard_permissions_root">権限を取得完了</string>
+  <string name="wizard_permissions_stock">Orbotの権限</string>
+  <string name="wizard_premissions_msg_root">Orbotがroot権限を取得したことを確認しました。全ての機能が利用できます。</string>
+  <string name="wizard_permissions_msg_stock">Orbotはroot化された端末では全ての機能を活用できます。下のボタンを押してOrbotに管理者権限を与えてください。</string>
+  <string name="wizard_permissions_no_root">root化していなかったり、そもそもroot化が何のことだかわからない方は、Orbot上で動作確認が取れているアプリだけを使用してください。</string>
+  <string name="wizard_permissions_consent">Superuserを利用せずに続行</string>
+  <string name="wizard_permission_enable_root">Orbotにroot権限を与える</string>
+  <string name="wizard_configure">Torをソフトウェアに使用する設定</string>
+  <string name="wizard_configure_msg">Orbotでは全てのアプリにTorプロキシを通すか、Torアプリを使う個々のアプリを指定できます。</string>
+  <string name="wizard_configure_all">全てのアプリにTorプロキシを通す</string>
+  <string name="wizard_configure_select_apps">指定したアプリだけにTorプロキシを通す</string>
+  <string name="wizard_tips_tricks">Orbotが有効化されたアプリ</string>
+  <string name="wizard_tips_msg">以下のアプリはOrbot用に作られています。それぞれのボタンを押すと今すぐインストールできます。Google Playからも同じものが探せます。</string>
+  <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="wizard_tips_twitter">Twitter proxyを「localhost」と8118番ポートに合わせる</string>
+  <string name="wizard_tips_story_maker">StoryMaker - ストーリーを作成して、セキュリティのためTorで残します!</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_proxy_help_msg">AndroidアプリがHTTPかSOCKSプロキシを利用できる場合、Orbotを使ってTor接続をすることが可能です。\n\n\n ホスト設定は127.0.0.1またはlocalhostです。HTTPでは使用ポートは8118です。SOCKSでは9050です。可能であればSOCKS4AかSOCKS5の利用を推奨します。\n \n\n\n Android上のプロキシについて学びたい場合は http://tinyurl.com/proxyandroid のFAQを参照してください。</string>
+  <string name="wizard_final">Orbotの準備が完了しました</string>
+  <string name="wizard_final_msg">世界中で数百万人が様々な理由でTorを利用しています。\n\nジャーナリストやブロガー、人権団体、法的機関、軍隊、企業、独裁国家の市民、普通の市民も… そしてあなたも同じように利用することができます!</string>
+  <string name="wizard_exit_at_first_screen_toast">使用を開始する前にOrbotを設定してください!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Torネットワークに正常に接続しました - しかしお使いの端末が安全だとは限りません。「ブラウザ」ボタンを使用して接続のテストができます。 \n\nさらに詳細はhttps://guardianproject.info/apps/orbot を参照するか、help at guardianproject.info にメールを送信してください。</string>
+  <string name="tor_check">ブラウザを開いてhttps://check.torproject.org にTor接続し、Orbotの設定が成功したかを試します。</string>
+  <string name="pref_hs_group">Hidden Services</string>
+  <string name="pref_general_group">一般</string>
+  <string name="pref_start_boot_title">起動時にOrbotを実行する</string>
+  <string name="pref_start_boot_summary">Android端末の起動時にOrbotを自動実行</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">AndroidでもOrbotでTorが使えます!\n\nTorは、コンテンツフィルタリング、トラフィック分析、そしてプライバシー、機密情報や個人的な関係を脅かすネットワーク監視から守ることができます。\n\nこのウィザードはお使いの端末でOrbotとTorの設定ができます。</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">注意</string>
+  <string name="wizard_warning_msg">Orbotをインストールしただけでは通信は匿名化されません。\n\nOrbot、Android端末、アプリの全てを正しく設定しないとTorは使えません。</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">許可</string>
+  <string name="wizard_permissions_root_msg1">オプションとしてOrbotにスーパーユーザー権限を与えることで透過プロキシなどの追加機能が使えます。</string>
+  <string name="wizard_permissions_root_msg2">これを実行しない場合、Orbot用に作られたアプリだけを使ってください。</string>
+  <string name="wizard_permissions_no_root_msg">お使いの端末はroot化されていないか、rootまたは「Superuser」にアクセスできないようです。 \n\n代わりに、メイン画面の「アプリ」モードを試してください。 </string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbotが有効化されたアプリ</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: 非記録式暗号によるセキュアなチャットアプリ</string>
+  <string name="wizard_tips_orweb">Orfox: Torを介して動作するプライバシーを強化したブラウザ</string>
+  <string name="wizard_tips_play">Google Playで全てのGuardian Projectのアプリを見つける</string>
+  <string name="wizard_tips_fdroid">F-Droidで全てのGuardian Projectのアプリを見つける</string>
+  <string name="wizard_tips_fdroid_org">https://f-droid.org で全てのGuardian Projectのアプリを見つける</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">透過プロキシ</string>
+  <string name="wizard_transproxy_msg">これはあなたのアプリを自動的にTor経由で通信させます。</string>
+  <string name="wizard_transproxy_hint">(何を言っているのかわからないときはここをチェックしてください)</string>
+  <string name="wizard_transproxy_none">無し</string>
+  <string name="pref_transparent_tethering_title">Torテザリング</string>
+  <string name="pref_transparent_tethering_summary">Tor透過プロクシをWifiかUSBテザリングされたデバイスに対して有効化(再起動が必要)</string>
+  <string name="button_grant_superuser">管理許可アクセスを要求します</string>
+  <string name="pref_select_apps">アプリケーションを選択します</string>
+  <string name="pref_select_apps_summary">Torを経由させるアプリを選択</string>
+  <string name="pref_node_configuration">ノード設定</string>
+  <string name="pref_node_configuration_summary">ご注意、先進設定が匿名レベルを縮小します</string>
+  <string name="pref_entrance_node">入り口ノード</string>
+  <string name="pref_entrance_node_summary">最初のホップのためのデジタル指紋、ニックネーム、国とIPアドレス</string>
+  <string name="pref_entrance_node_dialog">入り口ノードを入力</string>
+  <string name="pref_allow_background_starts_title">バックグラウンドの開始を許可</string>
+  <string name="pref_allow_background_starts_summary">OrbotがTorと関連サービスを開始するように、任意のアプリに伝えます</string>
+  <string name="button_proxy_all">すべてプロキシ</string>
+  <string name="button_proxy_none">プロキシなし</string>
+  <string name="button_invert_selection">選択の反転</string>
+  <string name="pref_proxy_title">外方向ネットワークプロキシ (オプション)</string>
+  <string name="pref_proxy_type_title">外方向プロキシの種類</string>
+  <string name="pref_proxy_type_summary">HTTP,HTTPS,Socks4,Socks5で使用するプロトコル</string>
+  <string name="pref_proxy_type_dialog">プロキシの種類を入力してください</string>
+  <string name="pref_proxy_host_title">外方向プロキシのホスト</string>
+  <string name="pref_proxy_host_summary">プロキシサーバのホスト名</string>
+  <string name="pref_proxy_host_dialog">プロクシ ホストを入力</string>
+  <string name="pref_proxy_port_title">外方向プロキシのポート</string>
+  <string name="pref_proxy_port_summary">プロキシサーバのポート</string>
+  <string name="pref_proxy_port_dialog">プロキシのポートを入力してください</string>
+  <string name="pref_proxy_username_title">外方向プロキシのポート</string>
+  <string name="pref_proxy_username_summary">プロキシユーザー名 (オプション)</string>
+  <string name="pref_proxy_username_dialog">プロキシのユーザー名を入力してください</string>
+  <string name="pref_proxy_password_title">外方向プロキシのパスワード</string>
+  <string name="pref_proxy_password_summary">プロキシのパスワード (オプション)</string>
+  <string name="pref_proxy_password_dialog">プロキシのパスワードを入力してください</string>
+  <string name="status">状態</string>
+  <string name="setting_up_full_transparent_proxying_">完全な透過プロキシをセットアップ中...</string>
+  <string name="setting_up_app_based_transparent_proxying_">アプリベースの透過プロキシをセットアップ中...</string>
+  <string name="transparent_proxying_enabled">透過プロキシ 有効</string>
+  <string name="transproxy_enabled_for_tethering_">テザリングでの透過プロキシ有効</string>
+  <string name="warning_error_starting_transparent_proxying_">警告: 透過プロキシの開始時にエラー発生</string>
+  <string name="transproxy_rules_cleared">透過プロキシ ルール 消去完了</string>
+  <string name="couldn_t_start_tor_process_">Torプロセスの起動に失敗:</string>
+  <string name="privoxy_is_running_on_port_">Polipoを実行中のポート: </string>
+  <string name="setting_up_port_based_transparent_proxying_">ポートベースの透過プロキシをセットアップ中...</string>
+  <string name="bridge_error">ブリッジ エラー</string>
+  <string name="bridge_requires_ip">ブリッジ機能を利用するには、最低一つのブリッジIPアドレスの入力が必要です。</string>
+  <string name="send_email_for_bridges">gmailを使って、本文に「get bridges」と書いたメールをbridges at torproject.orgに送信してください。</string>
+  <string name="error">エラー</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">あなたのReachableAddresses設定により例外が発生しました!</string>
+  <string name="your_relay_settings_caused_an_exception_">あなたのリレー設定により例外が発生しました!</string>
+  <string name="exit_nodes">出口ノード</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">最後のホップのためのデジタル指紋、ニックネーム、国とIPアドレス</string>
+  <string name="enter_exit_nodes">出口ノードを入力</string>
+  <string name="exclude_nodes">除外ノード</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">除外するデジタル指紋、ニックネーム、国とIPアドレス</string>
+  <string name="enter_exclude_nodes">除外ノードを入力</string>
+  <string name="strict_nodes">Strictノード</string>
+  <string name="use_only_these_specified_nodes">ここに指定したノードのみを使用</string>
+  <string name="bridges">ブリッジ</string>
+  <string name="use_bridges">ブリッジを使う</string>
+  <string name="bridges_obfuscated">Obfus化されたブリッジ</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">代替入り口ノードを有効化</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">設定したブリッジがObfus化されたブリッジであれば有効</string>
+  <string name="ip_address_and_port_of_bridges">ブリッジのIPアドレスとポート</string>
+  <string name="enter_bridge_addresses">ブリッジのアドレスを入力</string>
+  <string name="relays">リレー</string>
+  <string name="relaying">リレー中</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">この端末を非出口リレーにする</string>
+  <string name="relay_port">リレー ポート</string>
+  <string name="listening_port_for_your_tor_relay">このTorリレーのリスニングポート</string>
+  <string name="enter_or_port">ORポートを入力</string>
+  <string name="relay_nickname">リレーのニックネーム</string>
+  <string name="the_nickname_for_your_tor_relay">このTorリレーのニックネーム</string>
+  <string name="enter_a_custom_relay_nickname">リレーのカスタムニックネームを入力</string>
+  <string name="reachable_addresses">到達可能アドレス</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">制限設定のファイアウォールを通してクライアントとして実行</string>
+  <string name="reachable_ports">到達可能ポート</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">制限設定のファイアウォールを通して到達可能なポート</string>
+  <string name="enter_ports">ポートを入力</string>
+  <string name="enable_hidden_services">Hidden Serviceのホスティング</string>
+  <string name="run_servers_accessible_via_the_tor_network">デバイス上のサーバーをTor経由でアクセス可能にする</string>
+  <string name="enter_localhost_ports_for_hidden_services">Hidden Service用のlocalhostのポートを入力</string>
+  <string name="hidden_service_ports">Hidden Serviceのポート</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">あなたのHidden Serviceのアドレス(自動生成されます)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">デバッグログの出力を有効化(閲覧にはadbかaLogCatが必要)</string>
+  <string name="project_home">プロジェクトのホーム:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor ライセンス文書</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">第三者製のソフトウェア</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">アプリがhidden serverの port %S をTorネットワークに開放しようとしています。信頼できるアプリであればこれは安全です。</string>
+  <string name="found_existing_tor_process">Torプロセスを発見</string>
+  <string name="something_bad_happened">何かが起こりました。ログを確認してください。</string>
+  <string name="hidden_service_on">hidden service 有効:</string>
+  <string name="unable_to_read_hidden_service_name">hidden serviceの名前読込不能</string>
+  <string name="unable_to_start_tor">Torを実行できませんでした</string>
+  <string name="unable_to_reset_tor">Torをリセットできません。お使いのデバイスを再起動してください!</string>
+  <string name="pref_use_sys_iptables_title">デフォルトのlptablesを使う</string>
+  <string name="pref_use_sys_iptables_summary">Orbotバンドル版ではなく内蔵のiptablesを使う</string>
+  <string name="error_installing_binares">Torバイナリのインストールまたはアップグレードは不可能でした。</string>
+  <string name="pref_use_persistent_notifications">Orbotが接続中はアイコンを常にツールバーに表示</string>
+  <string name="pref_use_persistent_notifications_title">通知を常に有効化</string>
+  <string name="pref_use_expanded_notifications">拡張通知で、Torの出口の国とIPを表示します</string>
+  <string name="pref_use_expanded_notifications_title">拡張通知</string>
+  <string name="notification_using_bridges">ブリッジが有効です!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">言語</string>
+  <string name="set_locale_summary">Orbotの地域と言語を選択</string>
+  <string name="wizard_locale_title">言語を選択</string>
+  <string name="wizard_locale_msg">今の言語を変更するか、そのままにする</string>
+  <string name="powered_by">powered by Tor</string>
+  <string name="btn_save_settings">設定を保存</string>
+  <string name="no_internet_connection_tor">インターネット接続なし。Torは待機中です...</string>
+  <string name="bandwidth_">帯域幅:</string>
+  <string name="down">ダウン</string>
+  <string name="up">アップ</string>
+  <string name="pref_disable_network_title">ネットワークなし時オートスリープ</string>
+  <string name="pref_disable_network_summary">ネット接続がない時 Tor をスリープさせる</string>
+  <string name="newnym">新たな Tor の身元に切り替えました。</string>
+  <string name="menu_verify_browser">ブラウザ</string>
+  <string name="menu_use_chatsecure">ChatSecure を使用</string>
+  <string name="permission_manage_tor_label">Tor を管理</string>
+  <string name="permission_manage_tor_description">このアプリが Tor サービスをコントールできるようにする</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orfox をインストールしていないようです。それについて助けが必要ですか、あるいはただブラウザを開くべきですか?</string>
+  <string name="install_apps_">アプリをインストールしますか?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">ネットワーク接続がありません。Torはスリープします…</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">ネットワーク接続は良好です。Torを有効にします…</string>
+  <string name="updating_settings_in_tor_service">Torサービスの設定を更新中</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">TorがSOCKSプロキシを提供するポート (デフォルト: 9050、0にすると無効)</string>
+  <string name="pref_socks_dialog">SOCKS ポート設定</string>
+  <string name="pref_transport_title">Tor透過プロキシポート</string>
+  <string name="pref_transport_summary">Torが透過プロキシを提供するポート (デフォルト: 9040、0にすると無効)</string>
+  <string name="pref_transport_dialog">透過プロキシポート設定</string>
+  <string name="pref_dnsport_title">Tor DNS ポート</string>
+  <string name="pref_dnsport_summary">TorがDNSを提供するポート (デフォルト: 5400、0にすると無効)</string>
+  <string name="pref_dnsport_dialog">DNS ポート設定</string>
+  <string name="pref_torrc_title">Torrc カスタム設定</string>
+  <string name="pref_torrc_summary">上級者家のみ: 直接torrc設定行を入力します</string>
+  <string name="pref_torrc_dialog">Torrcをカスタム</string>
+  <string name="wizard_tips_martus">Mobile Martus - Benetech 人権文書アプリ</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>
+  <string name="pref_transproxy_refresh_title">透過プロキシ自動リフレッシュ</string>
+  <string name="pref_transproxy_refresh_summary">ネットワークの状態が変化したとき、透過プロキシのルールを再適用します</string>
+  <string name="pref_transproxy_flush_title">透過プロキシ強制削除</string>
+  <string name="pref_transproxy_flush_summary">ここをタップすると、今すぐすべての透過プロキシ ネットワークルールをフラッシュします</string>
+  <string name="transparent_proxy_rules_flushed_">透過プロキシのルールをフラッシュしました!</string>
+  <string name="you_do_not_have_root_access_enabled">ROOT アクセスが有効ではありません</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">変更した設定を有効にするために、Orbotを停止して開始する必要があるかもしれません。</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">ブリッジを更新しました</string>
+  <string name="restart_orbot_to_use_this_bridge_">変更を有効にするにはOrbotを再起動してください</string>
+  <string name="menu_qr">QRコード</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">モバイルネットワークが積極的にTorをブロックする場合、ブリッジを使用してネットワークにアクセスすることができます。\n\nブリッジを有効にするため、上のいずれかのブリッジタイプを選択してください。</string>
+  <string name="bridge_mode">ブリッジ モード</string>
+  <string name="get_bridges_email">メール</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">アクティブ化</string>
+  <string name="apps_mode">アプリ VPN モード</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">AndroidのVPN機能を使用して、デバイス上のすべてのアプリをTorネットワークを介するようにすることができます\n\n個*警告* これは新しい、実験的な機能であり、いくつかのケースで自動的に起動しないこと、または停止することがあります。これは匿名のために使用しないでください。ファイアウォールやフィルターを通すためにのみ使用してください。</string>
+  <string name="send_email">メール送信</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">あなたは、メール、ウェブを介して、またはブリッジQRコードをスキャンしてブリッジアドレスを取得することができます。ブリッジアドレスを要求するため、下の「メール」または「ウェブ」を選択してください。\n\nアドレスを入手したら、それをOrbot設定の「ブリッジ」設定にコピー& 貼り付けして、Orbotを再起動します。</string>
+  <string name="install_orweb">Orfoxをインストール</string>
+  <string name="standard_browser">標準ブラウザ</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">注: 標準のTorブリッジは、Intel X86/ATOM デバイス上でのみ動作します</string>
+  <string name="vpn_default_world">ワールド</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-kn-rIN/strings.xml b/orbotservice/src/main/res/values-kn-rIN/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/orbotservice/src/main/res/values-kn-rIN/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-kn/strings.xml b/orbotservice/src/main/res/values-kn/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/orbotservice/src/main/res/values-kn/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-ko/strings.xml b/orbotservice/src/main/res/values-ko/strings.xml
new file mode 100644
index 0000000..765b572
--- /dev/null
+++ b/orbotservice/src/main/res/values-ko/strings.xml
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">Tor 시작 및 중지</string>
+  <string name="tor_proxy_service_process">Tor 프록시 서비스</string>
+  <string name="status_starting_up">Orbot 시작 중…</string>
+  <string name="status_activated">Tor 네트워크에 연결됨</string>
+  <string name="status_disabled">Orbot이 비활성화되어 있습니다</string>
+  <string name="tor_process_starting">Tor 클라이언트 시작 중…</string>
+  <string name="tor_process_complete">완료.</string>
+  <string name="tor_process_waiting">대기 중.</string>
+  <string name="not_anonymous_yet">경고: 귀하의 트래픽은 아직 익명이 아닙니다! HTTP 프록시 127.0.0.1:8118 또는 SOCKS4A 또는 SOCKS5 프록시 127.0.0.1:9050을 사용하여 응용 프로그램을 구성하십시오</string>
+  <string name="menu_home">홈</string>
+  <string name="menu_browse">탐색</string>
+  <string name="menu_settings">설정</string>
+  <string name="menu_log">로그</string>
+  <string name="menu_info">도움말</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">시작</string>
+  <string name="menu_stop">중지</string>
+  <string name="menu_about">정보</string>
+  <string name="main_layout_download">다운로드</string>
+  <string name="main_layout_upload">업로드</string>
+  <string name="button_help">도움말</string>
+  <string name="button_close">닫기</string>
+  <string name="button_about">정보</string>
+  <string name="button_clear_log">로그 지우기</string>
+  <string name="menu_verify">확인</string>
+  <string name="menu_exit">종료</string>
+  <string name="menu_scan">브릿지 QR코드 스캔하기</string>
+  <string name="menu_share_bridge">브릿지 QR코드 공유하기</string>
+  <string name="press_to_start">- 길게 눌러서 시작하기 -</string>
+  <string name="pref_trans_proxy_group">투명한 프록시 (루팅 필요)</string>
+  <string name="pref_trans_proxy_title">투명한 프록시</string>
+  <string name="pref_trans_proxy_summary">앱의 자동적인 토르화</string>
+  <string name="pref_transparent_all_title">모두 토르화</string>
+  <string name="pref_transparent_all_summary">토르를 통한 모든 응용 프로그램에 대한 프록시 트래픽</string>
+  <string name="pref_transparent_port_fallback_title">대체 프록시 포트</string>
+  <string name="pref_transparent_port_fallback_summary">경고 : 흔한 포트(80,443 등)만 순환. 전체 모드나 앱 모드가 작동하지 않을 경우에만 사용할 것.</string>
+  <string name="pref_transparent_port_title">포트 목록</string>
+  <string name="pref_transparent_port_summary">프록시 처리할 포트 목록. 만약 전체 모드나 앱 모드가 작동하지 않을 경우에만 사용할 것.</string>
+  <string name="pref_transparent_port_dialog">프록시 포트 입력</string>
+  <string name="pref_has_root">루트 권한에 대한 접근 필요</string>
+  <string name="pref_has_root_summary">명백한 프록시를 위해 루트 권한 요구</string>
+  <string name="status_install_success">Tor 바이너리가 성공적으로 설치되었습니다!</string>
+  <string name="status_install_fail">토르 바이너리 파일을 설치할 수 없습니다. 로그를 확인해 주시고 tor-assistants at torproject.org 에 알려 주십시오.</string>
+  <string name="title_error">애플리케이션 오류</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Orbot 정보</string>
+  <string name="btn_next">다음</string>
+  <string name="btn_back">뒤로</string>
+  <string name="btn_finish">마침</string>
+  <string name="btn_okay">확인</string>
+  <string name="btn_cancel">취소</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Orbot에 대한 몇몇 상세사항</string>
+  <string name="wizard_details_msg">Orbot은 Tor와, LibEvent, Polipo를 탑재한 오픈소스 어플리케이션입니다. 다이 앱은 Tor 네트워크로 연결되는 HTTP 프록시 (8118)와 SOCKS 프록시 (9050) 을 제공합니다. Orbot은 또한, 루팅된 폰의 경우, 모든 트래픽을 Tor를 통할 수 있도록 합니다.</string>
+  <string name="wizard_permissions_root">사용 권한 부여</string>
+  <string name="wizard_permissions_stock">Orbot 사용 권한</string>
+  <string name="wizard_premissions_msg_root">완벽합니다! Orbot을 위해 루트 권한이 활성화된것을 감지했습니다. 우리는 이 힘을 현명하게 사용할 것입니다.</string>
+  <string name="wizard_permissions_msg_stock">이것은 필수가 아닌 반면, 귀하의 장치가 루트 권한을 가지고 있다면 Orbot은 더 강력한 도구가 될 수 있습니다. Orbot에게 수퍼유저 권한을 부여하려면 아래 버튼을 누르십시오.</string>
+  <string name="wizard_permissions_no_root">루트 권한을 가지고 있지 않거나 무엇을 말하는 것인지 모르겠다면, Orbot과 동작하는 애플리케이션만을 사용하십시오.</string>
+  <string name="wizard_permissions_consent">내용을 이해하였으며, 수퍼유저 권한 없이 계속 진행합니다.</string>
+  <string name="wizard_permission_enable_root">Orbot에게 루트권한 부여</string>
+  <string name="wizard_configure">토르화 설정</string>
+  <string name="wizard_configure_msg">Orbot은 모든 애플리케이션 또는 선택된 애플리케이션을 Tor를 통해 통신하도록 할 수 있습니다.</string>
+  <string name="wizard_configure_all">모든 앱을 토르 프록시로 연결하기</string>
+  <string name="wizard_configure_select_apps">Tor를 위해 각각의 앱 선택</string>
+  <string name="wizard_tips_tricks">Orbot이 활성화된 앱</string>
+  <string name="wizard_tips_msg">아래의 앱은 Orbot과 작동되도록 개발되었습니다. 지금 설치하려면 각각의 버튼을 누르십시오. 또는 나중에 Google Play, GuardianProject.info, F-Droid.org 에서 찾을 수 있습니다.</string>
+  <string name="wizard_tips_otrchat">ChatSecure - 안드로이드를 위한 안전한 인스턴트 메세징 클라이언트</string>
+  <string name="wizard_tips_proxy">Proxy Settings - Orbot과 작동하도록 앱을 설정하는 방법을 배우기</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo 검색 엔진 앱</string>
+  <string name="wizard_tips_twitter">트위터 프록시를 localhost:8118로 설정</string>
+  <string name="wizard_tips_story_maker">StoryMaker - 스토리는 당신이 만들고 보안은 Tor에 맏기세요!</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>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Orbot이 정상적으로 설정되었고 Tor에 연결되었는지 확인하기 위해 https://check.torproject.org 을 귀하의 웹 브라우저에 열 것입니다.</string>
+  <string name="pref_hs_group">숨겨진 서비스 호스팅</string>
+  <string name="pref_general_group">일반</string>
+  <string name="pref_start_boot_title">부팅 후 Orbot 시작</string>
+  <string name="pref_start_boot_summary">안드로이드 장치가 시작할 때 자동적으로 Orbot을 시작하고 Tor에 연결합니다</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">경고</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">권한</string>
+  <string name="wizard_permissions_root_msg1">투명 프록시 같은 고급 기능을 활성화하기 위해 귀하는 선택적으로 Orbot에게 \'수퍼유저\' 권한을 줄 수 있습니다.</string>
+  <string name="wizard_permissions_root_msg2">이것을 원하지 않으신다면, Orbot과 작동하도록 만들어진 앱만을 사용하십시오.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot을 사용하는 앱</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: 오프 더 레코드 암호화를 적용한 안전한 채팅 앱</string>
+  <string name="wizard_tips_play">구글 플레이에서 모든 가디언 프로젝트 앱 찾기</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">투명 프록시</string>
+  <string name="wizard_transproxy_msg">이것은 어떠한 설정 없이도 귀하의 앱이 자동적으로 토르 네트워크를 통해 작동하도록 해 줍니다.</string>
+  <string name="wizard_transproxy_hint">(위 내용을 이해할 수 없다면 이것을 선택해주십시오.)</string>
+  <string name="wizard_transproxy_none">없음</string>
+  <string name="pref_transparent_tethering_title">토르 테더링</string>
+  <string name="pref_transparent_tethering_summary">테더링 된 와이파이와 USB 장치에 토르 투명 프록시 활성화 (재시작 필요)</string>
+  <string name="button_grant_superuser">수퍼유저 권한 요청</string>
+  <string name="pref_select_apps">앱 선택</string>
+  <string name="pref_select_apps_summary">Tor를 통한 통신을 사용할 앱 선택</string>
+  <string name="pref_node_configuration">노드 설정</string>
+  <string name="pref_node_configuration_summary">귀하의 익명성을 감소시킬 수 있는 고급 설정이 있습니다.</string>
+  <string name="pref_entrance_node">입구 노드</string>
+  <string name="pref_entrance_node_summary">첫번째 Hop을 위한핑거프린트, 별칭, 나라와 주소</string>
+  <string name="pref_entrance_node_dialog">입구 노드 입력</string>
+  <string name="pref_proxy_title">외부 네트워크 프록시 (선택)</string>
+  <string name="pref_proxy_type_title">외부 프록시 유형</string>
+  <string name="pref_proxy_type_summary">프록시 서버를 위한 사용되는 프로토콜 : HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">프록시 형식 입력</string>
+  <string name="pref_proxy_host_title">외부 프록시 호스트</string>
+  <string name="pref_proxy_host_summary">프록시 서버 호스트네입</string>
+  <string name="pref_proxy_host_dialog">프록시 호스트 입력</string>
+  <string name="pref_proxy_port_title">외부 프록시 포트</string>
+  <string name="pref_proxy_port_summary">서버 포트 입력</string>
+  <string name="pref_proxy_port_dialog">프록시 포트 입력</string>
+  <string name="pref_proxy_username_title">외부 프록시 사용자명</string>
+  <string name="pref_proxy_username_summary">프록시 사용자명 (선택)</string>
+  <string name="pref_proxy_username_dialog">프록시 사용자명 입력</string>
+  <string name="pref_proxy_password_title">외부 프록시 비밀번호</string>
+  <string name="pref_proxy_password_summary">프록시 비밀번호 (선택)</string>
+  <string name="pref_proxy_password_dialog">프록시 비밀번호 입력</string>
+  <string name="status">상태</string>
+  <string name="setting_up_full_transparent_proxying_">전체 투명 프록시 설정중...</string>
+  <string name="setting_up_app_based_transparent_proxying_">앱에 기반한 투명 프록시 설정중...</string>
+  <string name="transparent_proxying_enabled">투명 프록시 활성화됨</string>
+  <string name="transproxy_enabled_for_tethering_">테더링을 위한 TransProxy 활성화됨</string>
+  <string name="warning_error_starting_transparent_proxying_">경고 : 투명 프록시 시작 오류</string>
+  <string name="transproxy_rules_cleared">TransProxy 규칙 모두 삭제됨</string>
+  <string name="couldn_t_start_tor_process_">Tor 프로세스 시작 불가능:  </string>
+  <string name="setting_up_port_based_transparent_proxying_">포트에 기반한 투명 프록시 설정</string>
+  <string name="bridge_error">브릿지 오류</string>
+  <string name="bridge_requires_ip">브릿지 기능을 사용하기 위해서, 최소한 1개 이상의 브릿지 IP 주소가 필요합니다.</string>
+  <string name="send_email_for_bridges">메일 본문에 get bridges라고 적어서 Gmail로 bridges at torproject.org에 메일을 보내십시오.</string>
+  <string name="error">오류</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">귀하의 ReachableAddress 설정은 예외를 발생시켰습니다!</string>
+  <string name="your_relay_settings_caused_an_exception_">귀하의 중계서버 설정은 예외를 발생시켰습니다!</string>
+  <string name="exit_nodes">출구 노드</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">마지막 Hop을 위한핑거프린트, 별칭, 나라와 주소</string>
+  <string name="enter_exit_nodes">출구 노드 입력</string>
+  <string name="exclude_nodes">차단할 노드</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">차단할 핑거프린트, 별칭, 나라와 주소</string>
+  <string name="enter_exclude_nodes">차단할 노드 입력</string>
+  <string name="strict_nodes">노드 선택</string>
+  <string name="use_only_these_specified_nodes">이 특정한 노드*만* 사용합니다.</string>
+  <string name="bridges">중계서버</string>
+  <string name="use_bridges">중계서버 사용</string>
+  <string name="bridges_obfuscated">Obfuscated Bridges</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Tor 네트워크로 들어가는 대안의 입구 노드 활성화</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">설정된 bridge가 obfsproxy bridge면 활성화</string>
+  <string name="ip_address_and_port_of_bridges">중계서버의 IP 주소와 </string>
+  <string name="enter_bridge_addresses">중게서버 주소 입력</string>
+  <string name="relays">중계서버</string>
+  <string name="relaying">중계</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">귀하의 장치를 출구가 아닌 중계서버로 활성화</string>
+  <string name="relay_port">중계 포트</string>
+  <string name="listening_port_for_your_tor_relay">귀하의 Tor 중계서버를 위한 Listening 포트</string>
+  <string name="enter_or_port">OR 포트 입력</string>
+  <string name="relay_nickname">중계서버 별명</string>
+  <string name="the_nickname_for_your_tor_relay">귀하의 중계서버를 위한 별명</string>
+  <string name="enter_a_custom_relay_nickname">임의의 중계서버 별명을 입력</string>
+  <string name="reachable_addresses">도달 가능한 주소</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">엄격한 정책을 가진 방화벽 뒤에서 클라이언트 가동</string>
+  <string name="reachable_ports">도달 가능한 포트</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">엄격한 방화벽 뒤에서 접근 가능한 포트</string>
+  <string name="enter_ports">포트 입력</string>
+  <string name="enable_hidden_services">히든 서비스 호스팅</string>
+  <string name="run_servers_accessible_via_the_tor_network">장치 내의 서버가 Tor 네트워크를 통해 접근 가능하도록 허용</string>
+  <string name="enter_localhost_ports_for_hidden_services">히든 서비스를 위한 localhost 포트 입력</string>
+  <string name="hidden_service_ports">히든 서비스 포트</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">귀하의 히든 서비스를 위한 주소화된 이름(자동으로 생성됨)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">디버그 로그 출력 활성화 (보기 위해서는 adb나 aLogCat을 사용해야 함)</string>
+  <string name="project_home">프로젝트 홈 페이지:</string>
+  <string name="the_tor_license">The Tor License</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3rd-Party-Software: </string>
+  <string name="hidden_service_request">앱이 Tor 네트워크로 히든 서버 포트를 열고 싶어합니다. 앱을 믿는다면 안전합니다.</string>
+  <string name="found_existing_tor_process">존재하고 있는 Tor 프로세스 발견</string>
+  <string name="something_bad_happened">어떤 나쁜 것이 발생. 로그 확인하세요.</string>
+  <string name="hidden_service_on">히든 서비스 목록 :</string>
+  <string name="unable_to_read_hidden_service_name">히든 서비스 이름을 읽을 수 없음</string>
+  <string name="unable_to_start_tor">Tor 시작 불가능</string>
+  <string name="pref_use_sys_iptables_title">기본 iptables 사용</string>
+  <string name="pref_use_sys_iptables_summary">Orbot에 동봉된 것 대신에 빌트인된 iptables 바이너리 사용</string>
+  <string name="error_installing_binares">Tor 바이너리는 설치되거나 없그레이드 될 수 없었습니다.</string>
+  <string name="pref_use_persistent_notifications">Orbot이 연결되었을 때 툴바에 아이콘 보이기</string>
+  <string name="pref_use_persistent_notifications_title">항상 켜진 알림</string>
+  <string name="notification_using_bridges">bridge 활성화됨</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Orbot을 위한 로케일과 언어 선택</string>
+  <string name="wizard_locale_title">언어 선택</string>
+  <string name="wizard_locale_msg">기본값으로 두거나 현재 언어 바꾸기</string>
+  <string name="btn_save_settings">설정 저장</string>
+  <string name="bandwidth_">대역폭:</string>
+  <string name="down">아래로</string>
+  <string name="up">위로</string>
+  <string name="pref_disable_network_title">네트워크가 없을 때의 자동 슬립</string>
+  <string name="pref_disable_network_summary">인터넷이 불가능하다면 Tor를 슬립 모드로 두십시오</string>
+  <string name="newnym">새로운 Tor 신원으로 전환되었습니다!</string>
+  <string name="menu_use_chatsecure">ChatSecure  사용</string>
+  <string name="permission_manage_tor_label">Tor 관리</string>
+  <string name="permission_manage_tor_description">Tor 서비스를 제어하기 위해 이 앱을 활성화하십시오</string>
+  <string name="install_apps_">앱을 설치할까요?</string>
+  <string name="menu_vpn">VPN</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-ky/strings.xml b/orbotservice/src/main/res/values-ky/strings.xml
new file mode 100644
index 0000000..89c837c
--- /dev/null
+++ b/orbotservice/src/main/res/values-ky/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_settings">Ырастоолор</string>
+  <string name="menu_info">Жардам</string>
+  <string name="menu_about">Программа жөнүндө</string>
+  <string name="button_help">Жардам</string>
+  <string name="button_about">Программа жөнүндө</string>
+  <string name="menu_exit">Чыгуу</string>
+  <string name="btn_cancel">Айнуу</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="status">Абал</string>
+  <string name="error">Ката</string>
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-lt-rLT/strings.xml b/orbotservice/src/main/res/values-lt-rLT/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/orbotservice/src/main/res/values-lt-rLT/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-lt/strings.xml b/orbotservice/src/main/res/values-lt/strings.xml
new file mode 100644
index 0000000..b9253dd
--- /dev/null
+++ b/orbotservice/src/main/res/values-lt/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_browse">Naršyti</string>
+  <string name="menu_settings">Nustatymai</string>
+  <string name="menu_info">Pagalba</string>
+  <string name="menu_about">Apie</string>
+  <string name="button_help">Pagalba</string>
+  <string name="button_close">Uždaryti</string>
+  <string name="button_about">Apie</string>
+  <string name="menu_exit">Išeiti</string>
+  <string name="btn_back">Atgal</string>
+  <string name="btn_cancel">Atsisakyti</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Proxy nustatymai</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Įspėjimas</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">Joks</string>
+  <string name="status">Statusas</string>
+  <string name="error">Klaida</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Išsaugoti nustatymus</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-lv/strings.xml b/orbotservice/src/main/res/values-lv/strings.xml
new file mode 100644
index 0000000..194c7b0
--- /dev/null
+++ b/orbotservice/src/main/res/values-lv/strings.xml
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot ir starpniekserveru bezmaksas lietotne, kas sniedz iespēju citām lietotnēm drošāk lietot internetu. Orbot izmanto Tor, lai šifrētu Jūsu interneta datplūsmu, tad to paslēpj, pārsūtot to caur daudziem datoriem visā pasaulē. Tor ir bezmaksas programmatūra un atvērts tīkls, kas palīdz Jums aizsargāties pret tīkla uzraudzības veidu - datplūsmas analīzi -, ar kuras palīdzību tiek apdraudēta personiskā brīvība un privātums, konfidenciālas lietišķas darbības un attiecības, kā arī valsts drošība.  </string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">startēt un apturēt Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot startē...</string>
+  <string name="status_activated">Izveidots savienojums ar tīklu Tor</string>
+  <string name="status_disabled">Orbot ir deaktivēts</string>
+  <string name="tor_process_starting">Startē Tor klientu...</string>
+  <string name="tor_process_complete">pabeidz.</string>
+  <string name="tor_process_waiting">gaida.</string>
+  <string name="not_anonymous_yet">BRĪDINĀJUMS: Jūsu datplūsma vēl nav anonīma! Lūdzu konfigurējiet savas lietotnes, lai tās izmantotu HTTP starpnieku 127.0.0.1:8118 vai SOCKS4A , vai SOCKS5 starpnieku 127.0.0.1:9050</string>
+  <string name="menu_home">Mājas</string>
+  <string name="menu_browse">Pārlūkot</string>
+  <string name="menu_settings">Iestatījumi</string>
+  <string name="menu_log">Žurnāls</string>
+  <string name="menu_info">Palīdzība</string>
+  <string name="menu_start">Startēt</string>
+  <string name="menu_stop">Apturēt</string>
+  <string name="menu_about">Par</string>
+  <string name="main_layout_download">Lejupielāde</string>
+  <string name="main_layout_upload">Augšupielāde</string>
+  <string name="button_help">Palīdzība</string>
+  <string name="button_close">Aizvērt</string>
+  <string name="button_about">Par</string>
+  <string name="button_clear_log">Notīrīt žurnālu</string>
+  <string name="menu_verify">Pārbaudīt</string>
+  <string name="menu_exit">Iziet</string>
+  <string name="menu_scan">Skenēt BridgeQR</string>
+  <string name="menu_share_bridge">Koplietot BridgeQR</string>
+  <string name="press_to_start">Lai startētu, nospiediet ilgi</string>
+  <string name="pref_trans_proxy_group">Pārredzama starpniekošana (nepieciešamas saknes pilnvaras)</string>
+  <string name="pref_trans_proxy_title">Pārredzama starpniekošana</string>
+  <string name="pref_trans_proxy_summary">Lietotņu automātiska torificēšana</string>
+  <string name="pref_transparent_all_title">Tor\'ēt visu</string>
+  <string name="pref_transparent_all_summary">Visu lietotņu starpnieku datplūsma caur Tor</string>
+  <string name="pref_transparent_port_fallback_title">Porta starpnieka atkāpnorāde</string>
+  <string name="pref_transparent_port_fallback_summary">BRĪDINĀJUMS: Apiet parastos portus (80., 443., u.tml.). *IZMANTOJIET VIENĪGI* ja nestrādā \'All\' vai \'App\' režīmi.</string>
+  <string name="pref_transparent_port_title">Portu saraksts</string>
+  <string name="pref_transparent_port_summary">Saraksts portiem uz starpnieku. *IZMANTOJIET VIENĪGI* ja nestrādā \'All\' vai \'App\' režīmi.</string>
+  <string name="pref_transparent_port_dialog">Ievadiet portus uz starpnieku</string>
+  <string name="pref_has_root">Pieprasīt piekļuves saknes tiesības</string>
+  <string name="pref_has_root_summary">Pieprasīt piekļuves saknes tiesības pārredzamai starniekošanai</string>
+  <string name="status_install_success">Sekmīgi instalētas Tor binārās datnes!</string>
+  <string name="status_install_fail">Nebija iespējams instalēt Tor binārās datnes. Lūdzu pārbaudiet žurnālu, un informējiet tor-assistants at torproject.org </string>
+  <string name="title_error">Lietojumprogrammas kļūda</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Par Orbot</string>
+  <string name="btn_next">Tālāk</string>
+  <string name="btn_back">Atpakaļ</string>
+  <string name="btn_finish">Beigt</string>
+  <string name="btn_okay">Labi</string>
+  <string name="btn_cancel">Atcelt</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Vairāk informācijas par Orbot</string>
+  <string name="wizard_details_msg">Orbot ir atvērta koda lietojumprogramma, kura ietver Tor, LibEvent un Polipo. Programma nodrošina vietēju HTTP starpniekseveri (8118) un SOCKS starpniekserveri (9050) uz Tor tīklu. Turklāt saknes tiesību līmenī strādājošā ierīcē, Orbot spēj pārsūtīt visu interneta datplūsmu caur Tor.</string>
+  <string name="wizard_permissions_root">Tiesības piešķirtas</string>
+  <string name="wizard_permissions_stock">Orbot tiesības</string>
+  <string name="wizard_premissions_msg_root">Ļoti labi! Mēs konstatējām, ka Orbot\'am ir iespējotas saknes tiesības. Mēs apdomīgi izmantosim šīs tiesības.</string>
+  <string name="wizard_permissions_msg_stock">Lai gan tas nav obligāti, Orbot kļūst par vēl ietekmīgāku rīku, ja Jūsu ierīcei ir saknes piekļuves tiesības. Izmantojiet zemāk atrodošos pogu, lai piešķirtu Orbot\'am īpašu spēku!  </string>
+  <string name="wizard_permissions_no_root">Ja Jums nav saknes piekļuves tiesību vai Jums nav nojausmas par ko te ir runa, pārliecinieties, ka izmantojat lietotnes, kuras paredzētas darbam ar Orbot.</string>
+  <string name="wizard_permissions_consent">Es saprotu un vēlos turpināt bez superlietotāja tiesībām.</string>
+  <string name="wizard_permission_enable_root">Piešķirt Orbot saknes tiesības</string>
+  <string name="wizard_configure">Konfigurēt torifikāciju</string>
+  <string name="wizard_configure_msg">Orbot sniedz iespēju maršrutēt visu lietojumu datplūsmu caur Tor\'u vai izvēlēties lietojumprogrammas tās norādot individuāli.</string>
+  <string name="wizard_configure_all">Visas lietotnes izmantot starpniecības režīmā caur Tor</string>
+  <string name="wizard_configure_select_apps">Izvēlēties individuālas lietotnes Tor\'am</string>
+  <string name="wizard_tips_tricks">Orbot-iespējotas lietotnes</string>
+  <string name="wizard_tips_msg">Zemāk norādītās lietotnes ir izveidotas darbam ar Orbot. Noklikšķiniet katru no pogām, lai instalētu tūliņ, vai varat tās uzmeklēt vēlāk Android Tirgū.</string>
+  <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="wizard_tips_twitter">Twitter atbalsta http starpnieku \"localhost:8118\"</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Sagatavojiet stāstu un, lai uzlabotu drošību, atstājiet to Tor!</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>
+  <string name="wizard_proxy_help_msg">Ja Jūsu lietotā Android lietotne spēj nodrošināt HTTP vai SOCKS starpniekserveri, tad varat to nokonfigurēt tā, lai tā savienotos ar Orbot un lietotu Tor. Viesotāja iestatījumi ir 127.0.0.1 vai „localhost”. HTTP porta iestatījums ir 8118. SOCKS starpniekserveris ir 9050. Pēc iespējas izmantojiet SOCKS4A vai SOCKS5. Uzziniet vairāk par starpniekošanu Android platformā un tīmekļa vietnē lasiet atbildes, kuras sagatavotas biežāk uzdotiem jautājumiem jeb FAQ: http://tinyurl.com/proxyandroid</string>
+  <string name="wizard_final">Orbot ir gatavs darbam!</string>
+  <string name="wizard_final_msg">Miljoniem ļaužu visā pasaulē lieto Tor dažādiem mērķiem. Žurnālisti un emuāru autori, cilvēktiesību aizstāvji, likumsargi, karavīri, korporācijas, apspiestībā dzīvojuši iedzīvotāji, un vienkārši parasti cilvēki ... un tagad arī Jūs esat tam gatavs!</string>
+  <string name="wizard_exit_at_first_screen_toast">Lūdzu nokonfigurējiet Orbot pirms sākat to lietot!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Šī darbība tīmekļa pārlūkā atvērs https://check.torproject.org , lai redzētu vai Orbot ir konfigurēts un esat izveidojies savienojumu ar Tor.</string>
+  <string name="pref_hs_group">Slēptu pakalpojumu viesošana</string>
+  <string name="pref_general_group">Vispārīgi</string>
+  <string name="pref_start_boot_title">Startēt Orbot, kad ielādējas</string>
+  <string name="pref_start_boot_summary">Automātiski startēt Orbot, un veidot savienojumu ar Tor, kad Jūsu Android ierīce ielādējas</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot ieved Tor Android\'u pasaulē! Tor palīdz aizsargāties pret satura filtrēšanu, datplūsmas analīzi un tīkla novērošanu, kuras apdraud privātumu, konfidenciālu informāciju un personiskās attiecības. Šis vednis palīdzēs Jūsu iekārtā nokonfigurēt Orbot\'u un Tor\'u.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Brīdinājums</string>
+  <string name="wizard_warning_msg">Pati Orbot instalēšana vēl nepadarīs anonīmu Jūsu mobilo datplūsmu.\n\nJums pareizi jānokonfigurē Orbot, sava ierīce un citas lietotnes, lai sekmīgi lietotu Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Tesības</string>
+  <string name="wizard_permissions_root_msg1">Pēc izvēles variet piešķirt Orbot\'am \'Superlietotāja\' piekļuves tiesības, lai iespēju lietpratīgus līdzekļus, tādus kā Transparent Proxying jeb Pārredzamā .</string>
+  <string name="wizard_permissions_root_msg2">Ja nevēlaties šo darīt, lūdzu, pārliecinieties, ka izmantojat lietotnes, kuras paredzētas darbam ar Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Šķiet, ka Jūsu ierīce nav saknēta vai arī nenodrošina saknes jeb superlietotāja piekļuvi.\n\nLūdzu pamēģiniet citādi - galvenajā ekrānā lietojiet režīmu „Lietotnes”.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Visas Guardian Project\'a lietotnes atrodamas Google Play\'ā</string>
+  <string name="wizard_tips_fdroid">Atrodiet visas Guardian Project lietotnes F-Droid\'ā</string>
+  <string name="wizard_tips_fdroid_org">Atrodiet visas Guardian Project lietotnes https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Pārredzama starpniekošana</string>
+  <string name="wizard_transproxy_msg">Šis ļauj Jūsu lietotnēm automātiski, bez jebkādas papildu konfigurācijas darboties caur Tor tīklu.</string>
+  <string name="wizard_transproxy_hint">(Atzīmējiet šo kastīti gadījumā ja Jums nav ne mazākās nojausmas par to, ko mēs te runājam)</string>
+  <string name="wizard_transproxy_none">Neviens</string>
+  <string name="pref_transparent_tethering_title">Tor valgošana</string>
+  <string name="pref_transparent_tethering_summary">Iespējot Tor Pārredzamo starpniekošanu Wifi\'m un USB valgošanas ierīcēm (nepieciešams pārstartēt)</string>
+  <string name="button_grant_superuser">Pieprasīt superlietotāja piekļuvi</string>
+  <string name="pref_select_apps">Izvēlēties lietotnes</string>
+  <string name="pref_select_apps_summary">Izvēlēties lietotnes, lai maršrutētu caur Tor</string>
+  <string name="pref_node_configuration">Mezglu konfigurācija</string>
+  <string name="pref_node_configuration_summary">Šie it lietpratīgie iestatījumi, kuri var samazināt Jūsu anonimitāti</string>
+  <string name="pref_entrance_node">Ieejas mezgli</string>
+  <string name="pref_entrance_node_summary">Ciparvirknes, segvārdi, valstis un adreses pirmajam lēkumam</string>
+  <string name="pref_entrance_node_dialog">Ievadiet ieejas mezglus</string>
+  <string name="button_proxy_all">Lietot starpniekserveri visam</string>
+  <string name="button_proxy_none">Nekam nelietot starpniekserveri</string>
+  <string name="button_invert_selection">Mainīt atlasi uz pretējo</string>
+  <string name="pref_proxy_title">Tīkla ārejošais starpnieks (neobligāts)</string>
+  <string name="pref_proxy_type_title">Ārvērstā starpnieka tips</string>
+  <string name="pref_proxy_type_summary">Starpnieka serverim izmantojamais protokols: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Ievadiet starpnieka tipu</string>
+  <string name="pref_proxy_host_title">Ārvērstā starpnieka viesotājs</string>
+  <string name="pref_proxy_host_summary">Starpniekservera mitinātājvārds</string>
+  <string name="pref_proxy_host_dialog">Ievadiet starpnieka viesotāju</string>
+  <string name="pref_proxy_port_title">Ārvērstā starpnieka ports</string>
+  <string name="pref_proxy_port_summary">Starpniekservera ports</string>
+  <string name="pref_proxy_port_dialog">Ievadiet starpnieka portu</string>
+  <string name="pref_proxy_username_title">Ārvērstā starpnieka lietotājvārds</string>
+  <string name="pref_proxy_username_summary">Starpnieka lietotājvārds (neobligāts)</string>
+  <string name="pref_proxy_username_dialog">Ievadīt starpnieka lietotājvardu</string>
+  <string name="pref_proxy_password_title">Ārvērstā starpnieka parole</string>
+  <string name="pref_proxy_password_summary">Starpnieka parole (neobligāti)</string>
+  <string name="pref_proxy_password_dialog">Ievadīt starpnieka paroli</string>
+  <string name="status">Statuss</string>
+  <string name="setting_up_full_transparent_proxying_">Iestata pilnībā pārredzamu starpniekošanu...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Iestata lietotņu nodrošinātu starpniekošanu...</string>
+  <string name="transparent_proxying_enabled">Pārredzama starpniekošana IESPĒJOTA</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy iespējots valgošanai!</string>
+  <string name="warning_error_starting_transparent_proxying_">BRĪDINĀJUMS: kļūda uzsākot pārredzamu starpniekošanu!</string>
+  <string name="transproxy_rules_cleared">TransProxy kārtulas notīrītas</string>
+  <string name="couldn_t_start_tor_process_">Neizdevās palaist Tor\'a procesu:</string>
+  <string name="privoxy_is_running_on_port_">Polipo strādā caur portu: </string>
+  <string name="setting_up_port_based_transparent_proxying_">Iestata portu nodrošinātu pārredzamu starpniekošanu...</string>
+  <string name="bridge_error">Tilta kļūda</string>
+  <string name="bridge_requires_ip">Lai izmantotu tilta līdzekli, jāievada vismaz viena tilta IP adrese.</string>
+  <string name="send_email_for_bridges">No Gmail konta sūtiet e-pastu uz bridges at torproject.org ar rindu \"get bridges\" e-pasta ziņojuma korpusā.</string>
+  <string name="error">Kļūda</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Jūsu ReachableAddresses iestatījumi izraisīja izņēmuma stāvokli!</string>
+  <string name="your_relay_settings_caused_an_exception_">Jūsu retranslatora iestatījumi izraisīja izņēmuma situāciju!</string>
+  <string name="exit_nodes">Izejas mezgli</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Pēdējā lēkuma ciparvirknes, segvārdi, valstis un adreses</string>
+  <string name="enter_exit_nodes">Ievadiet izejas mezglus</string>
+  <string name="exclude_nodes">Neiekļautie mezgli</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Izslēdzamās ciparvirknes, segvārdi, valstis un adreses</string>
+  <string name="enter_exclude_nodes">Ievadīt Neiekļaujamos mezglus</string>
+  <string name="strict_nodes">Precīzie mezgli</string>
+  <string name="use_only_these_specified_nodes">Izmantojiet *vienīgi* šos norādītos mezglus</string>
+  <string name="bridges">Tilti</string>
+  <string name="use_bridges">Lietot tiltus</string>
+  <string name="bridges_obfuscated">Nomaskētie tilti</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Iespējot alternatīvus tīkla Tor ieejas mezglus </string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Iespējot, ja konfigurētie tilti ir nomaskētie tilti</string>
+  <string name="ip_address_and_port_of_bridges">Tiltu ports un IP addrese</string>
+  <string name="enter_bridge_addresses">Ievadiet tiltu adreses</string>
+  <string name="relays">Retranslatori</string>
+  <string name="relaying">Retranslēšana</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Iespējot Jūsu iekārtu par bezapstājas retranslatoru</string>
+  <string name="relay_port">Retranslatora ports</string>
+  <string name="listening_port_for_your_tor_relay">Jūsu Tor retranslatora klausīšanās ports</string>
+  <string name="enter_or_port">Ievadiet OR portu</string>
+  <string name="relay_nickname">Retranslatora segvārds</string>
+  <string name="the_nickname_for_your_tor_relay">Jūsu Tor\'a retranslatora segvārds</string>
+  <string name="enter_a_custom_relay_nickname">Ievadiet brīvi izraudzītu rertranslatora segvārdu</string>
+  <string name="reachable_addresses">Sasniedzamās adreses</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Izpildīt kā klientprogrammu aiz ugunsmūra, kurš nodrošina ierobežojošu kārtību</string>
+  <string name="reachable_ports">Sasniedzamie porti</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Porti, kuri sasniedzami otrpus ierobežojoša ugunsmūra</string>
+  <string name="enter_ports">Ievadiet portus</string>
+  <string name="enable_hidden_services">Slēptu pakalpojumu viesošana</string>
+  <string name="run_servers_accessible_via_the_tor_network">ļaut no tīkla Tor piekļūt serverim, kurš ir ierīcē.  </string>
+  <string name="enter_localhost_ports_for_hidden_services">ievadiet slēpto pakalpojumu localhost portus</string>
+  <string name="hidden_service_ports">Slēptu pakalpojumu porti</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Jūsu slēptā pakalpojuma adresējams vārds (tiek ģenerēts automātiski)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">iespējot atkļūdošanas žurnālu izvadei (jālieto adb vai aLogCat , lai skatītu)</string>
+  <string name="project_home">Projekta mājas:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor licence</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Trešo personu programmatūra:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Lietotne vēlas atvērt slēptu servera portu %S uz tīklu Tor. Tas ir droši, ja uzticaties lietotnei.</string>
+  <string name="found_existing_tor_process">Atrada esošu Tor procesu...</string>
+  <string name="something_bad_happened">Nav labi. Pārbaudiet žurnālu</string>
+  <string name="hidden_service_on">Slēpts pakalpojums uz:</string>
+  <string name="unable_to_read_hidden_service_name">Nespēj lasīt slēpta pakalpojuma nosaukumu</string>
+  <string name="unable_to_start_tor">Nevar startēt Tor:</string>
+  <string name="unable_to_reset_tor">Nespēja atiestatīt Tor, sāknējiet ierīci atkārtoti!</string>
+  <string name="pref_use_sys_iptables_title">Izmantot noklusējuma Iptables</string>
+  <string name="pref_use_sys_iptables_summary">lietot iebūvēto bināro datni iptables nevis to, kura ir Orbot komplektācijā</string>
+  <string name="error_installing_binares">Tor binārās datnes nebija iespējams ne instalēt, ne jaunināt.</string>
+  <string name="pref_use_persistent_notifications">Vienmēr paturēt ikonu rīkjoslā, kad Orbot ir savienots</string>
+  <string name="pref_use_persistent_notifications_title">Vienmēr ieslēgtie paziņojumi</string>
+  <string name="pref_use_expanded_notifications">Rādīt paplašinātus paziņojumus, kur norādīts IP un Tor izejas valsts</string>
+  <string name="pref_use_expanded_notifications_title">Paplašināti paziņojumi</string>
+  <string name="notification_using_bridges">Tilti ir iespējoti!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Valoda</string>
+  <string name="set_locale_summary">Iestatiet Orbot lokalizāciju un valodu</string>
+  <string name="wizard_locale_title">Izvēlēties valodu</string>
+  <string name="wizard_locale_msg">Atstājiet noklusējuma vērtības, vai pārslēdziet pašreizējo valodu.</string>
+  <string name="powered_by">strādā ar Tor</string>
+  <string name="btn_save_settings">Saglabāt iestatījumus</string>
+  <string name="no_internet_connection_tor">Nav interneta savienojuma; Tor ir gaidstāvē...</string>
+  <string name="bandwidth_">Joslas platums:</string>
+  <string name="down">lejup</string>
+  <string name="up">augšup</string>
+  <string name="pref_disable_network_title">Neizmantot tīkla automātiskā miega režīmu</string>
+  <string name="pref_disable_network_summary">Kad nav interneta, pārslēgt Tor\'u uz miega režīmu</string>
+  <string name="newnym">Jūs pārslēdzāties uz jaunu Tor\'a identitāti!</string>
+  <string name="menu_use_chatsecure">Lietot ChatSecure</string>
+  <string name="permission_manage_tor_label">Pārvaldīt Tor\'u</string>
+  <string name="permission_manage_tor_description">Iespējot šo lietotni kontrolēt pakalpojumu Tor</string>
+  <string name="install_apps_">Vai instalēt lietotnes?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Nav tīkla savienojuma. Tor\'am iestata miega režīmu...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Labs tīkla savienojums. Aktivizē Tor\'u...</string>
+  <string name="updating_settings_in_tor_service">atjaunina Tor pakalpojuma iestatījumus </string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Ports, uz kura Tor piedāvā savu SOCKS starpniekserveri (noklusējumvērtība: 9050 vai 0 lai atspējotu)</string>
+  <string name="pref_socks_dialog">SOCKS Port Config</string>
+  <string name="pref_transport_title">Tor TransProxy Port</string>
+  <string name="pref_transport_summary">Ports, uz kura Tor piedāvā savu Transparent starpniekserveri (noklusējumvērtība: 9040 vai 0 lai atspējotu)</string>
+  <string name="pref_transport_dialog">TransProxy Port Config</string>
+  <string name="pref_dnsport_title">Tor DNS Ports</string>
+  <string name="pref_dnsport_summary">Ports, uz kura Tor piedāvā savu DNS (noklusējumvērtība: 5400 vai 0 lai atspējotu)</string>
+  <string name="pref_dnsport_dialog">DNS Port konfigurēšana</string>
+  <string name="pref_torrc_title">Torrc pielāgota konfigurēšana</string>
+  <string name="pref_torrc_summary">VIENĪGI EKSPERTIEM: tieši ievadīt torrc konfigurēšanas rindas</string>
+  <string name="pref_torrc_dialog">Pielāgot Torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus - Benetech\'a cilvēktiesību dokumentācijas lietotne</string>
+  <string name="your_tor_public_ips_">Jūsu Tor publiskās IP:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Lūdzu atspējojiet šo lietotni Android->Settings->Apps , ja rodas ar Orbot saistītas problēmas: </string>
+  <string name="app_conflict">Lietotņu konflikts</string>
+  <string name="pref_transproxy_refresh_title">Pārredzamā starpniekservera automātiska atsvaidzināšana</string>
+  <string name="pref_transproxy_refresh_summary">Kad mainās tīkla stāvoklis, atkārtoti lietot Pārredzamā starpniekserva kārtulas</string>
+  <string name="pref_transproxy_flush_title">Pārredzamā starpniekservera  PIESPIEDU NOŅEMŠANA</string>
+  <string name="pref_transproxy_flush_summary">Pieskarties te, lai TŪLĪT iztīrītu visas pārredzamā starpniekservera tīkla kārtulas</string>
+  <string name="transparent_proxy_rules_flushed_">Pārredzamā starpniekservera kārtulas ir iztīrītas!</string>
+  <string name="you_do_not_have_root_access_enabled">SAKNES piekļuve nav iespējota</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Lai iestatījumu maiņa tiktu iespējota, Jums var nākties apturēt un startēt Orbot.</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Tilti ir atjaunināti</string>
+  <string name="restart_orbot_to_use_this_bridge_">Lūdzu pārstartējiet Orbot, lai iespējotu izmaiņas</string>
+  <string name="menu_qr">QR kodi</string>
+  <string name="bridge_mode">Tiltu režīms</string>
+  <string name="get_bridges_email">E-pasts</string>
+  <string name="get_bridges_web">Tīmeklis</string>
+  <string name="activate">Aktivizēt</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Jūs varat iespējot visas savas ierīces lietotnes strādāt Tor tīklā, izmantojot Android VPN raksturiezīmi.\n\n*BRĪDINĀJUMS* Šī ir jauna, eksperimentāla raksturiezīme un dažos gadījumos tā var nesākt darbu automātiski, bet citos tā var pati pārtraukt darboties. To NEVAJAG izmantot anonimitātes nodrošināšanai, bet to var izmantot VIENĪGI lai strādātu caur ugunsmūriem un filtriem.</string>
+  <string name="send_email">Nosūtīt e-pastu</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Jūs varat saņemt tiltu adreses e-pastā, tīmeklī vai skenējot tiltu QR kodu. Zemāk atlasiet „E-pasts” vai „Tīmeklis”, lai pieprasītu tiltu adreses. Kad esat saņēmis adreses, tad tās iekopējiet un ielīmējiet Orbot iestatījumu preferencēs „Tilti” un pārstartējiet.</string>
+  <string name="standard_browser">Standarta pārlūks</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">PIEZĪME: Uz Intel X86/ATOM ierīcēm darbosies tikai standarta Tor tilti</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-mk/strings.xml b/orbotservice/src/main/res/values-mk/strings.xml
new file mode 100644
index 0000000..c5ca87f
--- /dev/null
+++ b/orbotservice/src/main/res/values-mk/strings.xml
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot е слободна прокси апликација која им овозможува на другите апликации да го користат интернетот побезбедно. Orbot користи Tor за шифрирање на интернет-сообраќајот, а потоа го сокрива и го доставува преку неколку компјутери во целиот свет. Tor е слободен софтвер и отворена мрежа која се справува со вид надзор на мрежата која штети на личната слобода и приватноста, доверливи деловни активности и односи, и државната безбедност позната како анализа на сообраќајот.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">стартувај и стопирај ја Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Орбот се стартува...</string>
+  <string name="status_activated">Поврзан на мрежата на Tor</string>
+  <string name="status_disabled">Орбот е деактивиран</string>
+  <string name="tor_process_starting">Стартување на клиентот на Tor...</string>
+  <string name="tor_process_complete">завршено.</string>
+  <string name="tor_process_waiting">чекање.</string>
+  <string name="not_anonymous_yet">ВНИМАНИЕ: Вашиот сообраќај сè уште не е анонимен! Потребно е да ги конфигурирате Вашите апликации за да го користат проксито за HTTP, 127.0.0.1:8118, или проксито за SOCKS4A или SOCKS5, 127.0.0.1:9050</string>
+  <string name="menu_home">Дома</string>
+  <string name="menu_browse">Прелистување</string>
+  <string name="menu_settings">Поставки</string>
+  <string name="menu_log">Дневник</string>
+  <string name="menu_info">Помош</string>
+  <string name="menu_start">Стартувај</string>
+  <string name="menu_stop">Стопирај</string>
+  <string name="menu_about">За</string>
+  <string name="main_layout_download">Преземи</string>
+  <string name="main_layout_upload">Прикачи</string>
+  <string name="button_help">Помош</string>
+  <string name="button_close">Затвори</string>
+  <string name="button_about">За</string>
+  <string name="button_clear_log">Избриши дневник</string>
+  <string name="menu_verify">Провери</string>
+  <string name="menu_exit">Излез</string>
+  <string name="menu_scan">Скенирај BridgeQR</string>
+  <string name="menu_share_bridge">Сподели BridgeQR</string>
+  <string name="press_to_start">- пристисни подолго за старт -</string>
+  <string name="pref_trans_proxy_group">Транспарентно проксирање (бара root пристап)</string>
+  <string name="pref_trans_proxy_title">Транспарентно проксирање</string>
+  <string name="pref_trans_proxy_summary">Автоматско торифицирање на апликациите</string>
+  <string name="pref_transparent_all_title">Целосно торифицирање</string>
+  <string name="pref_transparent_all_summary">Проксирај го сообраќајот на сите апликации преку Tor</string>
+  <string name="pref_transparent_port_fallback_title">Резервна порта за прокси</string>
+  <string name="pref_transparent_port_fallback_summary">ВНИМАНИЕ: Избегни ги често користените порти (80, 443, итн). *USE ONLY* ако режимите \'All\' или \'App\' не работат.</string>
+  <string name="pref_transparent_port_title">Листа на порти</string>
+  <string name="pref_transparent_port_summary">Листа на порти за прокси. *USE ONLY* ако режимите \'All\' или \'App\' не работат.</string>
+  <string name="pref_transparent_port_dialog">Внесете порти за прокси</string>
+  <string name="pref_has_root">Барање за пристап до root</string>
+  <string name="pref_has_root_summary">Барање за пристап до root за транспарентно проксирање</string>
+  <string name="status_install_success">Извршните програми за Tor се успешно инсталирани!</string>
+  <string name="status_install_fail">Извршните фајлови на Tor не можат да се инсталираат. Проверете во дневникот и известете нè на tor-assistants at torproject.org</string>
+  <string name="title_error">Апликациска грешка</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">За Орбот</string>
+  <string name="btn_next">Следно</string>
+  <string name="btn_back">Назад</string>
+  <string name="btn_finish">Крај</string>
+  <string name="btn_okay">Во ред</string>
+  <string name="btn_cancel">Откажи</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Неколку детали за Орбот</string>
+  <string name="wizard_details_msg">Orbot е апликација со отворен код која ги содржи Tor, LibEvent и Polipo. Обезбедува локален HTTP прокси (8118) и SOCKS прокси (9050) во мрежата на Tor. Orbot, исто така, има опција кај основниот уред да го испраќа целиот интернет-сообраќај преку Tor.</string>
+  <string name="wizard_permissions_root">Дозволата е издадена</string>
+  <string name="wizard_permissions_stock">Дозволи на Orbot</string>
+  <string name="wizard_premissions_msg_root">Одлично! Откривме дека овозможивте root пристап за Orbot. Внимателно ќе ја користиме оваа опција.</string>
+  <string name="wizard_permissions_msg_stock">Иако не е задолжително, Orbot може да стане помоќна алатка доколку вашиот уред има root пристап. Со копчето подолу Orbot може да добие супер-моќ.</string>
+  <string name="wizard_permissions_no_root">Ако немате root пристап или ако не разбирате за што зборуваме, осигурајте се дека користите апликации кои што работат со Orbot.</string>
+  <string name="wizard_permissions_consent">Разбирам и сакам да продолжам без администраторски привилегии</string>
+  <string name="wizard_permission_enable_root">Додели root за Orbot</string>
+  <string name="wizard_configure">Конфигурација на торифицирањето</string>
+  <string name="wizard_configure_msg">Orbot преку Tor овозможува да се рутира целиот сообраќај на сите апликации или на секоја апликација одделно.</string>
+  <string name="wizard_configure_all">Проксирај ги сите апликации преку Tor</string>
+  <string name="wizard_configure_select_apps">Избери посебни апликации за Tor</string>
+  <string name="wizard_tips_tricks">Апликации кои го поддржуваат Orbot</string>
+  <string name="wizard_tips_msg">Апликациите подолу се креирани да работат со Orbot. Притисни го секое копче за инсталација или може да се најдат на Google Play, на веб-локацијата GuardianProject.info  или преку F-Droid.org.</string>
+  <string name="wizard_tips_otrchat">ChatSecure - Безбедносен инстант клиент за разговор за Android</string>
+  <string name="wizard_tips_proxy">Поставки за прокси - Дознај како да се конфигурираат апликациите да работат со Orbot</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo апликација за пребарување</string>
+  <string name="wizard_tips_twitter">Подесете Twitter прокси на компјутерот \"localhost\" и порта 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Направи приказна и остави ја нејзината безбедност на Tor!</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_proxy_help_msg">Доколку Android апликацијата што се користи поддржува HTTP или SOCKS прокси, тогаш може да се конфигурира да се поврзе со Orbot и да користи Tor.\n\n\n Поставките за компјутерот се 127.0.0.1 или \"localhost\". За HTTP подесувањата на порта се 8118. За SOCKS проксито е 9050. Доколку е возможно треба да се користи SOCKS4A или SOCKS5.\n \n\n\n Може да дознаете повеќе за проксирање на Android преку ЧПП на: http://tinyurl.com/proxyandroid\n </string>
+  <string name="wizard_final">Orbot е спремен!</string>
+  <string name="wizard_final_msg">Милиони луѓе низ целиот свет го користат Tor за различни причини.\n\nНовинари и блогери, борци за човекови права, адвокати, војници, корпорации, граѓаните на репресивните режими и обичните граѓани ... а од сега и вие!</string>
+  <string name="wizard_exit_at_first_screen_toast">Ве молиме конфигурирајте го Орбот пред да започнете да го користите!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Ова ќе ја отвори страницата https://check.torproject.org во Вашиот веб-прелистувач за да видете дали Orbot е правилно конфигуриран и дали сте поврзани на Тор.</string>
+  <string name="pref_hs_group">Скриени сервиси за хостирање</string>
+  <string name="pref_general_group">Општо</string>
+  <string name="pref_start_boot_title">Стартувај го Orbot за бутирање</string>
+  <string name="pref_start_boot_summary">Автоматски стартувај го Orbot и поврзи го Tor кога твојот Android уред се стартува</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot го овозможува Tor за Android!\n\nTor помага против филтрирање на содржината, анализа на сообраќајот и надзор на мрежата кои штетат на приватноста, доверливи инфомации и лични односи.\n\nОвој волшебник помага за конфигурација на Orbot и Tor на вашиот уред.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Внимание</string>
+  <string name="wizard_warning_msg">Само инсталирање на Orbot нема автоматски да го анонимизира вашиот мобилен сообраќај.\n\nМорате правилно да ги конфигурирате Orbot, вашиот уредот и други апликации, за да успешно го користите Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Дозволи</string>
+  <string name="wizard_permissions_root_msg1">Опционално може да се добие администраторски пристап за Orbot кој овозможува напредни функции, како што е транспарентно проксирање.</string>
+  <string name="wizard_permissions_root_msg2">Доколку не сакате да го направите ова, осигурајте се дека вашите апликации работат со Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Вашиот уред не е основен или не дозволува пристап до основен уред или администраторски пристап.\n\nПробајте го режимот \'Апликации\' на главниот екран.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Апликации кои го поддржуваат Orbot</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: Безбедносна апликација за разговор со енкрипција \'Off-the-Record\' </string>
+  <string name="wizard_tips_play">Најди ги сите Guardian Project апликации на Google Play</string>
+  <string name="wizard_tips_fdroid">Најди ги сите Guardian Project апликации на F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Најди ги сите Guardian Project апликации на https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Транспарентно проксирање</string>
+  <string name="wizard_transproxy_msg">Ова овозможува вашите апликации автоматски да се стартуваат преку мрежата Tor без конфигурација.</string>
+  <string name="wizard_transproxy_hint">(Селектирајте го ова поле ако не разбирате за што зборуваме)</string>
+  <string name="wizard_transproxy_none">Ништо</string>
+  <string name="pref_transparent_tethering_title">Tor поврзување</string>
+  <string name="pref_transparent_tethering_summary">Овозможи транспарентно проксирање на Tor за уреди поврзани преку Wifi и USB  (бара рестартирање)</string>
+  <string name="button_grant_superuser">Барање за пристап до администратор на системот</string>
+  <string name="pref_select_apps">Изберете апликации</string>
+  <string name="pref_select_apps_summary">Одбери апликации кои ќе се поврзуваат преку Тор</string>
+  <string name="pref_node_configuration">Конфигурација на јазол</string>
+  <string name="pref_node_configuration_summary">Ова се напредните поставувања кои можат да ја намалат вашата анонимност</string>
+  <string name="pref_entrance_node">Влезни јазли</string>
+  <string name="pref_entrance_node_summary">Отпечатоци од прсти, прекари, земји и адреси за првиот скок.</string>
+  <string name="pref_entrance_node_dialog">Внесете влезни јазли</string>
+  <string name="button_proxy_all">Се за проксирање</string>
+  <string name="button_proxy_none">Ништо за проксирање</string>
+  <string name="button_invert_selection">Преврти го изборот</string>
+  <string name="pref_proxy_title">Излезен прокси на мрежата (незадолжително)</string>
+  <string name="pref_proxy_type_title">Тип на излезен прокси</string>
+  <string name="pref_proxy_type_summary">Протокол за користење на прокси-сервер: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Внесете го типот на проски</string>
+  <string name="pref_proxy_host_title">Излезен домаќин на прокси</string>
+  <string name="pref_proxy_host_summary">Име на домаќин на серверот на прокси</string>
+  <string name="pref_proxy_host_dialog">Внесете домаќин на прокси</string>
+  <string name="pref_proxy_port_title">Излезна порта на прокси</string>
+  <string name="pref_proxy_port_summary">Порта на серверот на прокси</string>
+  <string name="pref_proxy_port_dialog">Внесете порта на прокси</string>
+  <string name="pref_proxy_username_title">Kорисничко име на излезен прокси</string>
+  <string name="pref_proxy_username_summary">Корисничко име на прокси (незадолжително)</string>
+  <string name="pref_proxy_username_dialog">Внесете корисничко име на прокси</string>
+  <string name="pref_proxy_password_title">Лозинка на излезен прокси</string>
+  <string name="pref_proxy_password_summary">Лозинка на прокси (незадолжително)</string>
+  <string name="pref_proxy_password_dialog">Внесете лозинка на прокси</string>
+  <string name="status">Статус</string>
+  <string name="setting_up_full_transparent_proxying_">Поставување на целосно транспарентно проксирање...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Поставување транспарентно проксирање базирано на апликација...</string>
+  <string name="transparent_proxying_enabled">Tранспарентното проксирање е ОВОЗМОЖЕНО</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy е овозможен за поврзување!</string>
+  <string name="warning_error_starting_transparent_proxying_">ВНИМАНИЕ: Грешка при стартување на транспарентно проксирање!</string>
+  <string name="transproxy_rules_cleared">Избришани правила за TransProxy </string>
+  <string name="couldn_t_start_tor_process_">Не може да се започне Tor-процесот:</string>
+  <string name="privoxy_is_running_on_port_">Polipo работи на порта: </string>
+  <string name="setting_up_port_based_transparent_proxying_">Поставување на транспарентно проксирање базирано на порта...</string>
+  <string name="bridge_error">Грешка во мостот</string>
+  <string name="bridge_requires_ip">За да ја користите функцијата на мостот, морате да внесете барем една ИП-адреса на мост.</string>
+  <string name="send_email_for_bridges">Испратете е-пошта од вашата gmail сметка на bridges at torproject.org со содржина \"get bridges\".</string>
+  <string name="error">Грешка</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Вашите поставки за достапните адреси предизвикаа грешка!</string>
+  <string name="your_relay_settings_caused_an_exception_">Вашите поставки за реле предизвикаа грешка!</string>
+  <string name="exit_nodes">Излезни јазли</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Отпечатоци од прсти, прекари, земји и адреси за последниот скок.</string>
+  <string name="enter_exit_nodes">Внесете излезни јазли</string>
+  <string name="exclude_nodes">Исклучи јазли</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Отпечатоци од прсти, прекари, земји и адреси кои треба да се исклучат</string>
+  <string name="enter_exclude_nodes">Внесете ги јазлите кои треба да се исклучат</string>
+  <string name="strict_nodes">Задолжителни јазли</string>
+  <string name="use_only_these_specified_nodes">Користете ги *само* овие наведени јазли</string>
+  <string name="bridges">Мостови</string>
+  <string name="use_bridges">Користи мостови</string>
+  <string name="bridges_obfuscated">Скриени мостови</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Овозможи алтернативни влезни јазли во мрежата Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Овозможи, ако мостовите се скриени мостови</string>
+  <string name="ip_address_and_port_of_bridges">ИП-адреса и порта на мостовите</string>
+  <string name="enter_bridge_addresses">Внесете адреси на мостовите</string>
+  <string name="relays">Релеа</string>
+  <string name="relaying">Пренесување</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Овозможи го уредот да биде реле без излез </string>
+  <string name="relay_port">Порта на реле</string>
+  <string name="listening_port_for_your_tor_relay">Порта за слушање на вашиот реле на Tor</string>
+  <string name="enter_or_port">Внесете OR порта</string>
+  <string name="relay_nickname">Назив на релето</string>
+  <string name="the_nickname_for_your_tor_relay">Назив на вашето реле за Tor</string>
+  <string name="enter_a_custom_relay_nickname">Внесете произволно име за релето</string>
+  <string name="reachable_addresses">Достапни адреси</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Стартувајте го како клиент зад безбедносен ѕид со ограничени полиси</string>
+  <string name="reachable_ports">Достапни порти</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Порти достапни зад рестрективен заштитен ѕид(firewall)</string>
+  <string name="enter_ports">Внесете порти</string>
+  <string name="enable_hidden_services">Скриени сервиси за хостирање</string>
+  <string name="run_servers_accessible_via_the_tor_network"> Овозможи on-device серверот да се пристапи преку мрежата на Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">Внеси ги портите за localhost за скриени сервиси </string>
+  <string name="hidden_service_ports">Порти на скриени сервиси</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Достапно име за вашиот скриен сервис (се генерира автоматски)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Активирај го дневникот за отстранување грешки за излез (за да се прикаже мора да се користи adb или aLogCat)</string>
+  <string name="project_home">Почетна страница:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Лиценца за Tor </string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Софтвер од друг производител:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Апликација сака да отвори скриена порта на серверот %S на мрежата на Tor. Ова е безбедно, ако и\' веруваш на апликацијата.</string>
+  <string name="found_existing_tor_process">Пронајден постоечки Tor-процес ...</string>
+  <string name="something_bad_happened">Настана грешка. Проверете во дневникот</string>
+  <string name="hidden_service_on">Вклучен е скриениот сервис:</string>
+  <string name="unable_to_read_hidden_service_name">не може да се прочита името на скриениот сервис</string>
+  <string name="unable_to_start_tor">Tor не може да се стартува:</string>
+  <string name="unable_to_reset_tor">Рестартирајте го вашиот уред, Tor не може да се ресетира! </string>
+  <string name="pref_use_sys_iptables_title">Користи стандарден Iptables</string>
+  <string name="pref_use_sys_iptables_summary">Користи ги вградените бинарни ИП табели наместо таа што оди со Orbot</string>
+  <string name="error_installing_binares">Извршните датотеки на Tor не можат да се инсталираат или надградат</string>
+  <string name="pref_use_persistent_notifications">Секогаш чувајте ja иконата во лентата со алатки кога Orbot е поврзан</string>
+  <string name="pref_use_persistent_notifications_title">Известувања секогаш вклучени</string>
+  <string name="pref_use_expanded_notifications">Прикажи проширено известување со излезната земја и ИП на Tor</string>
+  <string name="pref_use_expanded_notifications_title">Прошири известувања</string>
+  <string name="notification_using_bridges">Вклучени мостови!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Јазик</string>
+  <string name="set_locale_summary">Избери локални поставки и јазик за Orbot</string>
+  <string name="wizard_locale_title">Избери јазик</string>
+  <string name="wizard_locale_msg">Остави го стандардниот или промени го постоечкиот јазик</string>
+  <string name="powered_by">Овозможено од Tor</string>
+  <string name="btn_save_settings">Сочувај поставки</string>
+  <string name="no_internet_connection_tor">Нема интернет-врска; Tor е во мирување...</string>
+  <string name="bandwidth_">Проток:</string>
+  <string name="down">долу</string>
+  <string name="up">горе</string>
+  <string name="pref_disable_network_title">Нема Auto-Sleep на мрежата</string>
+  <string name="pref_disable_network_summary">Стави го Тор на sleep кога интернетот не е достапен</string>
+  <string name="newnym">Се префрливте на нов идентитет на Tor!</string>
+  <string name="menu_use_chatsecure">Користи ChatSecure</string>
+  <string name="permission_manage_tor_label">Управувај со Tor</string>
+  <string name="permission_manage_tor_description">Дозволи оваа апликација да го управува со сервисот на Tor</string>
+  <string name="install_apps_">Инсталирај апликации?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Нема мрежно поврзување. Ставете го Тор на режимот на спиење...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Мрежното поврзување е добро. Го буди Tor...</string>
+  <string name="updating_settings_in_tor_service">ажурирање на поставките во сервисот Tor </string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Порта на која Тор и\' го нуди својот SOCKS-прокси (стандардно: 9050 или 0 за да се исклучи)</string>
+  <string name="pref_socks_dialog">Kонфигурирање на портата за SOCKS</string>
+  <string name="pref_transport_title">Tor TransProxy порта</string>
+  <string name="pref_transport_summary">Порта на која Tor и го нуди својот транспарентен прокси (стандардно: 9040 или 0 за да се исклучи)</string>
+  <string name="pref_transport_dialog">Kонфигурирање на портата за TransProxy</string>
+  <string name="pref_dnsport_title">DNS-порта за Tor </string>
+  <string name="pref_dnsport_summary">Порта на која Tor го нуди DNS (стандардно: 5400 или 0 за да се исклучи)</string>
+  <string name="pref_dnsport_dialog">конфигурирање на DNS-портата </string>
+  <string name="pref_torrc_title">Произволно конфигурирање на torrc</string>
+  <string name="pref_torrc_summary">САМО ЗА ЕКСПЕРТИ: внесете директни команди за конфигурирање на torrc</string>
+  <string name="pref_torrc_dialog">Произволен torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus - Benetech апликација за документирање на човековите права</string>
+  <string name="your_tor_public_ips_">Вашата јавна ИП за Tor</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Ве молиме исклучете ја оваа апликација во Android->Settings->Apps ако имате проблем со Orbot:</string>
+  <string name="app_conflict">Конфликт со апликацијата</string>
+  <string name="pref_transproxy_refresh_title">Автоматско освежување на Transproxy </string>
+  <string name="pref_transproxy_refresh_summary">Примени ги повторно правилата за TransProxy кога се менува состојбата на мрежата</string>
+  <string name="pref_transproxy_flush_title">ПРИСИЛНО ОТСТРАНУВАЊЕ на Transproxy </string>
+  <string name="pref_transproxy_flush_summary">Допрете овде за да се избришат сите transproxy правила на мрежата СЕГА </string>
+  <string name="transparent_proxy_rules_flushed_">Избришани транспарентни прокси правила</string>
+  <string name="you_do_not_have_root_access_enabled">Немате вклучено пристап до корен</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Може би ќе треба да се стопира и стартува Orbot за да бидат овозможени промените во поставките.</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Ажурирани мостови</string>
+  <string name="restart_orbot_to_use_this_bridge_">Ве молиме рестартирајте го Orbot за да се овозможат промените</string>
+  <string name="menu_qr">QR-кодови</string>
+  <string name="bridge_mode">Режим на работа на мостот</string>
+  <string name="get_bridges_email">Е-пошта</string>
+  <string name="get_bridges_web">Веб</string>
+  <string name="activate">Активирај</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Можете да ги овозможите сите апликации на вашиот уред да работат низ мрежата Tor користејќи VPN-функција на Андроид.\n\n*ВНИМАНИЕ* нова, експериментална функција и во некои случаи нема да стартува автоматски, или може да се стопира. Не треба да се користи за анонимност, и САМО да се користи за минување низ заштитни ѕидови и филтри.</string>
+  <string name="send_email">Испрати е-пошта</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Aдреса на мостови можете да добивате преку е-пошта, веб или со скенирање на QR код. Изберете подолу \'Е-пошта\' или \'Web\', за да побарате адреса за мостот. \n\nОткако ќе ја добиете адресата, копирајте го & и залепете го во делот \"Мостови\" во подесувањето на Orbot и рестартирајте.</string>
+  <string name="standard_browser">Стандарден прелистувач</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">ЗАБЕЛЕШКА: Само стандардните мостови на Tor функционираат на уредите Intel X86/ATOM</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-ml/strings.xml b/orbotservice/src/main/res/values-ml/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/orbotservice/src/main/res/values-ml/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-mn/strings.xml b/orbotservice/src/main/res/values-mn/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/orbotservice/src/main/res/values-mn/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-mr-rIN/strings.xml b/orbotservice/src/main/res/values-mr-rIN/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/orbotservice/src/main/res/values-mr-rIN/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-ms-rMY/strings.xml b/orbotservice/src/main/res/values-ms-rMY/strings.xml
new file mode 100644
index 0000000..e281414
--- /dev/null
+++ b/orbotservice/src/main/res/values-ms-rMY/strings.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">mula dan henti Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot telah dimulakan..</string>
+  <string name="status_activated">Bersambung ke rangkaian Tor</string>
+  <string name="status_disabled">\"Orbot telah dinyah-aktifkan</string>
+  <string name="tor_process_starting">Memulakan klien Tor..</string>
+  <string name="tor_process_complete">selesai.</string>
+  <string name="tor_process_waiting">menunggu.</string>
+  <string name="not_anonymous_yet">AMARAN: Trafik anda tidak anonymous lagi! Sila tetapkan aplikasi anda untuk menggunakan proxy HTTP 127.0.0.1:8118 atau proxy SOCKS4A atau SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Rumah</string>
+  <string name="menu_browse">Carian</string>
+  <string name="menu_settings">Tetapan</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Bantuan</string>
+  <string name="menu_start">Mula</string>
+  <string name="menu_stop">Henti</string>
+  <string name="menu_about">Tentang</string>
+  <string name="main_layout_download">Muat turun</string>
+  <string name="main_layout_upload">Muat naik</string>
+  <string name="button_help">Bantuan</string>
+  <string name="button_close">Tutup</string>
+  <string name="button_about">Tentang</string>
+  <string name="button_clear_log">Padam Log</string>
+  <string name="menu_verify">Semak</string>
+  <string name="menu_exit">Keluar</string>
+  <string name="press_to_start">- Tekan lama untuk mulakan - </string>
+  <string name="pref_trans_proxy_group">Proxy Telus (Memerlukan akses Root)</string>
+  <string name="pref_trans_proxy_title">Proxy Telus</string>
+  <string name="pref_trans_proxy_summary">Tetapan Automatik Tor pada Apps</string>
+  <string name="pref_transparent_all_title">Tor segalanya</string>
+  <string name="pref_transparent_all_summary">Trafik proxy untuk semua aplikasi yang melalui Tor</string>
+  <string name="pref_transparent_port_fallback_title">Port proxy undur</string>
+  <string name="pref_transparent_port_fallback_summary">AMARAN: memintasi port biasa (80, 443, dll). * CUMA GUNA * jika mod \'Semua\' atau \'App\' idak berfungsi.</string>
+  <string name="pref_transparent_port_title">Senarai Port</string>
+  <string name="pref_transparent_port_summary">Senarai port untuk proxy. *GUNA HANYA* jika mod \'Semua\' atau \'App\' tidak berfungsi</string>
+  <string name="pref_transparent_port_dialog">Masukkan port untuk proxy</string>
+  <string name="pref_has_root">Minta Akses Root</string>
+  <string name="pref_has_root_summary">Minta akses root untuk proxy telus</string>
+  <string name="status_install_success">Tor berjaya dipasang!</string>
+  <string name="status_install_fail">Fail Tor gagal dipasang. Sila semak log dan maklumkan kepada tor-assistants at torproject.org</string>
+  <string name="title_error">Ralat Aplikasi</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Tentang Orbot</string>
+  <string name="btn_next">Seterusnya</string>
+  <string name="btn_back">Kembali</string>
+  <string name="btn_finish">Tamat</string>
+  <string name="btn_okay">Okay</string>
+  <string name="btn_cancel">Batal</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Maklumat Orbot</string>
+  <string name="wizard_permissions_root">Kebenaran disahkan</string>
+  <string name="wizard_permissions_stock">Kebenaran Orbot</string>
+  <string name="wizard_premissions_msg_root">Bagus! Kami mendapati anda ada akses root yang dibenarkan untuk Orbot. Kami akan gunakan kuasa ini dengan bijak.</string>
+  <string name="wizard_permissions_msg_stock">Walaupun ia tidak diperlukan, Orbot boleh menjadi alat yang berguna jika peranti anda mempunyai akses root. Guna butang di bawah untuk memberi Orbot superpower!</string>
+  <string name="wizard_permissions_no_root">Jika anda tidak mempunyai akses root atau tidak tahu mengenai ini, cuma pastikan anda menggunakan aplikasi yang boleh digunakan dengan Orbot.</string>
+  <string name="wizard_permissions_consent">Saya faham dan mahu teruskan tanpa Superuser</string>
+  <string name="wizard_permission_enable_root">Beri akses Root pada Orbot</string>
+  <string name="wizard_configure">Konfigurasi Torification</string>
+  <string name="wizard_configure_msg">Orbot memberi anda pilihan untuk menghala semua trafik aplikasi melalui Tor ATAU untuk memilih aplikasi untuk digunakan secara individual.</string>
+  <string name="wizard_configure_all">Proxy Semua Aplikasi Melalui Tor</string>
+  <string name="wizard_configure_select_apps">Pilih Aplikasi Untuk Tor</string>
+  <string name="wizard_tips_tricks">Aplikasi Yang Dibenar Menggunakan Orbot</string>
+  <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="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>
+  <string name="wizard_final">Orbot sudah sedia!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Ini akan membuka pelayar web anda untuk https://check.torproject.org untuk melihat jika Orbot mungkin ditetapkan dan anda disambungkan kepada Tor.</string>
+  <string name="pref_hs_group">Perkhidmatan tersembunyi</string>
+  <string name="pref_general_group">Umum</string>
+  <string name="pref_start_boot_title">Mulakan Orbot semasa Boot</string>
+  <string name="pref_start_boot_summary">Mula Orbot secara automatik dan sambung Tor ketika peranti Android boot</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Amaran</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">kebenaran</string>
+  <string name="wizard_permissions_root_msg1">Anda juga boleh memberikan akses Orbot \'SuperUser\' untuk membolehkan ciri-ciri yang maju, seperti Proxying Telus.</string>
+  <string name="wizard_permissions_root_msg2">Jika anda tidak mahu berbuat demikian, sila pastikan untuk menggunakan aplikasi yang dibuat untuk bekerjasama dengan Orbot</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Aplikasi yang membenarkan Orbot</string>
+  <string name="wizard_tips_play">Cari semua projek Guardian di Google play</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxy Telus</string>
+  <string name="wizard_transproxy_msg">Ini membolehkan aplikasi anda secara automatik melalui rangkaian Tor tanpa apa apa konfigurasi</string>
+  <string name="wizard_transproxy_hint">(Tanda kotak ini jika anda belen)</string>
+  <string name="wizard_transproxy_none">Tiada</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Membolehkan Proxying Telus Tor untuk Wifi dan USB Devices terikat (memerlukan restart)</string>
+  <string name="button_grant_superuser">Minta Akses Superuser</string>
+  <string name="pref_select_apps">Pilih Aplikasi</string>
+  <string name="pref_select_apps_summary">Pilih Aplikasi untuk dihalakan melalui Tor</string>
+  <string name="pref_node_configuration">Konfigurasi Nod</string>
+  <string name="pref_node_configuration_summary">Ini ialah tetapan lanjutan yang boleh mengurangkan kadar anonymity anda</string>
+  <string name="pref_entrance_node">Nod Kemasukan</string>
+  <string name="pref_entrance_node_summary">Cap jari, nama samaran, negara, dan alamat untuk lompatan pertama</string>
+  <string name="pref_entrance_node_dialog">Masukkan Nod Kemasukan</string>
+  <string name="pref_proxy_title">Laluan keluar jaringan proxy (tambahan)</string>
+  <string name="pref_proxy_type_title">Jenis Proxy</string>
+  <string name="pref_proxy_type_summary">Protokol untuk digunakan pada pelayan proxy: HTTP,HTTPS,Socks4,Socks5</string>
+  <string name="pref_proxy_type_dialog">Masukkan Jenis Proxy</string>
+  <string name="pref_proxy_host_title">Hos Proxy</string>
+  <string name="pref_proxy_host_summary">Nama hos pelayan proxy</string>
+  <string name="pref_proxy_host_dialog">Masukkan Hos Proxy</string>
+  <string name="pref_proxy_port_title">Port Proxy</string>
+  <string name="pref_proxy_port_summary">Port pelayan proxy</string>
+  <string name="pref_proxy_port_dialog">Masukkan port Proxy</string>
+  <string name="pref_proxy_username_title">Laluan keluar kata nama proxy</string>
+  <string name="pref_proxy_username_summary">Kata nama proxy (tambahan)</string>
+  <string name="pref_proxy_username_dialog">Masukkan kata nama proxy</string>
+  <string name="pref_proxy_password_title">Laluan keluar kata laluan proxy</string>
+  <string name="pref_proxy_password_summary">Kata laluan proxy (tambahan)</string>
+  <string name="pref_proxy_password_dialog">Masukkan kata laluan proxy</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Tetapkan proxy telus secara keseluruhan</string>
+  <string name="setting_up_app_based_transparent_proxying_">Tetapkan proxy telus berdasarkan aplikasi</string>
+  <string name="transparent_proxying_enabled">Proxy telus dibolehkan</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy dibolehkan untuk Tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">AMARAN: ralat semasa memulakan proxy telus!</string>
+  <string name="transproxy_rules_cleared">Peraturan TransProxy dipadam</string>
+  <string name="couldn_t_start_tor_process_">Tidak boleh memulakan proses Tor:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Menetap proxy telus berdasarkan port..</string>
+  <string name="bridge_error">Ralat jambatan</string>
+  <string name="bridge_requires_ip">Untuk menggunakan ciri jambatan, anda mesti masukkan sekurang-kurangnya satu alamat IP jambatan.</string>
+  <string name="send_email_for_bridges">Hantar e-mel kepada bridges at torproject.org dengan garisan \"jambatan\" dengan sendirinya dalam badan mel dari akaun gmail.</string>
+  <string name="error">Ralat</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Tetapan ReachableAddresses anda menyebabkan pengecualian!</string>
+  <string name="your_relay_settings_caused_an_exception_">Tetapan relay anda menyebabkan pengecualian!</string>
+  <string name="exit_nodes">Keluar Nod</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Cap jari, nama samaran, negara, dan alamat untuk lompatan terakhir</string>
+  <string name="enter_exit_nodes">Masukkan Nod Keluar</string>
+  <string name="exclude_nodes">Keluarkan Nod</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Cap jari, nama samaran, negara dan alamat untuk dikeluarkan</string>
+  <string name="enter_exclude_nodes">Masukkan Nod Keluar</string>
+  <string name="strict_nodes">Nod Ketat</string>
+  <string name="use_only_these_specified_nodes">Guna *hanya* nod-nod ini</string>
+  <string name="bridges">Jambatan</string>
+  <string name="use_bridges">Guna Jambatan</string>
+  <string name="bridges_obfuscated">Jambatan Keliru</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Membolehkan nod pintu masuk ganti ke Rangkaian Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Benarkan jika konfigurasi jambatan adalah jambatan keliru</string>
+  <string name="ip_address_and_port_of_bridges">Alamat IP dan pelabuhan jambatan</string>
+  <string name="enter_bridge_addresses">Masukkan Alamat Jambatan</string>
+  <string name="relays">Relays</string>
+  <string name="relaying">Relaying</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Membolehkan peranti anda untuk menjadi geganti bukan keluar</string>
+  <string name="relay_port">Relay Port</string>
+  <string name="listening_port_for_your_tor_relay">Mendapatkan port untuk tetapan relay Tor anda</string>
+  <string name="enter_or_port">Masukkan port OR</string>
+  <string name="relay_nickname">Nama samaran relay</string>
+  <string name="the_nickname_for_your_tor_relay">Nama samaran ini untuk relay Tor anda</string>
+  <string name="enter_a_custom_relay_nickname">Masukkan nama samaran gantian untuk relay</string>
+  <string name="reachable_addresses">Alamat yang dapat dicapai</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Jalan sebagai klien dibelakang firewall dengan peraturan ketat</string>
+  <string name="reachable_ports">Port yang dapat dicapai</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Port yang dapat dicapai dibelakang firewall dengan kawalan ketat</string>
+  <string name="enter_ports">Masukkan port</string>
+  <string name="enable_hidden_services">Benarkan Servis Tersembunyi</string>
+  <string name="run_servers_accessible_via_the_tor_network">Jalankan pelayan boleh diakses melalui rangkaian Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">Masuk port localhost untuk servis tersembunyi</string>
+  <string name="hidden_service_ports">Port servis tersembunyi</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Nama beralamat untuk servis tersembunyi anda (dijana secara automatik)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">benarkan log debug pada output (mesti guna adb atau aLogCat untuk lihat)</string>
+  <string name="project_home">Rumah Projek(s):</string>
+  <string name="the_tor_license">Lesen Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3rd-Party-Software: </string>
+  <string name="hidden_service_request">Satu aplikasi mahu membuka port tersembunyi %S pada rangkaian Tor. Ia selamat jika anda percaya pada aplikasi itu.</string>
+  <string name="found_existing_tor_process">Proses Tor sedia ada ditemui..</string>
+  <string name="something_bad_happened">Sesuatu yang buruk berlaku. Semak log.</string>
+  <string name="hidden_service_on">port tersembunyi pada:</string>
+  <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
+  <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
+  <string name="pref_use_sys_iptables_title">Guna default Iptables</string>
+  <string name="pref_use_sys_iptables_summary">Guna binari built-in iptables daripada yang didatangkan bundle dengan Orbot</string>
+  <string name="error_installing_binares">Tor binari tidak boleh dipasang atau dinaiktaraf</string>
+  <string name="pref_use_persistent_notifications">Sentiasa biar ikon pada toolbar apabila Orbot bersambung</string>
+  <string name="pref_use_persistent_notifications_title">Sentiasa On Notifikasi</string>
+  <string name="notification_using_bridges">Jambatan dibenarkan!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Pilihan tempatan dan bahasa untuk Orbot</string>
+  <string name="wizard_locale_title">Pilih Bahasa</string>
+  <string name="wizard_locale_msg">Biar default atau ubah ke bahasa sekarang</string>
+  <string name="btn_save_settings">Simpan Tetapan</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-ms/strings.xml b/orbotservice/src/main/res/values-ms/strings.xml
new file mode 100644
index 0000000..c327e57
--- /dev/null
+++ b/orbotservice/src/main/res/values-ms/strings.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">mula dan henti Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot telah dimulakan..</string>
+  <string name="status_activated">Bersambung ke rangkaian Tor</string>
+  <string name="status_disabled">\"Orbot telah dinyah-aktifkan</string>
+  <string name="status_shutting_down">Orbot sedang ditutup</string>
+  <string name="tor_process_starting">Memulakan klien Tor..</string>
+  <string name="tor_process_complete">selesai.</string>
+  <string name="tor_process_waiting">menunggu.</string>
+  <string name="not_anonymous_yet">AMARAN: Trafik anda tidak anonymous lagi! Sila tetapkan aplikasi anda untuk menggunakan proxy HTTP 127.0.0.1:8118 atau proxy SOCKS4A atau SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Rumah</string>
+  <string name="menu_browse">Carian</string>
+  <string name="menu_settings">Tetapan</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Bantuan</string>
+  <string name="menu_apps">Apps</string>
+  <string name="menu_start">Mula</string>
+  <string name="menu_stop">Henti</string>
+  <string name="menu_about">Tentang</string>
+  <string name="button_help">Bantuan</string>
+  <string name="button_close">Tutup</string>
+  <string name="button_about">Tentang</string>
+  <string name="button_clear_log">Padam Log</string>
+  <string name="menu_verify">Semak</string>
+  <string name="menu_exit">Keluar</string>
+  <string name="press_to_start">- Tekan lama untuk mulakan - </string>
+  <string name="pref_trans_proxy_group">Proxy Telus (Memerlukan akses Root)</string>
+  <string name="pref_trans_proxy_title">Proxy Telus</string>
+  <string name="pref_trans_proxy_summary">Tetapan Automatik Tor pada Apps</string>
+  <string name="pref_transparent_all_title">Tor segalanya</string>
+  <string name="pref_transparent_all_summary">Trafik proxy untuk semua aplikasi yang melalui Tor</string>
+  <string name="pref_transparent_port_fallback_title">Port proxy undur</string>
+  <string name="pref_transparent_port_fallback_summary">AMARAN: memintasi port biasa (80, 443, dll). * CUMA GUNA * jika mod \'Semua\' atau \'App\' idak berfungsi.</string>
+  <string name="pref_transparent_port_title">Senarai Port</string>
+  <string name="pref_transparent_port_summary">Senarai port untuk proxy. *GUNA HANYA* jika mod \'Semua\' atau \'App\' tidak berfungsi</string>
+  <string name="pref_transparent_port_dialog">Masukkan port untuk proxy</string>
+  <string name="pref_has_root">Minta Akses Root</string>
+  <string name="pref_has_root_summary">Minta akses root untuk proxy telus</string>
+  <string name="status_install_success">Tor berjaya dipasang!</string>
+  <string name="status_install_fail">Fail Tor gagal dipasang. Sila semak log dan maklumkan kepada tor-assistants at torproject.org</string>
+  <string name="title_error">Ralat Aplikasi</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Tentang Orbot</string>
+  <string name="btn_next">Seterusnya</string>
+  <string name="btn_back">Kembali</string>
+  <string name="btn_finish">Tamat</string>
+  <string name="btn_okay">Okay</string>
+  <string name="btn_cancel">Batal</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Maklumat Orbot</string>
+  <string name="wizard_details_msg">Orbot merupakan aplikasi sumber terbuka yang mengandungi Tor, LibEvent dan Privoxy. Ia menyediakan seorang proksi HTTP tempatan (8118) dan proksi SOCKS (9050) ke dalam rangkaian Tor. Orbot juga mempunyai keupayaan, pada peranti berakar umbi, untuk menghantar semua trafik internet melalui Tor.</string>
+  <string name="wizard_permissions_root">Kebenaran disahkan</string>
+  <string name="wizard_permissions_stock">Kebenaran Orbot</string>
+  <string name="wizard_premissions_msg_root">Bagus! Kami mendapati anda ada akses root yang dibenarkan untuk Orbot. Kami akan gunakan kuasa ini dengan bijak.</string>
+  <string name="wizard_permissions_msg_stock">Walaupun ia tidak diperlukan, Orbot boleh menjadi alat yang berguna jika peranti anda mempunyai akses root. Guna butang di bawah untuk memberi Orbot superpower!</string>
+  <string name="wizard_permissions_no_root">Jika anda tidak mempunyai akses root atau tidak tahu mengenai ini, cuma pastikan anda menggunakan aplikasi yang boleh digunakan dengan Orbot.</string>
+  <string name="wizard_permissions_consent">Saya faham dan mahu teruskan tanpa Superuser</string>
+  <string name="wizard_permission_enable_root">Beri akses Root pada Orbot</string>
+  <string name="wizard_configure">Konfigurasi Torification</string>
+  <string name="wizard_configure_msg">Orbot memberi anda pilihan untuk menghala semua trafik aplikasi melalui Tor ATAU untuk memilih aplikasi untuk digunakan secara individual.</string>
+  <string name="wizard_configure_all">Proxy Semua Aplikasi Melalui Tor</string>
+  <string name="wizard_configure_select_apps">Pilih Aplikasi Untuk Tor</string>
+  <string name="wizard_tips_tricks">Aplikasi Yang Dibenar Menggunakan Orbot</string>
+  <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_otrchat">Gibberbot - Klien mesej ringkas selamat untuk Android</string>
+  <string name="wizard_tips_proxy">Tetapan Proksi - Belajar bagaimana untuk mengkonfigurasi aplikasi untuk bekerja dengan Orbot</string>
+  <string name="wizard_proxy_help_info">Tetapan proxy</string>
+  <string name="wizard_proxy_help_msg">Jika aplikasi Android yang anda gunakan boleh menyokong penggunaan proksi HTTP atau SOCKS, kemudian anda boleh menatarajah untuk menyambung kepada Orbot dan menggunakan Tor. ⏎\n⏎\n⏎\n    Tetapan tuan rumah adalah 127.0.0.1 atau \"localhost\". Untuk HTTP, tetapan pelabuhan 8118. Untuk SOCKS, proksi adalah 9050. Anda harus menggunakan SOCKS4A atau socks5 jika boleh. ⏎\n    ⏎\n⏎\n⏎\n    Anda boleh mengetahui lebih lanjut tentang proxying pada Android melalui FAQ di: http://tinyurl.com/proxyandroid ⏎</string>
+  <string name="wizard_final">Orbot sudah sedia!</string>
+  <string name="wizard_final_msg">Beratus-ratus ribu orang di seluruh dunia menggunakan Tor untuk pelbagai sebab-sebab yang luas. ⏎\n⏎\nWartawan dan blogger, pembela hak asasi manusia, pegawai penguatkuasa undang-undang, tentera, perbadanan, rakyat rejim menindas, dan warganegara sahaja, biasa … dan kini anda bersedia untuk, juga!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Anda telah berjaya disambungkan kepada rangkaian Tor - tetapi ini bukanlah bermakna peranti anda adalah selamat. Anda boleh menggunakan pilihan \'Check\' daripada menu untuk menguji pelayar anda. ⏎\n⏎\nMelawat kami pada https://guardianproject.info/apps/orbot atau menghantar e-mel ke help at guardianproject.info untuk mengetahui lebih lanjut.</string>
+  <string name="tor_check">Ini akan membuka pelayar web anda untuk https://check.torproject.org untuk melihat jika Orbot mungkin ditetapkan dan anda disambungkan kepada Tor.</string>
+  <string name="pref_hs_group">Perkhidmatan tersembunyi</string>
+  <string name="pref_general_group">Umum</string>
+  <string name="pref_start_boot_title">Mulakan Orbot semasa Boot</string>
+  <string name="pref_start_boot_summary">Mula Orbot secara automatik dan sambung Tor ketika peranti Android boot</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot membawa Tor untuk Android! ⏎\n⏎\nTor membantu anda mempertahankan terhadap penapisan kandungan, analisis dan pengawasan trafik rangkaian yang mengancam privasi, maklumat sulit dan hubungan peribadi. ⏎\n⏎\nWizard ini akan membantu anda mengkonfigurasi Orbot dan Tor pada peranti anda.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Amaran</string>
+  <string name="wizard_warning_msg">Hanya memasang Orbot tidak secara automatik akan anonymize trafik mudah alih anda. ⏎\n⏎\nAnda betul mesti menatarajah Orbot, peranti anda dan aplikasi lain untuk berjaya menggunakan Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">kebenaran</string>
+  <string name="wizard_permissions_root_msg1">Anda juga boleh memberikan akses Orbot \'SuperUser\' untuk membolehkan ciri-ciri yang maju, seperti Proxying Telus.</string>
+  <string name="wizard_permissions_root_msg2">Jika anda tidak mahu berbuat demikian, sila pastikan untuk menggunakan aplikasi yang dibuat untuk bekerjasama dengan Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Peranti anda tidak perlu berakar umbi atau menyediakan \'SuperUser\' akses. ⏎\n⏎\nDalam untuk anda mendapat manfaat daripada Tor, anda akan perlu menggunakan aplikasi yang dibina untuk bekerja dengan Orbot, atau yang HTTP sokongan atau tetapan proksi SOCKS. ⏎\n</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orweb: Privasi ditambah penyemak imbas yang bekerja melalui Tor</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxy Telus</string>
+  <string name="wizard_transproxy_msg">Ini membolehkan aplikasi anda secara automatik melalui rangkaian Tor tanpa apa apa konfigurasi</string>
+  <string name="wizard_transproxy_hint">(Tanda kotak ini jika anda belen)</string>
+  <string name="wizard_transproxy_none">Tiada</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Membolehkan Proxying Telus Tor untuk Wifi dan USB Devices terikat (memerlukan restart)</string>
+  <string name="button_grant_superuser">Minta Akses Superuser</string>
+  <string name="pref_select_apps">Pilih Aplikasi</string>
+  <string name="pref_select_apps_summary">Pilih Aplikasi untuk dihalakan melalui Tor</string>
+  <string name="pref_node_configuration">Konfigurasi Nod</string>
+  <string name="pref_node_configuration_summary">Ini ialah tetapan lanjutan yang boleh mengurangkan kadar anonymity anda</string>
+  <string name="pref_entrance_node">Nod Kemasukan</string>
+  <string name="pref_entrance_node_summary">Cap jari, nama samaran, negara, dan alamat untuk lompatan pertama</string>
+  <string name="pref_entrance_node_dialog">Masukkan Nod Kemasukan</string>
+  <string name="pref_proxy_type_title">Jenis Proxy</string>
+  <string name="pref_proxy_type_summary">Protokol untuk digunakan pada pelayan proxy: HTTP,HTTPS,Socks4,Socks5</string>
+  <string name="pref_proxy_type_dialog">Masukkan Jenis Proxy</string>
+  <string name="pref_proxy_host_title">Hos Proxy</string>
+  <string name="pref_proxy_host_summary">Nama hos pelayan proxy</string>
+  <string name="pref_proxy_host_dialog">Masukkan Hos Proxy</string>
+  <string name="pref_proxy_port_title">Port Proxy</string>
+  <string name="pref_proxy_port_summary">Port pelayan proxy</string>
+  <string name="pref_proxy_port_dialog">Masukkan port Proxy</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Tetapkan proxy telus secara keseluruhan</string>
+  <string name="setting_up_app_based_transparent_proxying_">Tetapkan proxy telus berdasarkan aplikasi</string>
+  <string name="transparent_proxying_enabled">Proxy telus dibolehkan</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy dibolehkan untuk Tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">AMARAN: ralat semasa memulakan proxy telus!</string>
+  <string name="transproxy_rules_cleared">Peraturan TransProxy dipadam</string>
+  <string name="couldn_t_start_tor_process_">Tidak boleh memulakan proses Tor:</string>
+  <string name="privoxy_is_running_on_port_">Privoxy sedang berjalan pada port:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Menetap proxy telus berdasarkan port..</string>
+  <string name="bridge_error">Ralat jambatan</string>
+  <string name="bridge_requires_ip">Untuk menggunakan ciri jambatan, anda mesti masukkan sekurang-kurangnya satu alamat IP jambatan.</string>
+  <string name="send_email_for_bridges">Hantar e-mel kepada bridges at torproject.org dengan garisan \"jambatan\" dengan sendirinya dalam badan mel dari akaun gmail.</string>
+  <string name="error">Ralat</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Tetapan ReachableAddresses anda menyebabkan pengecualian!</string>
+  <string name="your_relay_settings_caused_an_exception_">Tetapan relay anda menyebabkan pengecualian!</string>
+  <string name="exit_nodes">Keluar Nod</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Cap jari, nama samaran, negara, dan alamat untuk lompatan terakhir</string>
+  <string name="enter_exit_nodes">Masukkan Nod Keluar</string>
+  <string name="exclude_nodes">Keluarkan Nod</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Cap jari, nama samaran, negara dan alamat untuk dikeluarkan</string>
+  <string name="enter_exclude_nodes">Masukkan Nod Keluar</string>
+  <string name="strict_nodes">Nod Ketat</string>
+  <string name="use_only_these_specified_nodes">Guna *hanya* nod-nod ini</string>
+  <string name="bridges">Jambatan</string>
+  <string name="use_bridges">Guna Jambatan</string>
+  <string name="bridges_obfuscated">Jambatan Keliru</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Membolehkan nod pintu masuk ganti ke Rangkaian Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Benarkan jika konfigurasi jambatan adalah jambatan keliru</string>
+  <string name="ip_address_and_port_of_bridges">Alamat IP dan pelabuhan jambatan</string>
+  <string name="enter_bridge_addresses">Masukkan Alamat Jambatan</string>
+  <string name="relays">Relays</string>
+  <string name="relaying">Relaying</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Membolehkan peranti anda untuk menjadi geganti bukan keluar</string>
+  <string name="relay_port">Relay Port</string>
+  <string name="listening_port_for_your_tor_relay">Mendapatkan port untuk tetapan relay Tor anda</string>
+  <string name="enter_or_port">Masukkan port OR</string>
+  <string name="relay_nickname">Nama samaran relay</string>
+  <string name="the_nickname_for_your_tor_relay">Nama samaran ini untuk relay Tor anda</string>
+  <string name="enter_a_custom_relay_nickname">Masukkan nama samaran gantian untuk relay</string>
+  <string name="reachable_addresses">Alamat yang dapat dicapai</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Jalan sebagai klien dibelakang firewall dengan peraturan ketat</string>
+  <string name="reachable_ports">Port yang dapat dicapai</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Port yang dapat dicapai dibelakang firewall dengan kawalan ketat</string>
+  <string name="enter_ports">Masukkan port</string>
+  <string name="enable_hidden_services">Benarkan Servis Tersembunyi</string>
+  <string name="run_servers_accessible_via_the_tor_network">Jalankan pelayan boleh diakses melalui rangkaian Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">Masuk port localhost untuk servis tersembunyi</string>
+  <string name="hidden_service_ports">Port servis tersembunyi</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Nama beralamat untuk servis tersembunyi anda (dijana secara automatik)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">benarkan log debug pada output (mesti guna adb atau aLogCat untuk lihat)</string>
+  <string name="project_home">Rumah Projek(s):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android⏎ https://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Lesen Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3rd-Party-Software: </string>
+  <string name="hidden_service_request">Satu aplikasi mahu membuka port tersembunyi %S pada rangkaian Tor. Ia selamat jika anda percaya pada aplikasi itu.</string>
+  <string name="found_existing_tor_process">Proses Tor sedia ada ditemui..</string>
+  <string name="something_bad_happened">Sesuatu yang buruk berlaku. Semak log.</string>
+  <string name="hidden_service_on">port tersembunyi pada:</string>
+  <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
+  <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
+  <string name="pref_use_sys_iptables_title">Guna default Iptables</string>
+  <string name="pref_use_sys_iptables_summary">Guna binari built-in iptables daripada yang didatangkan bundle dengan Orbot</string>
+  <string name="error_installing_binares">Tor binari tidak boleh dipasang atau dinaiktaraf</string>
+  <string name="pref_use_persistent_notifications">Sentiasa biar ikon pada toolbar apabila Orbot bersambung</string>
+  <string name="pref_use_persistent_notifications_title">Sentiasa On Notifikasi</string>
+  <string name="notification_using_bridges">Jambatan dibenarkan!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Tetapan Tempatan</string>
+  <string name="set_locale_summary">Pilihan tempatan dan bahasa untuk Orbot</string>
+  <string name="wizard_locale_title">Pilih Bahasa</string>
+  <string name="wizard_locale_msg">Biar default atau ubah ke bahasa sekarang</string>
+  <string name="powered_by">Dijana oleh Projek Tor</string>
+  <string name="btn_save_settings">Simpan Tetapan</string>
+  <string name="menu_vpn">Apps</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-my/strings.xml b/orbotservice/src/main/res/values-my/strings.xml
new file mode 100644
index 0000000..07ab475
--- /dev/null
+++ b/orbotservice/src/main/res/values-my/strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_home">ပင်မ စာမျက်နှာ</string>
+  <string name="menu_browse">ဖွင့်ကြည့်ရန်</string>
+  <string name="menu_settings">ချိန်ညှိချက်များ</string>
+  <string name="menu_info">အကူအညီ</string>
+  <string name="menu_about">အကြောင်း</string>
+  <string name="button_help">အကူအညီ</string>
+  <string name="button_close">ပိတ်ရန်</string>
+  <string name="button_about">အကြောင်း</string>
+  <string name="menu_exit">ထွက်ရန်</string>
+  <string name="btn_back">နောက်သို့</string>
+  <string name="btn_cancel">ဖျက်သိမ်းရန်</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">ပရောက်ဇီ ချိန်ညှိချက်များ</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">ယေဘုယျ</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">သတိပေးချက်</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">ဘာမှမရှိ</string>
+  <string name="status">အနေအထား</string>
+  <string name="error">ချို့ယွင်းချက်</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">ချိန်ညှိချက်များကို သိမ်းဆည်းရန်</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-nb/strings.xml b/orbotservice/src/main/res/values-nb/strings.xml
new file mode 100644
index 0000000..6fe4aeb
--- /dev/null
+++ b/orbotservice/src/main/res/values-nb/strings.xml
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot er en gratis proxy app som gjør det mulig for andre apps å bruke internett mer sikkert. Orbot bruker Tor for å kryptere din Internettrafikk, og skjuler da din trafikk ved å sende trafikken gjennom en lang rekke datamaskiner over hele verden. Tor er et gratis dataprogram, og et åpent nettverk som hjelper deg å forsvare deg mot en form for nettverksovervåking som truer din personlige frihet og privatliv, konfidensiell bedriftsvirksomhet og relasjoner, og statlig sikkerhet kjent som trafikkanalyse.</string>
+  <string name="internal_web_url">https://torproject.org</string>
+  <string name="default_web_url">https://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">start, og stopp Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot starter...</string>
+  <string name="status_activated">Koblet til Tor-nettverket</string>
+  <string name="status_disabled">Orbot er deaktivert</string>
+  <string name="tor_process_starting">Starter Tor klient...</string>
+  <string name="tor_process_complete">fullført.</string>
+  <string name="tor_process_waiting">venter.</string>
+  <string name="not_anonymous_yet">ADVARSEL: Trafikken din er enda ikke anonym! Vær vennlig og konfigurer applikasjonene dine til å bruke HTTP proxy 127.0.0.1:8118, eller SOCKS4A, eller SOCKS5 proxy 127.0.0.1:9050</string>
+  <string name="menu_home">Hjem</string>
+  <string name="menu_browse">Surfe</string>
+  <string name="menu_settings">Innstillinger</string>
+  <string name="menu_log">Logg</string>
+  <string name="menu_info">Hjelp</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Start</string>
+  <string name="menu_stop">Stopp</string>
+  <string name="menu_about">Om</string>
+  <string name="main_layout_download">Nedlast</string>
+  <string name="main_layout_upload">Last opp</string>
+  <string name="button_help">Hjelp</string>
+  <string name="button_close">Steng</string>
+  <string name="button_about">Om</string>
+  <string name="button_clear_log">Tøm logg</string>
+  <string name="menu_verify">Kontroller</string>
+  <string name="menu_exit">Avslutt</string>
+  <string name="press_to_start">- langt trykk for å starte -</string>
+  <string name="pref_trans_proxy_group">Transparent Proxying (Krever Root)</string>
+  <string name="pref_trans_proxy_title">Transparent Proxying</string>
+  <string name="pref_trans_proxy_summary">Automatisk Torifisering av applikasjoner</string>
+  <string name="pref_transparent_all_title">Tor alt</string>
+  <string name="pref_transparent_all_summary">Proxy trafikk for alle applikasjoner via Tor</string>
+  <string name="pref_transparent_port_fallback_title">Tilbakestill proxyport</string>
+  <string name="pref_transparent_port_fallback_summary">ADVARSEL: Omgår vanlige porter (80, 443, osv). *BRUKES KUN* hvis \'alle\', eller \'Applikasjon\'-modus ikke virker.</string>
+  <string name="pref_transparent_port_title">Port Liste</string>
+  <string name="pref_transparent_port_summary">Liste over porter som skal gå gjennom proxy. *BRUKES KUN* hvis \'Alle\', eller \'Applikasjon\'-modus ikke virker.</string>
+  <string name="pref_transparent_port_dialog">Angi porter som skal gå gjennom proxy</string>
+  <string name="pref_has_root">Be om Root tilgang</string>
+  <string name="pref_has_root_summary">Be om root-tilgang for transparent proxying</string>
+  <string name="status_install_success">Tor binære filer vellykket installert!</string>
+  <string name="status_install_fail">Tor-binære filer kunne ikke installeres. Vennligst sjekk loggen og varsle tor-assistants at torproject.org</string>
+  <string name="title_error">Applikasjonsfeil</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Om Orbot</string>
+  <string name="btn_next">Neste</string>
+  <string name="btn_back">Tilbake</string>
+  <string name="btn_finish">Ferdig</string>
+  <string name="btn_okay">Ok</string>
+  <string name="btn_cancel">Avbryt</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Noen Orbot detaljer</string>
+  <string name="wizard_permissions_root">Tillatelse gitt</string>
+  <string name="wizard_permissions_stock">Orbot tillatelser</string>
+  <string name="wizard_premissions_msg_root">Utmerket! Vi har oppdaget at du har root rettigheter aktivert for Orbot. Vi vil bruke denne makten med omhu.</string>
+  <string name="wizard_permissions_msg_stock">Selv om det ikke er er nødvendig, kan Orbot bli et mer kraftig verktøy hvis enheten har root-tilgang. Bruk knappen nedenfor til å innvilge Orbot superkrefter!</string>
+  <string name="wizard_permissions_no_root">Hvis du ikke har root-tilgang, eller ikke har noen anelse om hva vi snakker om, bare sørg for å bruke programmer laget for å fungere med Orbot.</string>
+  <string name="wizard_permissions_consent">Jeg forstår, og ønsker å fortsette uten superbruker</string>
+  <string name="wizard_permission_enable_root">Gi Orbot root-tilgang</string>
+  <string name="wizard_configure">Konfigurer Torification</string>
+  <string name="wizard_configure_msg">Orbot gir deg muligheten til å rute all applikasjonstrafikk gjennom Tor, ELLER å velge applikasjonene individuelt.</string>
+  <string name="wizard_configure_all">Bruk proxy for alle applikasjoner gjennom Tor</string>
+  <string name="wizard_configure_select_apps">Velg individuelle applikasjoner som skal brukes med Tor</string>
+  <string name="wizard_tips_tricks">Orbot aktiverte applikasjoner</string>
+  <string name="wizard_tips_msg">Applikasjonene nedenfor ble utviklet for å fungere med Orbot. Klikk på hver knapp for å installere nå, eller du kan finne dem senere på Google Play, på GuardianProject.info nettsiden, eller via F-Droid.org.</string>
+  <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="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>
+  <string name="wizard_final">Orbot er klar!</string>
+  <string name="wizard_final_msg">Millioner av mennesker over hele verden bruker Tor for en rekke grunner.\n\ nJournalists og bloggere, menneskerettighetsforkjempere, politi, soldater, bedrifter, borgere i undertrykkende regimer, og bare vanlige borgere ... og nå er du klar til å , også!</string>
+  <string name="wizard_exit_at_first_screen_toast">Vennligst konfigurere Orbot før du bruker det!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Dette vil åpne nettleseren din med adressen https://check.torproject.org for å se om Orbot er korrekt konfigurert, og at du er koblet til Tor.</string>
+  <string name="pref_hs_group">Skjult Service Hosting</string>
+  <string name="pref_general_group">Generelt</string>
+  <string name="pref_start_boot_title">Start Orbot ved oppstart</string>
+  <string name="pref_start_boot_summary">Start Orbot automatisk, og koble til Tor når din Android-enhet starter opp</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot bringer Tor til Android!\n\nTor hjelper deg å forsvare seg mot innholdsfiltrering, trafikk analyse og overvåking som truer personvern, konfidensiell informasjon og personlige relasjoner. \ N \ nDenne veiviseren vil hjelpe deg med å konfigurere Orbot og Tor på enheten.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Advarsel</string>
+  <string name="wizard_warning_msg">Ganske enkelt å installere Orbot vil ikke automatisk anonymmobiltrafikk .\n\nDu må konfigurere Orbot, enheten og andre applikasjoner for å kunne bruke Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Tillatelser</string>
+  <string name="wizard_permissions_root_msg1">Du kan eventuelt gi Orbot \'Superbruker\' adgang til å aktivere avanserte funksjoner, for eksempel Transparent proxy.</string>
+  <string name="wizard_permissions_root_msg2">Hvis du ikke ønsker å gjøre dette, må du sørge for å bruke applikasjoner som er laget for å fungere med Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Enheten ser ikke ut til å være forankret eller gi root eller \"superbruker\" tilgang.\n\nVennligst prøve \"apps\" modus på hovedskjermen i stedet.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot aktiverte applikasjoner</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: Sikret sludreprogram med OTR-kryptering</string>
+  <string name="wizard_tips_play">Finn alle Guardian Prosjekt sine applikasjoner på Google Play</string>
+  <string name="wizard_tips_fdroid">Finn alle Guardian Project applikasjoner på F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Finn alle Guardian Project applikasjoner på https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparent Proxying</string>
+  <string name="wizard_transproxy_msg">Dette tillater dine applikasjoner å kjøre automatisk gjennom Tor-nettverket uten noen konfigurasjon.</string>
+  <string name="wizard_transproxy_hint">(Marker denne boksen hvis du ikke har noen anelse om hva vi snakker om)</string>
+  <string name="wizard_transproxy_none">Ingen</string>
+  <string name="pref_transparent_tethering_title">Tor-deling</string>
+  <string name="pref_transparent_tethering_summary">Aktiver Tor Transparent proxyer for WiFi, og USB delte enheter (krever omstart)</string>
+  <string name="button_grant_superuser">Be om Superbruker tilgang</string>
+  <string name="pref_select_apps">Velg applikasjoner</string>
+  <string name="pref_select_apps_summary">Velg applikasjoner som skal rutes gjennom Tor</string>
+  <string name="pref_node_configuration">Node-konfigurasjon</string>
+  <string name="pref_node_configuration_summary">Dette er avanserte innstillinger som kan redusere din anonymitet</string>
+  <string name="pref_entrance_node">Inngangsnoder</string>
+  <string name="pref_entrance_node_summary">Fingeravtrykk, kallenavn, land, og adresser til det første hopp</string>
+  <string name="pref_entrance_node_dialog">Skriv inn inngangsnoder</string>
+  <string name="button_proxy_all">Mellomtjen alt</string>
+  <string name="button_proxy_none">Mellomtjen ingenting</string>
+  <string name="pref_proxy_title">Utgående nettverksproxy (Valgfritt)</string>
+  <string name="pref_proxy_type_title">Utgående proxytype</string>
+  <string name="pref_proxy_type_summary">Protokoll for proxy-server: HTTP, HTTPS, SOCKS4, SOCKS5</string>
+  <string name="pref_proxy_type_dialog">Skriv inn proxytype</string>
+  <string name="pref_proxy_host_title">Utgående proxyvert</string>
+  <string name="pref_proxy_host_summary">Proxyserver vertsnavn</string>
+  <string name="pref_proxy_host_dialog">Skriv inn proxyvert</string>
+  <string name="pref_proxy_port_title">Utgående proxyport</string>
+  <string name="pref_proxy_port_summary">Proxyserver port</string>
+  <string name="pref_proxy_port_dialog">Skriv inn proxyport</string>
+  <string name="pref_proxy_username_title">Utgående Proxy Brukernavn</string>
+  <string name="pref_proxy_username_summary">Proxy Brukernavn (valgfritt)</string>
+  <string name="pref_proxy_username_dialog">Skriv inn Proxy Brukernavn</string>
+  <string name="pref_proxy_password_title">Utgående Proxy Passord</string>
+  <string name="pref_proxy_password_summary">Proxy Passord (valgfritt)</string>
+  <string name="pref_proxy_password_dialog">Skriv inn Proxy Passord</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Konfigurerer full transparent proxying...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Konfigurerer applikasjonsbasert transparent proxying...</string>
+  <string name="transparent_proxying_enabled">Transparent proxying AKTIVERT</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy aktivert for nettdeling!</string>
+  <string name="warning_error_starting_transparent_proxying_">ADVARSEL: Feil under oppstart av transparent proxying!</string>
+  <string name="transproxy_rules_cleared">TransProxy regler fjernet</string>
+  <string name="couldn_t_start_tor_process_">Kunne ikke starte Tor prosessen:</string>
+  <string name="privoxy_is_running_on_port_">Polipo kjører på port:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Konfigurerer portbasert transparent proxying...</string>
+  <string name="bridge_error">Brofeil</string>
+  <string name="bridge_requires_ip">For å kunne bruke bro-funksjonen, må du oppgi minst én bro IP-adresse.</string>
+  <string name="send_email_for_bridges">Send en epost til bridges at torproject.org med teksten \"get bridges\" alene som eneste tekst i selve eposten fra en Gmail-konto.</string>
+  <string name="error">Feil</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Dine \"adresser som kan nås\"-innstillinger forårsaket et unntak!</string>
+  <string name="your_relay_settings_caused_an_exception_">Dine relé-innstillinger forårsaket et unntak!</string>
+  <string name="exit_nodes">Avslutt noder</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingeravtrykk, kallenavn, land og adresser for siste hopp</string>
+  <string name="enter_exit_nodes">Skriv inn utgående noder</string>
+  <string name="exclude_nodes">Ekskluder noder</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fineravtrykk, kallenavn, land og adresser som skal ekskluderes</string>
+  <string name="enter_exclude_nodes">Skriv inn ekskluderte noder</string>
+  <string name="strict_nodes">Strict noder</string>
+  <string name="use_only_these_specified_nodes">Bruk *bare* disse angitte nodene</string>
+  <string name="bridges">Broer</string>
+  <string name="use_bridges">Bruk broer</string>
+  <string name="bridges_obfuscated">Maskerte broer</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Aktiver alternative inngangsnoder til Tor-nettverket</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktiver hvis de konfigurerte broene er maskerte broer</string>
+  <string name="ip_address_and_port_of_bridges">IP-adresser og broporter</string>
+  <string name="enter_bridge_addresses">Skriv inn broadresser</string>
+  <string name="relays">Reléer</string>
+  <string name="relaying">Videresending</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Aktiver enheten din som et relé uten utgående trafikk</string>
+  <string name="relay_port">Relé-port</string>
+  <string name="listening_port_for_your_tor_relay">Porten Tor-reléet ditt lytter på</string>
+  <string name="enter_or_port">Skriv inn OR-port</string>
+  <string name="relay_nickname">Reléets kallenavn</string>
+  <string name="the_nickname_for_your_tor_relay">Kallenavnet på ditt Tor-relé</string>
+  <string name="enter_a_custom_relay_nickname">Skriv inn et egendefinert kallenavn på reléet</string>
+  <string name="reachable_addresses">Antreffbare adresser</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Kjør som en klient bak en brannmur med restriktive regler</string>
+  <string name="reachable_ports">Antreffbare porter</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Antreffbare porter bak en restriktiv brannmur</string>
+  <string name="enter_ports">Skriv inn porter</string>
+  <string name="enable_hidden_services">Skjult Service Hosting</string>
+  <string name="run_servers_accessible_via_the_tor_network">Tillat enhetsserveren å være tilgjengelig via Tor-nettverket</string>
+  <string name="enter_localhost_ports_for_hidden_services">Skriv inn localhost porter for skjulte tjenester</string>
+  <string name="hidden_service_ports">Skjulte tjenesteporter</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Det adresserbare navnet på din skjulte tjeneste (generert automatisk)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">aktiver feilsøkingslogg for output (må bruke adb eller aLogCat for å vise)</string>
+  <string name="project_home">Prosjektets nettside(r):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor-lisensen</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Tredjepartsprogramvare:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">En applikasjon vil åpne den skjulte tjenesteporten %S til Tor-nettverket. Dette er trygt hvis du stoler på applikasjonen. </string>
+  <string name="found_existing_tor_process">fant eksisterende Tor-prosess...</string>
+  <string name="something_bad_happened">Noe alvorlig skjedde. Sjekk loggen.</string>
+  <string name="hidden_service_on">skjult tjeneste på:</string>
+  <string name="unable_to_read_hidden_service_name">klarte ikke å lese skjult tjenestenavn</string>
+  <string name="unable_to_start_tor">Klarte ikke å starte Tor:</string>
+  <string name="unable_to_reset_tor">Gjør en omstart av din enhet, kan ikke tilbakestille Tor!</string>
+  <string name="pref_use_sys_iptables_title">Bruk standard Iptables</string>
+  <string name="pref_use_sys_iptables_summary">bruk de innebygde binære-iptables istedenfor de som kommer med Orbot</string>
+  <string name="error_installing_binares">Tor-binærfilene var ikke i stand til å bli installert, eller oppgradert.</string>
+  <string name="pref_use_persistent_notifications">Alltid behold ikonet i verktøyslinjen når Orbot er tilkoblet</string>
+  <string name="pref_use_persistent_notifications_title">Alltid-På Varslinger</string>
+  <string name="pref_use_expanded_notifications_title">Utvidede varsler</string>
+  <string name="notification_using_bridges">Broer slått på!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Språk</string>
+  <string name="set_locale_summary">Velg nasjonale innstillinger, og språk for Orbot</string>
+  <string name="wizard_locale_title">Velg språk</string>
+  <string name="wizard_locale_msg">Bruk standard, eller endre det gjeldende språket</string>
+  <string name="powered_by">Levert av Tor</string>
+  <string name="btn_save_settings">Lagre Inntillinger</string>
+  <string name="no_internet_connection_tor">Ingen Internett-tilkobling; Tor er i ventemodus... </string>
+  <string name="bandwidth_">Båndbredde:</string>
+  <string name="down">ned</string>
+  <string name="up">opp</string>
+  <string name="pref_disable_network_title">Inget automatisk hvilemodus for nettverk</string>
+  <string name="pref_disable_network_summary">Legg Tor i hvilemodus når nettilkobling til internett ikke er tilgjengelig</string>
+  <string name="newnym">Du har byttet til en ny Tor-identitet!</string>
+  <string name="menu_verify_browser">Nettleser</string>
+  <string name="menu_use_chatsecure">Bruk ChatSecure</string>
+  <string name="permission_manage_tor_label">Håndter Tor</string>
+  <string name="permission_manage_tor_description">La dette programmet kontrollere Tor-tjenesten</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Det ser ikke ut til at du har Orfox installert. Ønsker du hjelp med dette, eller skal vi bare åpne nettleseren?</string>
+  <string name="install_apps_">Installere programmer?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Ingen nettverkstilkobling. Putting Tor å sove ...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Nettverkstilkobling er bra. Våkne Tor opp ...</string>
+  <string name="updating_settings_in_tor_service">Oppdaterer innstillinger i Tor service</string>
+  <string name="pref_socks_summary">Port som Tor tilbyr er SOCKS proxy på (standard: 9050 eller 0 for å slå av)</string>
+  <string name="pref_socks_dialog">SOCKS Port Konfigurasjon</string>
+  <string name="pref_transport_title">Tor TransProxy Port</string>
+  <string name="pref_transport_dialog">TransProxy Port Konfigurasjon</string>
+  <string name="pref_dnsport_title">Tor DNS Port</string>
+  <string name="pref_dnsport_dialog">DNS Port Configurer</string>
+  <string name="your_tor_public_ips_">Din Tor offentlige IP:</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Broer oppdatert</string>
+  <string name="restart_orbot_to_use_this_bridge_">Gjør omstart av Orbot før endringer trer i kraft</string>
+  <string name="menu_qr">QR-koder</string>
+  <string name="get_bridges_email">E-post</string>
+  <string name="get_bridges_web">Vev</string>
+  <string name="activate">Aktiver</string>
+  <string name="send_email">Send e-post</string>
+  <string name="install_orweb">Installer Orfox</string>
+  <string name="standard_browser">Forvalgt nettleser</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Merk: Bare vanlige Tor-broer fungerer på Intel X86/Atom-enheter</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-nl/strings.xml b/orbotservice/src/main/res/values-nl/strings.xml
new file mode 100644
index 0000000..bbd3c17
--- /dev/null
+++ b/orbotservice/src/main/res/values-nl/strings.xml
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot is een gratis en vrije proxy-app die het andere apps mogelijk maakt het internet veiliger te gebruiken. Orbot gebruikt Tor om je internetverkeer te coderen en het vervolgens te verhullen het door het door een serie computers over de hele wereld te routeren. Tor is vrije software en een open netwerk dat je helpt te verdedigen tegen een vorm van netwerktoezicht die persoonlijke vrijheid en privacy, vertrouwelijke bedrijfsactiviteiten en relaties en staatsveiligheid genaamd \'traffic analyse\' bedreigt.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">start en stop Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot is bezig met starten…</string>
+  <string name="status_activated">Verbonden met het Tor-netwerk</string>
+  <string name="status_disabled">Orbot is uitgeschakeld</string>
+  <string name="status_shutting_down">TorService wordt afgesloten</string>
+  <string name="tor_process_starting">Bezig met Tor client starten…</string>
+  <string name="tor_process_complete">klaar.</string>
+  <string name="tor_process_waiting">bezig met wachten.</string>
+  <string name="not_anonymous_yet">WAARSCHUWING: je verkeer is nog niet anononiem! Stel je programma\'s in om gebruik te maken van HTTP-proxy 127.0.0.1:8118 of SOCKS4A- of SOCKS5-proxy 127.0.0.1:9050</string>
+  <string name="menu_home">Thuis</string>
+  <string name="menu_browse">Bladeren</string>
+  <string name="menu_settings">Instellingen</string>
+  <string name="menu_log">Logboek</string>
+  <string name="menu_info">Hulp</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Start</string>
+  <string name="menu_stop">Stop</string>
+  <string name="menu_about">Over</string>
+  <string name="menu_promo_apps">Apps ophalen...</string>
+  <string name="main_layout_download">Download</string>
+  <string name="main_layout_upload">Upload</string>
+  <string name="button_help">Hulp</string>
+  <string name="button_close">Afsluiten</string>
+  <string name="button_about">Over</string>
+  <string name="button_clear_log">Logboek wissen</string>
+  <string name="menu_verify">Controleren</string>
+  <string name="menu_exit">Sluiten</string>
+  <string name="menu_scan">BridgeQR scannen</string>
+  <string name="menu_share_bridge">BridgeQR delen</string>
+  <string name="press_to_start">- lang indrukken om te starten -</string>
+  <string name="pref_trans_proxy_group">Transparant proxyen (vereist root)</string>
+  <string name="pref_trans_proxy_title">Transparant proxyen</string>
+  <string name="pref_trans_proxy_summary">Automatisch Torificeren van apps</string>
+  <string name="pref_transparent_all_title">Tor alles</string>
+  <string name="pref_transparent_all_summary">Proxy verkeer van alle apps door Tor</string>
+  <string name="pref_transparent_port_fallback_title">Poort proxy fallback</string>
+  <string name="pref_transparent_port_fallback_summary">WAARSCHUWING: omzeilt veel voorkomende poorten (80, 443, etc). *GEBRUIK ENKEL* indien de \'Alles\' of \'Apps\'-modus niet werkt.</string>
+  <string name="pref_transparent_port_title">Poortlijst</string>
+  <string name="pref_transparent_port_summary">Lijst van poorten om te proxyen. *GEBRUIK ENKEL* indien \'Alles\' of \'Apps\'-modus niet werkt</string>
+  <string name="pref_transparent_port_dialog">Voer poorten in voor proxy</string>
+  <string name="pref_has_root">Vraag root-toegang aan</string>
+  <string name="pref_has_root_summary">Vraag root-toegang aan voor transparant proxyen</string>
+  <string name="status_install_success">Binaire bestanden van Tor succesvol geïnstalleerd!</string>
+  <string name="status_install_fail">De binaire bestanden konden niet worden geïnstalleerd. Gelieve de log te raadplegen en tor-assistants at torproject.org op de hoogte te stellen</string>
+  <string name="title_error">Toepassingsfout</string>
+  <string name="wizard_title">Welkom bij Orbot</string>
+  <string name="wizard_btn_tell_me_more">Over Orbot</string>
+  <string name="btn_next">Volgende</string>
+  <string name="btn_back">Vorige</string>
+  <string name="btn_finish">Einde</string>
+  <string name="btn_okay">OK</string>
+  <string name="btn_cancel">Annuleren</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Enkele Orbot-gegevens</string>
+  <string name="wizard_details_msg">Orbot is een open-bron-applicatie die Tor, LibEvent en Polipo bevat. Het biedt een lokale HTTP-proxy (8118) en een SOCKS-proxy (9050) naar het Tor-netwerk. Orbot heeft ook de mogelijkheid om op een toestel met root-toegang alle internetverkeer door Tor te sturen.</string>
+  <string name="wizard_permissions_root">Rechten toegewezen</string>
+  <string name="wizard_permissions_stock">Orbot-rechten</string>
+  <string name="wizard_premissions_msg_root">Uitstekend! We hebben gedetecteerd dat je root-rechten hebt aangezet voor Orbot. We gebruiken deze kracht met verstand.</string>
+  <string name="wizard_permissions_msg_stock">Hoewel het niet noodzakelijk is kan Orbot nog krachtiger worden als je toestel root-rechten heeft. Gebruik de knop onderaan om Orbot superkrachten te geven!</string>
+  <string name="wizard_permissions_no_root">Als je niet over root-toegang beschikt en geen idee hebt waarover we bezig zijn, let er dan op dat je apps gebruikt die geschikt zijn voor Orbot.</string>
+  <string name="wizard_permissions_consent">Ik begrijp dit en wil verdergaan zonder Superuser</string>
+  <string name="wizard_permission_enable_root">Root toestaan voor Orbot</string>
+  <string name="wizard_configure">Torificatie instellen</string>
+  <string name="wizard_configure_msg">Orbot geeft je de mogelijkheid om al het verkeer via Tor te laten gaan OF om individueel je applicaties te kiezen.</string>
+  <string name="wizard_configure_all">Proxy alle apps door Tor</string>
+  <string name="wizard_configure_select_apps">Selecteer individuele apps voor Tor</string>
+  <string name="wizard_tips_tricks">Orbot-geschikte apps</string>
+  <string name="wizard_tips_msg">De apps hieronder zijn gemaakt om met Orbot te werken. Klik op de knoppen om ze te installeren, of vind ze later op GuardianProject.info, F-Droid.org of Google Play.</string>
+  <string name="wizard_tips_otrchat">ChatSecure - Beveiligde instant messaging-cliënt voor Android</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="wizard_tips_twitter">Stel Twitter-proxy in als host \"localhost\" en poort 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Maak een verhaal en laat de veiligheid aan Tor over!</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>
+  <string name="wizard_proxy_help_msg">Als de Android-applicatie die je gebruikt het gebruik van een HTTP- of SOCKS-proxy ondersteunt kan je het instellen om te verbinden met Orbot en Tor te gebruiken.\n\n\n De hostinstelling is 127.0.0.1 of \"localhost\". Voor HTTP is de poort 8118, voor SOCKS is de proxy 9050. Indien mogelijk zou je SOCKS4A of SOCKS5 moeten gebruiken.\n \n\n\n Je kan meer te weten komen over proxyen op Android in de VGV op: http://tinyurl.com/proxyandroid\n</string>
+  <string name="wizard_final">Orbot is klaar!</string>
+  <string name="wizard_final_msg">Miljoenen mensen de wereld rond gebruiken Tor voor uiteenlopende redenen.\n\nJournalisten en bloggers, verdedigers van mensenrechten, politie, soldaten, bedrijven, burgers van onderdrukkende regimes, en gewone burgers… en nu ben jij er ook klaar voor!</string>
+  <string name="wizard_exit_at_first_screen_toast">Je moet Orbot eerst configureren vooraleer je het kan gebruiken!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">De verbinding met het Tor netwerk is gelukt - maar dit betekent NIET dat je apparaat veilig is. Je kunt de \'Browser\' knop gebruiken om je verbinding te testen. \n\nBezoek ons op https://guardianproject.info/apps/orbot of stuur een email aan help at guardianproject.info om meer te weten te komen.</string>
+  <string name="tor_check">Dit opent je standaardbrowser naar https://check.torproject.org om te controleren of Orbot succesvol is geconfigureerd om te verbinden met het Tor-netwerk.</string>
+  <string name="pref_hs_group">Verborgen diensten hosten</string>
+  <string name="pref_general_group">Algemeen</string>
+  <string name="pref_start_boot_title">Start Orbot bij opstarten</string>
+  <string name="pref_start_boot_summary">Start Orbot en verbind automatisch met Tor wanneer je Android-toestel opstart</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot brengt Tor naar Android!\n\nTor helpt je te verdedigen tegen het filteren van inhoud, verkeersanalyse en netwerktoezicht die je privacy, vertrouwelijke informatie en persoonlijke relaties bedreigt.\n\nDeze wizard helpt je bij het instellen van Orbot en Tor op je toestel.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Waarschuwing</string>
+  <string name="wizard_warning_msg">Gewoonweg Orbot installeren zal je mobiele verkeer niet automatisch anonimiseren.\n\nJe moet Orbot, je toestel en andere applicaties juist instellen om Tor succesvol te gebruiken.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Rechten</string>
+  <string name="wizard_permissions_root_msg1">Je kan optioneel Orbot \'Superuser\'-toegang geven om geavanceerde functies beschikbaar te stellen, zoals transparant proxyen.</string>
+  <string name="wizard_permissions_root_msg2">Als je dit niet wil doen, let er dan op dat je apps gebruikt die geschikt zijn voor Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Je toestel is niet geroot of biedt geen root of \'Superuser\'-toegang.\n\nProbeer de \'Apps\'-modus op het hoofdscherm.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot-geschikte apps</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: beveiligde chat-applicatie met Off-the-Record-versleuteling</string>
+  <string name="wizard_tips_orweb">Orfox: Browser met pricavy functies die werkt met Tor</string>
+  <string name="wizard_tips_play">Vind alle Guardian Project-applicaties op Google Play</string>
+  <string name="wizard_tips_fdroid">Vind alle Guardian Project-applicaties op F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Vind alle Guardian Project-applicaties op https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparant proxyen</string>
+  <string name="wizard_transproxy_msg">Dit maakt het mogelijk voor jouw applicaties om automatisch via het Tor-netwerk te draaien zonder enige configuratie.</string>
+  <string name="wizard_transproxy_hint">(Vink dit aan als je geen idee hebt waarover we het hebben)</string>
+  <string name="wizard_transproxy_none">Geen</string>
+  <string name="pref_transparent_tethering_title">Tor tetheren</string>
+  <string name="pref_transparent_tethering_summary">Schakel Tor transparante proxy voor WiFi en USB-getheterde toestellen in (vereist herstart)</string>
+  <string name="button_grant_superuser">Vraag Superuser-toegang aan</string>
+  <string name="pref_select_apps">Kies applicaties</string>
+  <string name="pref_select_apps_summary">Kies applicaties om via Tor te draaien</string>
+  <string name="pref_node_configuration">Node-configuratie</string>
+  <string name="pref_node_configuration_summary">Dit zijn geavanceerde instellingen die je anonimiteit kunnen verminderen</string>
+  <string name="pref_entrance_node">Toegangsnodes</string>
+  <string name="pref_entrance_node_summary">Vingerafdrukken, nicks, landen en adressen voor de eerste hop</string>
+  <string name="pref_entrance_node_dialog">Voer toegangsnodes in</string>
+  <string name="pref_allow_background_starts_title">Sta starten op de achtergrond toe</string>
+  <string name="pref_allow_background_starts_summary">Sta elke app toe om Orbot de Tor verbinding en diensten te laten starten </string>
+  <string name="button_proxy_all">Proxy alles</string>
+  <string name="button_proxy_none">Proxy niets</string>
+  <string name="button_invert_selection">Selectie omkeren</string>
+  <string name="pref_proxy_title">Uitgaande netwerk-proxy (facultatief)</string>
+  <string name="pref_proxy_type_title">Proxy-type</string>
+  <string name="pref_proxy_type_summary">Protocol om te gebruiken voor proxyserver: HTTP, HTTPS, SOCKS4, SOCKS5</string>
+  <string name="pref_proxy_type_dialog">Voer proxy-type in</string>
+  <string name="pref_proxy_host_title">Proxyhost</string>
+  <string name="pref_proxy_host_summary">Proxyserverhostnaam</string>
+  <string name="pref_proxy_host_dialog">Voer proxyhost in</string>
+  <string name="pref_proxy_port_title">Proxypoort</string>
+  <string name="pref_proxy_port_summary">Proxyserverpoort</string>
+  <string name="pref_proxy_port_dialog">Voer proxy poort in</string>
+  <string name="pref_proxy_username_title">Uitgaande proxygebruikersnaam</string>
+  <string name="pref_proxy_username_summary">Proxygebruikersnaam (facultatief)</string>
+  <string name="pref_proxy_username_dialog">Voer proxygebruikersnaam in</string>
+  <string name="pref_proxy_password_title">Uitgaande proxywachtwoord</string>
+  <string name="pref_proxy_password_summary">Proxywachtwoord (facultatief)</string>
+  <string name="pref_proxy_password_dialog">Voer proxywachtwoord in</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Bezig met opzetten van volledig transparante proxy…</string>
+  <string name="setting_up_app_based_transparent_proxying_">Bezig met opzetten van per-app transparante proxy…</string>
+  <string name="transparent_proxying_enabled">Transparante proxy INGESCHAKELD</string>
+  <string name="transproxy_enabled_for_tethering_">Transparante proxy ingeschakeld voor tetheren!</string>
+  <string name="warning_error_starting_transparent_proxying_">WAARSCHUWING: fout tijdens starten van transparante proxy!</string>
+  <string name="transproxy_rules_cleared">TransProxy-regels gewist</string>
+  <string name="couldn_t_start_tor_process_">Kon Tor-proces niet starten: </string>
+  <string name="privoxy_is_running_on_port_">Polipo wordt uitgevoerd op poort:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Bezig met opzetten van per-poort transparante proxy…</string>
+  <string name="bridge_error">Bridge-fout</string>
+  <string name="bridge_requires_ip">Om de bridge-functie te gebruiken moet je minstens één bridge IP-adres invoeren.</string>
+  <string name="send_email_for_bridges">Stuur een e-mail met een GMail-account naar bridges at torproject.org met enkel de regel \"get bridges\" in de body van de e-mail.</string>
+  <string name="error">Fout</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Je ReachableAddresses-instellingen veroorzaakten een fout!</string>
+  <string name="your_relay_settings_caused_an_exception_">Je relay-instellingen veroorzaakten een fout!</string>
+  <string name="exit_nodes">Exitnodes</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Vingerafdrukken, nicks, landen en adressen voor de laatste hop</string>
+  <string name="enter_exit_nodes">Voer exitnode in</string>
+  <string name="exclude_nodes">Uitgesloten nodes</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Vingerafdrukken, nicks, landen en adressen om uit te sluiten</string>
+  <string name="enter_exclude_nodes">Voer uitgesloten nodes in</string>
+  <string name="strict_nodes">Strikte nodes</string>
+  <string name="use_only_these_specified_nodes">Gebruik *enkel* deze opgegeven nodes</string>
+  <string name="bridges">Bridges</string>
+  <string name="use_bridges">Gebruik bridges</string>
+  <string name="bridges_obfuscated">Versluierde bridges</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Gebruik alternatieve toegangsnodes naar het Tor-etwerk</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Schakel in als de geconfigureerde bridges versluierde bridges zijn</string>
+  <string name="ip_address_and_port_of_bridges">IP-adres en poort van bridges</string>
+  <string name="enter_bridge_addresses">Voer bridge-adres in</string>
+  <string name="relays">Relays</string>
+  <string name="relaying">Relayen</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Stel je toestel in staat om een non-exit relay te zijn</string>
+  <string name="relay_port">Relay-poort</string>
+  <string name="listening_port_for_your_tor_relay">Luisterpoort van jouw Tor-relay</string>
+  <string name="enter_or_port">Voer OR-poort in</string>
+  <string name="relay_nickname">Relay-bijnaam</string>
+  <string name="the_nickname_for_your_tor_relay">De bijnaam voor jouw Tor-relay</string>
+  <string name="enter_a_custom_relay_nickname">Voer een eigen relay-bijnaam in</string>
+  <string name="reachable_addresses">Bereikbare adressen</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Draai als een cliënt achter een firewall met beperkend beleid</string>
+  <string name="reachable_ports">Bereikbare poorten</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Poorten bereikbaar achter een beperkende firewall</string>
+  <string name="enter_ports">Voer poorten in</string>
+  <string name="enable_hidden_services">Verborgen diensten hosten</string>
+  <string name="run_servers_accessible_via_the_tor_network">maak server-op-toestel toegankelijk via het Tor-netwerk</string>
+  <string name="enter_localhost_ports_for_hidden_services">voer localhost-poorten in voor verborgen diensten</string>
+  <string name="hidden_service_ports">Verborgen dienst-poort</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">de adresseerbare naam voor je verborgen dienst (automatisch gegenereerd)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">schakel debug log naar uitvoer in (adb of aLogCat is nodig om dit te bekijken)</string>
+  <string name="project_home">Project homepagina(\'s): </string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">De Tor-licentie</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Software van 3e partijen: </string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Een applicatie wil verborgen dienst-poort %S openen naar het Tor-netwerk. Dit is veilig als je de applicatie vertrouwt.</string>
+  <string name="found_existing_tor_process">bestaand Tor-proces gevonden…</string>
+  <string name="something_bad_happened">Er is een fout opgetreden. Controleer de log</string>
+  <string name="hidden_service_on">verborgen dienst op:</string>
+  <string name="unable_to_read_hidden_service_name">Kan verborgen dienst-naam niet lezen</string>
+  <string name="unable_to_start_tor">Kan Tor niet starten:</string>
+  <string name="unable_to_reset_tor">Herstart je toestel, kan Tor niet opnieuw instellen!</string>
+  <string name="pref_use_sys_iptables_title">Gebruik standaard iptables</string>
+  <string name="pref_use_sys_iptables_summary">gebruik de ingebouwde iptables-binary in plaats van de in Orbot geïntegreerde</string>
+  <string name="error_installing_binares">De Tor-binaries konden niet worden geïnstalleerd of bijgewerkt.</string>
+  <string name="pref_use_persistent_notifications">Houd icoon in taakbalk zolang Orbot verbonden is</string>
+  <string name="pref_use_persistent_notifications_title">Meldingen altijd aan</string>
+  <string name="pref_use_expanded_notifications">Toon uitgebreide melding met Tor-exitland en IP</string>
+  <string name="pref_use_expanded_notifications_title">Uitgebreide meldingen</string>
+  <string name="notification_using_bridges">Bridges ingeschakeld!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Taal</string>
+  <string name="set_locale_summary">Kies de landsinstellingen en taal voor Orbot</string>
+  <string name="wizard_locale_title">Kies taal</string>
+  <string name="wizard_locale_msg">Laat standaard of schakel over naar huidige taal</string>
+  <string name="powered_by">aangedreven door Tor</string>
+  <string name="btn_save_settings">Sla instellingen op</string>
+  <string name="no_internet_connection_tor">Geen internetverbinding; Tor is op stand-by…</string>
+  <string name="bandwidth_">Bandbreedte:</string>
+  <string name="down">omlaag</string>
+  <string name="up">omhoog</string>
+  <string name="pref_disable_network_title">Geen netwerk automatisch slapen</string>
+  <string name="pref_disable_network_summary">Laat Tor slapen als er geen internetverbinding beschikbaar is</string>
+  <string name="newnym">Je bent naar een nieuwe Tor identiteit gewisseld!</string>
+  <string name="menu_verify_browser">Browser</string>
+  <string name="menu_use_chatsecure">Gebruik ChatSecure</string>
+  <string name="permission_manage_tor_label">Tor beheren</string>
+  <string name="permission_manage_tor_description">Deze applicatie toestaan om de Tor-dienst te bedienen</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orfox lijkt niet geïnstalleerd te zijn, Wil je daar hulp bij, of wil je gewoon de browser openen?</string>
+  <string name="install_apps_">Applicaties installeren?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Geen internetverbinding. Tor wordt te slapen gelegd…</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Netwerkverbinding is in orde. Tor wordt wakker gemaakt…</string>
+  <string name="updating_settings_in_tor_service">instellingen in Tor-dienst worden bijgewerkt</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Poort waarop Tor de SOCKS-proxy aanbiedt (standaard: 9050 of 0 om uit te schakelen)</string>
+  <string name="pref_socks_dialog">SOCKS-poortconfiguratie</string>
+  <string name="pref_transport_title">Tor TransProxy-poort</string>
+  <string name="pref_transport_summary">Poort waarop Tor de transparante proxy aanbiedt (standaard: 9040 of 0 om uit te schakelen)</string>
+  <string name="pref_transport_dialog">TransProxy-poortconfiguratie</string>
+  <string name="pref_dnsport_title">Tor DNS-poort</string>
+  <string name="pref_dnsport_summary">Poort waarop Tor de DNS aanbiedt (standaard: 5400 of 0 om uit te schakelen)</string>
+  <string name="pref_dnsport_dialog">DNS-poortconfiguratie</string>
+  <string name="pref_torrc_title">Torrc aangepaste configuratie</string>
+  <string name="pref_torrc_summary">ENKEL VOOR GEVORDERDEN: voer rechtstreeks torrc-configuratieregels in</string>
+  <string name="pref_torrc_dialog">Aangepaste Torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string>
+  <string name="your_tor_public_ips_">Je Tor publieke IP\'s:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Schakel deze applicatie uit in Android->Instellingen->Applicaties als je problemen ondervindt met Orbot:</string>
+  <string name="app_conflict">App-conflict</string>
+  <string name="pref_transproxy_refresh_title">Transproxy automatisch verversen</string>
+  <string name="pref_transproxy_refresh_summary">Transproxy-regels opnieuw toepassen wanneer de status van het netwerk verandert</string>
+  <string name="pref_transproxy_flush_title">Transproxy VERWIJDEREN DWINGEN</string>
+  <string name="pref_transproxy_flush_summary">Tik hier om alle transproxy-netwerkregels NU te spoelen</string>
+  <string name="transparent_proxy_rules_flushed_">Transparante proxy-regels gespoeld!</string>
+  <string name="you_do_not_have_root_access_enabled">Je hebt ROOT-toegang niet ingeschakeld</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Het kan nodig zijn Orbot te stoppen en opnieuw te starten opdat wijzigingen in de instellingen worden ingeschakeld.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Bridges bijgewerkt</string>
+  <string name="restart_orbot_to_use_this_bridge_">Herstart Orbot om de wijzigingen in te schakelen</string>
+  <string name="menu_qr">QR-codes</string>
+  <string name="bridge_mode">Bridge-modus</string>
+  <string name="get_bridges_email">E-mail</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Activeren</string>
+  <string name="apps_mode">Apps VPN Modus</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Je kan instellen dat alle applicaties op je toestel gebruik maken van het Tor-netwerk met de VPN-functie van Android.\n\n*WAARSCHUWING* Dit is een nieuwe, experimentele functie die in sommige gevallen niet automatisch kan starten, of zou kunnen stoppen. Het moet NIET worden gebruikt voor anonimiteit en ENKEL om firewalls en filters te omzeilen.</string>
+  <string name="send_email">E-mail versturen</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Je kan een bridge-adres verkrijgen door e-mail, het web of door een bridge-QR-code te scannen. Kies \'E-mail\' of \'Web\' hieronder om een bridge-adres aan te vragen.\n\nEenmaal je een adres hebt kopieer en plak je het in de \"Bridges\"-optie in de Orbot-instellingen, waarna je Orbot herstart.</string>
+  <string name="install_orweb">Orfox installeren</string>
+  <string name="standard_browser">Standaardbrowser</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">LET OP: enkel standaard Tor-bridges werken op Intel x86/Atom-toestellen</string>
+  <string name="vpn_default_world">Wereld</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-pa/strings.xml b/orbotservice/src/main/res/values-pa/strings.xml
new file mode 100644
index 0000000..2756370
--- /dev/null
+++ b/orbotservice/src/main/res/values-pa/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_browse">ਚਰਨਾ</string>
+  <string name="menu_settings">ਪਰਿਸਥਿਤੀ</string>
+  <string name="menu_info">ਸਹਾਇਤਾ</string>
+  <string name="button_help">ਸਹਾਇਤਾ</string>
+  <string name="btn_cancel">ਰੱਦ ਕਰੋ</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">ਪਰਾਕਸੀ ਸੈਟਿੰਗ</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">ਖਾਲੀ</string>
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-pl/strings.xml b/orbotservice/src/main/res/values-pl/strings.xml
new file mode 100644
index 0000000..e550da5
--- /dev/null
+++ b/orbotservice/src/main/res/values-pl/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot jest darmową aplikacją proxy która wspomaga inne aplikacje do używania internetu bezpiecznie. Orbot używa Tora do szyfrowania Twojego ruchu internetowego i następnie przepuszczania go przez wiele innych komputereów pororzucanych na całym świecie. Tor jest darmowym oprogramowaniem i otwartą siecią która pomaga Tobie w obronie przed monitoringiem sieci która zagrarza osobistej wolności i prywatności, poufnym biznesowym aktywnościom.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">włącz i wyłącz Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot startuje...</string>
+  <string name="status_activated">Podłączony do sieci Tor</string>
+  <string name="status_disabled">Orbot wyłączony</string>
+  <string name="status_shutting_down">TorService wyłącza się</string>
+  <string name="tor_process_starting">Uruchamianie klienta sieci Tor...</string>
+  <string name="tor_process_complete">gotowe.</string>
+  <string name="tor_process_waiting">czekaj.</string>
+  <string name="not_anonymous_yet">UWAGA: Twoja komunikacja nie jest jeszcze anonimowa! Proszę skonfiguruj aplikacje aby używały serwera proxy HTTP 127.0.0.1:8118 lub SOCKS4A lub SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Start</string>
+  <string name="menu_browse">Przeglądaj</string>
+  <string name="menu_settings">Ustawienia</string>
+  <string name="menu_log">Logi</string>
+  <string name="menu_info">Pomoc</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Start</string>
+  <string name="menu_stop">Stop</string>
+  <string name="menu_about">O programie</string>
+  <string name="menu_promo_apps">Zdobądź aplikacje</string>
+  <string name="main_layout_download">Pobieranie (prędkość/suma)</string>
+  <string name="main_layout_upload">Wysyłanie (prędkość/suma)</string>
+  <string name="button_help">Pomoc</string>
+  <string name="button_close">Zamknij</string>
+  <string name="button_about">O programie</string>
+  <string name="button_clear_log">Czyść dziennik</string>
+  <string name="menu_verify">Sprawdź</string>
+  <string name="menu_exit">Wyjście</string>
+  <string name="menu_scan">Skanuj BridgeQR</string>
+  <string name="menu_share_bridge">Podziel się BridgeQR</string>
+  <string name="press_to_start">- wciśnij na dłużej, by uruchomić -</string>
+  <string name="pref_trans_proxy_group">Przekierowanie przezroczyste (Wymaga uprawnień administratora)</string>
+  <string name="pref_trans_proxy_title">Przekierowanie przezroczyste</string>
+  <string name="pref_trans_proxy_summary">Automatyczne toryfikowanie aplikacji</string>
+  <string name="pref_transparent_all_title">Przepuść wszystko przez Tora</string>
+  <string name="pref_transparent_all_summary">Przekierowanie ruchu wszystkich aplikacji przez Tora</string>
+  <string name="pref_transparent_port_fallback_title">Zapasowy Port Proxy</string>
+  <string name="pref_transparent_port_fallback_summary">UWAGA: Unika powszechnych portów (80, 443, etc). *UŻYWAĆ TYLKO* gdy \'All\' lub tryb \'App\' nie działa.</string>
+  <string name="pref_transparent_port_title">Lista Portów</string>
+  <string name="pref_transparent_port_summary">Lista portów, które przechwytywać. *UŻYWAĆ TYLKO* gdy \'All\' lub tryb \'App\' nie działa.</string>
+  <string name="pref_transparent_port_dialog">Wpisz porty do przechwytywania</string>
+  <string name="pref_has_root">Żądaj dostępu administratora</string>
+  <string name="pref_has_root_summary">Żądaj dostępu administratora dla przezroczystego przekierowania</string>
+  <string name="status_install_success">Binarki Tora pomyślnie zainstalowane!</string>
+  <string name="status_install_fail">Nie można zainstalować plików binarnych Tora. Zajrzyj do dziennika i powiadom tor-assistants at torproject.org</string>
+  <string name="title_error">Błąd Aplikacji</string>
+  <string name="wizard_title">Witamy w Orbocie</string>
+  <string name="wizard_btn_tell_me_more">O Orbocie</string>
+  <string name="btn_next">Dalej</string>
+  <string name="btn_back">wstecz</string>
+  <string name="btn_finish">Koniec</string>
+  <string name="btn_okay">OK</string>
+  <string name="btn_cancel">Anuluj</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Niektóre szczegóły o Orbocie</string>
+  <string name="wizard_details_msg">Orbot jest otwartą aplikacją zawierającą Tor, LibEvent i Polipo. Dostarcza lokalnego proxy HTTP (8118) i SOCKS proxy (9050) do sieci Tora. Orbot ma możliwość, na urządzeniu uruchomionym z prawami administratora, wysyłać cały ruch internetowy przez Tora.</string>
+  <string name="wizard_permissions_root">Dostęp zezwolony</string>
+  <string name="wizard_permissions_stock">Prawa dostepu Orbota</string>
+  <string name="wizard_premissions_msg_root">Doskonale! Odkryliśmy, że masz uprawnienia administratora włączone dla Orbota. Będziemy mądrze korzystać z tej władzy.</string>
+  <string name="wizard_permissions_msg_stock">Podczas gdy nie jest to wymagane, Orbot może stać się znacznie potężniejszym narzędziem, gdy masz prawa administratora na swoim urządzeniu. Użyj przycisku poniżej, by dać Orbotowi duży uprawnienia.</string>
+  <string name="wizard_permissions_no_root">Jeśli nie masz uprawnień administratora lub nie masz pojęcia, o czym mówimy, używaj aplikacji skonfigurowanych do pracy z Orbotem.</string>
+  <string name="wizard_permissions_consent">Rozumiem i chcę kontynuować bez uprawnień administratora</string>
+  <string name="wizard_permission_enable_root">Nadaj uprawnienia administratora Orbotowi</string>
+  <string name="wizard_configure">Skonfiguruj Toryfikację</string>
+  <string name="wizard_configure_msg">Orbot daje Ci możliwość przekierowania całego ruchu aplikacji przez Tora albo wybrania aplikacji pojedynczo.</string>
+  <string name="wizard_configure_all">Przekierowuj wszystkie aplikacje przez Tora</string>
+  <string name="wizard_configure_select_apps">Wybierz poszczególne aplikacje dla Tora</string>
+  <string name="wizard_tips_tricks">Aplikacje skonfigurowane dla Orbota</string>
+  <string name="wizard_tips_msg">Zachęcamy do pobierania i używania aplikacji, które wiedzą, jak łączyć się bezpośrednio z Orbotem. Kliknij na poniższe przyciski, by zainstalować.</string>
+  <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="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="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>
+  <string name="wizard_final">Orbot jest gotowy!</string>
+  <string name="wizard_final_msg">Miliony ludzi na całym świecie używają Tora z różnych powodów.\n\nDziennikarze i blogerzy, działacze na rzecz praw człowieka, stróże prawa, żołnierze, korporacje, obywatele represyjnych reżimów i zwykli obywatele... teraz Ty też możesz!</string>
+  <string name="wizard_exit_at_first_screen_toast">Proszę skonfiguruj Orbot zanim zaczniesz go uzywać!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Pomyślnie połączyłeś się do sieci Tor - ale to nie oznacza, że Twoje urządzenie jest bezpieczne. Możesz użyć przycisku \'Przeglądarka\' aby sprawdzić swoje połączenie. \n\nOdwiedź nas na https://guardianproject.info/apps/orbot lub wyślij nam maila na help at guardianproject.info aby dowiedzieć się więcej.</string>
+  <string name="tor_check">To otworzy Twoją domyślną przeglądarkę na adresie https://check.torproject.org w celu sprawdzenia, czy Orbot jest skonfigurowany i jest połączenie z Torem.</string>
+  <string name="pref_hs_group">Usługi ukryte</string>
+  <string name="pref_general_group">Ogólne</string>
+  <string name="pref_start_boot_title">Uruchamiaj Orbota przy starcie</string>
+  <string name="pref_start_boot_summary">Automatycznie uruchamiaj Orbota i łącz się z Torem, gdy Twoje urządzenie z Androidem się uruchomi</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot daje Tora Androidowi! Tor pomaga bronić się przed podsłuchem sieci znanym jako analiza ruchu, który zagraża wolności osobistej i prywatności, poufnym działaniom biznesowym i relacjami.\n\nTen kreator pomoże Ci skonfigurować Orbota i Tora na Twoim urządzeniu.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Ostrzeżenie</string>
+  <string name="wizard_warning_msg">Sama instalacja Orbota nie sprawi, że Twój mobilny ruch będzie całkiem anonimowy.\n\nMusisz wykonać poprawną konfigurację Orbota, Twojego urządzenia i innych aplikacji, aby skutecznie używać Tora.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Uprawnienia</string>
+  <string name="wizard_permissions_root_msg1">Możesz opcjonalnie przekazać darowiznę Orbotowi i otrzymać dostęp \'Superużytkownika\' aby włączyć zaawansowane funkcje, jak np. Transparentne Proxy.</string>
+  <string name="wizard_permissions_root_msg2">Jeśli nie chcesz tego robić, upewnij się by używać aplikacji stworzonych do pracy z Orbotem</string>
+  <string name="wizard_permissions_no_root_msg">Wygląda na to, że Twoje urządzenie nie ma praw administratora, lub nie posiada opcji \'Super użytkownika\'.\n\nZamiast tego prosimy o spróbowanie opcji \'Aplikacje\' na głównym ekranie.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox: Przeglądarka, która działa przez Tora</string>
+  <string name="wizard_tips_play">Znajdź wszystkie aplikacje Guardian Project na Google Play</string>
+  <string name="wizard_tips_fdroid">Zobacz wszystkie aplikacje Guardian Project na F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Zobacz wszystkie aplikacje Guardian Project na https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparentne Proxy</string>
+  <string name="wizard_transproxy_msg">To pozwala Twojej aplikacji na automatyczne połączenie przez Sieć Tor bez żadnej konfiguracji.</string>
+  <string name="wizard_transproxy_hint">(Sprawdź tutaj, jeśli nie masz pojęcia o czym mówimy)</string>
+  <string name="wizard_transproxy_none">Brak</string>
+  <string name="pref_transparent_tethering_title">Przywiązywanie Tora</string>
+  <string name="pref_transparent_tethering_summary">Włącz Transparentne Proxy Tora dla Wifi i USB (wymaga restartu)</string>
+  <string name="button_grant_superuser">Żądanie dostępu Superużytkownika</string>
+  <string name="pref_select_apps">Wybierz aplikacje</string>
+  <string name="pref_select_apps_summary">Wybierz aplikacje do przejścia przez Tor</string>
+  <string name="pref_node_configuration">Konfiguracja węzła</string>
+  <string name="pref_node_configuration_summary">Są to zaawansowane ustawienia, które mogą zmniejszyć Twoją anonimowość</string>
+  <string name="pref_entrance_node">Węzły wejściowe</string>
+  <string name="pref_entrance_node_summary">Odciski palców, nicki, państwa i adresy na pierwszy raz</string>
+  <string name="pref_entrance_node_dialog">Wpisz Węzły Wejściowe</string>
+  <string name="pref_allow_background_starts_title">Pozwól na start z tle</string>
+  <string name="pref_allow_background_starts_summary">Pozwól każdej aplikacji powiedzieć, aby Orbot uruchomił Tor i inne związane z nim usługi</string>
+  <string name="button_proxy_all">Przepuszczaj wszystko przez proxy</string>
+  <string name="button_proxy_none">Nie przepuszczaj niczego przez proxy</string>
+  <string name="button_invert_selection">Odwróć zaznaczone</string>
+  <string name="pref_proxy_title">Wychodzący serwer sieciowy proxy</string>
+  <string name="pref_proxy_type_title">Wychodzące Typy Proxy</string>
+  <string name="pref_proxy_type_summary">Protokół używany dla serwera proxy: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Wpis Typ Proxy</string>
+  <string name="pref_proxy_host_title">Wychodzący Proxy Host</string>
+  <string name="pref_proxy_host_summary">Nazwa hosta serwera proxy</string>
+  <string name="pref_proxy_host_dialog">Wpisz Hosta Proxy</string>
+  <string name="pref_proxy_port_title">Wychodzące Porty Proxy</string>
+  <string name="pref_proxy_port_summary">Port serwera Proxy</string>
+  <string name="pref_proxy_port_dialog">Wpisz port Proxy</string>
+  <string name="pref_proxy_username_title">Nazwa użytkownika Wychodzącego Proxy</string>
+  <string name="pref_proxy_username_summary">Nazwa użytkownika proxy (opcjonalna)</string>
+  <string name="pref_proxy_username_dialog">Wpisz nazwę użytkownika Proxy</string>
+  <string name="pref_proxy_password_title">Hasło Wychodzącego Proxy</string>
+  <string name="pref_proxy_password_summary">Hasło Proxy (opcjonalne)</string>
+  <string name="pref_proxy_password_dialog">Wpisz hasło Proxy</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Ustawianie w pełni transparentnego proxy...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Ustawianie bazującego na aplikacji transparentnego proxy</string>
+  <string name="transparent_proxying_enabled">Transparentne proxy WŁĄCZONE</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy podłączone do modemu!</string>
+  <string name="warning_error_starting_transparent_proxying_">OSTRZEŻENIE: błąd w uruchamianiu transparentnego proxy!</string>
+  <string name="transproxy_rules_cleared">TransProxy działa czysto</string>
+  <string name="couldn_t_start_tor_process_">Nie można było zainicjować procesu Tora:</string>
+  <string name="privoxy_is_running_on_port_">Polipo działa na porcie:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Ustawianie bazującego na porcie transparentnego proxy</string>
+  <string name="bridge_error">Błąd mostka</string>
+  <string name="bridge_requires_ip">Aby użyć funkcji mostka, musisz wpisać przynajmniej jeden adres IP mostka.</string>
+  <string name="send_email_for_bridges">Wyślij e-mail do bridges at torproject.org pisząc w treści \"get bridges\" z konta gmail.</string>
+  <string name="error">Błąd</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Twoje ustawienia dostępnych adresów spowodowały wyjątek!</string>
+  <string name="your_relay_settings_caused_an_exception_">Ustawienia Twojego przekaźnika spowodowały wyjątek!</string>
+  <string name="exit_nodes">Węzły Wyjściowe</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Odciski palców, nicki, państwa i adresy na ostatni skok</string>
+  <string name="enter_exit_nodes">Wpisz węzły wyjściowe.</string>
+  <string name="exclude_nodes">Wyklucz węzły</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Odciski palców, nicki, państwa i adresy do wykluczenia.</string>
+  <string name="enter_exclude_nodes">Wpisz wykluczone węzły.</string>
+  <string name="strict_nodes">Ścisłe węzły</string>
+  <string name="use_only_these_specified_nodes">Użyj *tylko* tych określonych węzłów</string>
+  <string name="bridges">Mostki</string>
+  <string name="use_bridges">Użyj mostków</string>
+  <string name="bridges_obfuscated">UUtajnione Mostki</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Umożliw alternatywne wejściowe węzły do Sieci Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Włącz, jeśli skonfigurowane mostki są ukrytymi mostkami</string>
+  <string name="ip_address_and_port_of_bridges">Adres IP i port mostków</string>
+  <string name="enter_bridge_addresses">Wpisz adresy mostków</string>
+  <string name="relays">Przekaźniki</string>
+  <string name="relaying">Przekazywanie</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Pozwól swojemu urządzeniu zostać bezwyjściowym przekaźnikiem</string>
+  <string name="relay_port">Port Przekaźników</string>
+  <string name="listening_port_for_your_tor_relay">Nasłuchiwanie portu Twojego przekaźnika</string>
+  <string name="enter_or_port">Wpisz port OR</string>
+  <string name="relay_nickname">Nick przekaźnika</string>
+  <string name="the_nickname_for_your_tor_relay">Nick Twojego przekaźnika Tora</string>
+  <string name="enter_a_custom_relay_nickname">Wpisz standardową nazwę przekaźnika</string>
+  <string name="reachable_addresses">Osiągalne adresy:</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Włącz jako klienta za firewallem z restrykcyjną polityką</string>
+  <string name="reachable_ports">Osiągalne porty</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Porty dostępne za ograniczającym firewallem</string>
+  <string name="enter_ports">Wpisz porty</string>
+  <string name="enable_hidden_services">Włącz Ukryte Serwisy</string>
+  <string name="run_servers_accessible_via_the_tor_network">włącz serwisy dostępne przez Sieć Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">wpisz porty localhosta dla ukrytych serwisów</string>
+  <string name="hidden_service_ports">Porty Ukrytych Serwisów</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">adresowana nazwa dla Twojego ukrytego serwisu (generowana automatycznie)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">włącz zdebugowany log do wydajności (musisz używać adb lub aLogCat, by go zobaczyć)</string>
+  <string name="project_home">Strony domowe projektu:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Licencja Tora</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Oprogramowanie 3rd-Party</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Aplikacja chce otworzyć port ukrytego serwera %S do Sieci Tor. Jest to bezpieczne, jeśli ufasz aplikacji.</string>
+  <string name="found_existing_tor_process">znaleziono istniejący proces Tora...</string>
+  <string name="something_bad_happened">Coś nie poszło nie tak. Sprawdź logi</string>
+  <string name="hidden_service_on">ukryty serwis:</string>
+  <string name="unable_to_read_hidden_service_name">uniemożliw czytanie nazw ukrytych serwisów</string>
+  <string name="unable_to_start_tor">Nie można wystartować aplikacji Tor:</string>
+  <string name="unable_to_reset_tor">Zrestartuj swoje urządzenie, nie można zrestartować Tora!</string>
+  <string name="pref_use_sys_iptables_title">Użyj domyślnie Iptables</string>
+  <string name="pref_use_sys_iptables_summary">użyj wbudowanych plików binarnych iptables zamiast tych w pakiecie z Orbotem</string>
+  <string name="error_installing_binares">Pliki binarne Tora nie zostały zainstalowane lub uaktualnione.</string>
+  <string name="pref_use_persistent_notifications">Zawsze trzymaj ikonę w pasku powiadomień gdy Orbot jest połączony</string>
+  <string name="pref_use_persistent_notifications_title">Powiadomienia zawsze aktywne</string>
+  <string name="pref_use_expanded_notifications">Pokaż rozszerzone powiadomienie z krajem Tor exit node oraz jego IP</string>
+  <string name="pref_use_expanded_notifications_title">Rozszerzone Powiadomienia</string>
+  <string name="notification_using_bridges">Mostki włączone!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Język</string>
+  <string name="set_locale_summary">Wybierz ustawienia regionalne i język dla Orbota</string>
+  <string name="wizard_locale_title">Wybierz język</string>
+  <string name="wizard_locale_msg">Zostaw domyślny albo zmień język</string>
+  <string name="powered_by">napędzane oprogramowaniem Projektu Tor</string>
+  <string name="btn_save_settings">Zapisz ustawienia</string>
+  <string name="no_internet_connection_tor">Brak połączenia internetowego; Tor jest w trybie oczekiwania...</string>
+  <string name="bandwidth_">Przepustowość:</string>
+  <string name="down">pobieranie</string>
+  <string name="up">wysyłanie</string>
+  <string name="pref_disable_network_title">Brak Auto-Uśpienia Sieci</string>
+  <string name="pref_disable_network_summary">Ustaw Tor\'a w tryb uśpienia kiedy połączenie internetowe będzie niedostępne</string>
+  <string name="newnym">Nowa tożsamość Tor\'a została zmieniona!</string>
+  <string name="menu_verify_browser">Przeglądarka</string>
+  <string name="menu_use_chatsecure">Użyj ChatSecure</string>
+  <string name="permission_manage_tor_label">Administruj Tor\'em</string>
+  <string name="permission_manage_tor_description">Pozwól tej aplikacji kontrolować serwis Tor</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Wygląda na to, że nie masz zainstalowanej Orfoxa. Chcesz abyśmy Ci pomogli, czy chcesz abyśmy otworzyli to w przeglądarce?</string>
+  <string name="install_apps_">Zainstalować aplikacje?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Brak połączenia internetowego. Tor będzie w trybie snu...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Połączenie internetowe jest dobre. Trwa budzenie Tora...</string>
+  <string name="updating_settings_in_tor_service">aktualizowanie ustawień w serwisie Tor</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Port który oferuje SOCKS proxy (domyślnie: 9050 lub 0, aby wyłączyć)</string>
+  <string name="pref_socks_dialog">Konfiguracja portu SOCKS</string>
+  <string name="pref_transport_title">Tor TransProxy Port</string>
+  <string name="pref_transport_summary">Port który oferuje Transparent Proxy (domyślnie: 9040 lub 0, aby wyłączyć)</string>
+  <string name="pref_transport_dialog">Konfiguracja portu TransProxy</string>
+  <string name="pref_dnsport_title">Tor DNS Port</string>
+  <string name="pref_dnsport_summary">Port na którym Tor oferuje swój DNS (domyślnie: 5400 lub 0, aby wyłączyć)</string>
+  <string name="pref_dnsport_dialog">Konfiguracja portu DNS</string>
+  <string name="pref_torrc_title">Konfiguracja Torrc klienta</string>
+  <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="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>
+  <string name="pref_transproxy_refresh_title">Transproxy Auto-Odśwież</string>
+  <string name="pref_transproxy_refresh_summary">Zaztosuj ustawienia Transproxy kiedy stan sieci zmieni się</string>
+  <string name="pref_transproxy_flush_title">Transproxy WYMUŚ USUNIĘCIE</string>
+  <string name="pref_transproxy_flush_summary">Dotknij tutaj, aby wyczyścić wszystkie zasady sieciowe transproxy TERAZ</string>
+  <string name="transparent_proxy_rules_flushed_">Ustawienia Transproxy zostały wyczyszczone!</string>
+  <string name="you_do_not_have_root_access_enabled">Nie masz praw użytkownika root.</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Możesz zatrzymać i uruchomić ponownie Orbota, aby zmiany ustawień weszły w życie.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Zaktualizowane Bridges</string>
+  <string name="restart_orbot_to_use_this_bridge_">Proszę zrestartować Orbot, aby zmiany mogły wejść w życie</string>
+  <string name="menu_qr">Kody QR</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Jeśli Twoja sieć telefoniczna aktywnie blokuje Tora, to możesz używać Bridge., aby połączyć się z siecią. WYBIERZ jeden typ bridge powyżej, aby włączyć bridges.</string>
+  <string name="bridge_mode">Tryb Bridge</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Aktywuj</string>
+  <string name="apps_mode">Tryb VPN Aplikacji</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Możesz włączyć opcję dla wszystkich aplikacji, tak, aby ich ruch internetowy był przepuszczany przez sieć Tor używając do tego opcji VPN w Androidzie.\n\n*UWAGA* Jest to nowa, eksperymentalana opcja i w niektórych przypadkach może ona nie uruchomić się automatycznie, lub może się zatrzymać. Opcja ta NIE POWINNA być używana w celach uzyskania anonimowości, a TYLKO wyłącznie w celu ominięcia firewalli i filtrów.</string>
+  <string name="send_email">Wyślij Email</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Możesz uzyskać adres Bridge poprzez email, internet, lub poprzez zeskanowanie kodu QR. Wybierz \'Email\' lub \'Internet\' poniżej, aby poprosić o adres bridge\'a.\n\nJak już będziesz mieć ten adres to skopiuj i wklej go do \"Bridges\" we właściwościach Orbota a następnie go zrestartuj.</string>
+  <string name="install_orweb">Zainstaluj Orfox</string>
+  <string name="standard_browser">Standardowa przeglądarka</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">UWAGA: Tylko standardowe bridges działają na urządzeniach z Intel X86/ATOM.</string>
+  <string name="vpn_default_world">Świat</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-ps/strings.xml b/orbotservice/src/main/res/values-ps/strings.xml
new file mode 100644
index 0000000..844f834
--- /dev/null
+++ b/orbotservice/src/main/res/values-ps/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-pt-rBR/strings.xml b/orbotservice/src/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..b23e304
--- /dev/null
+++ b/orbotservice/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot é um aplicativo de proxy livre que capacita outros aplicativos a usar a internet com mais segurança. Orbot usa o Tor para criptografar seu tráfego na internet e então o esconde \"saltando\" entre uma série de computadores ao redor do mundo. Tor é um software livre e de rede aberta que ajuda você a se defender de certas formas de vigilância que ameaçam privacidade e liberdade pessoais, atividades e relações comerciais confidenciais e segurança estatal conhecida como análise de tráfego.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">iniciar e parar o Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot está iniciando...</string>
+  <string name="status_activated">Conectado à rede Tor</string>
+  <string name="status_disabled">Orbot está desativado</string>
+  <string name="status_shutting_down">TorService está desligando</string>
+  <string name="tor_process_starting">Iniciando cliente Tor...</string>
+  <string name="tor_process_complete">completo.</string>
+  <string name="tor_process_waiting">esperando.</string>
+  <string name="not_anonymous_yet">AVISO: Seu tráfego não é anônimo ainda! Por favor, configure suas aplicações para usar proxy HTTP 127.0.0.1:8118 ou proxy SOCKS4A ou SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Início</string>
+  <string name="menu_browse">Procurar</string>
+  <string name="menu_settings">Configurações</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Ajuda</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Iniciar</string>
+  <string name="menu_stop">Parar</string>
+  <string name="menu_about">Sobre</string>
+  <string name="menu_promo_apps">Obter aplicativos...</string>
+  <string name="main_layout_download">Download</string>
+  <string name="main_layout_upload">Upload</string>
+  <string name="button_help">Ajuda</string>
+  <string name="button_close">Fechar</string>
+  <string name="button_about">Sobre</string>
+  <string name="button_clear_log">Limpar Log</string>
+  <string name="menu_verify">Checar</string>
+  <string name="menu_exit">Sair</string>
+  <string name="menu_scan">Escanear BridgeQR</string>
+  <string name="menu_share_bridge">Compartilhar BridgeQR</string>
+  <string name="press_to_start">- clique longo para iniciar -</string>
+  <string name="pref_trans_proxy_group">Proxying Transparente (Requer Root)</string>
+  <string name="pref_trans_proxy_title">Proxying Transparente</string>
+  <string name="pref_trans_proxy_summary">Automaticamente Torificar Apps</string>
+  <string name="pref_transparent_all_title">Tor Tudo</string>
+  <string name="pref_transparent_all_summary">Tráfego proxy para todos apps através do Tor</string>
+  <string name="pref_transparent_port_fallback_title">Porta do Proxy Reserva</string>
+  <string name="pref_transparent_port_fallback_summary">AVISO: Evite as portas comuns (80,443, etc). *USE SOMENTE* se o modo \'Todos\' ou \'App\' não funcionou.</string>
+  <string name="pref_transparent_port_title">Lista de Portas</string>
+  <string name="pref_transparent_port_summary">Lista de portas para proxy. *USE SOMENTE* se o modo \'Todos\' ou \'App\' não funcionou</string>
+  <string name="pref_transparent_port_dialog">Insira as portas para proxy</string>
+  <string name="pref_has_root">Requer Acesso Root</string>
+  <string name="pref_has_root_summary">Requer acesso root para proxy transparente</string>
+  <string name="status_install_success">Binário do Tor instalados com sucesso!</string>
+  <string name="status_install_fail">Os arquivos binários do Tor estão inaptos à serem instalados. Por favor, cheque o log e notifique tor-assistants at torproject.org</string>
+  <string name="title_error">Erro de Aplicação</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Sobre Orbot</string>
+  <string name="btn_next">Próximo</string>
+  <string name="btn_back">Voltar</string>
+  <string name="btn_finish">Terminar</string>
+  <string name="btn_okay">Okay</string>
+  <string name="btn_cancel">Cancelar</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Alguns detalhes do Orbot</string>
+  <string name="wizard_details_msg">Orbot é uma aplicação de código aberto que contém Tor, libEvent e Polipo. Ela provê um proxy HTTP local (8118) e um proxy SOCKS (9050) dentro da rede Tor. Orbot também tem a a habilidade, num dispositivo de com acesso root, de enviar todo o tráfego de internet através do Tor.</string>
+  <string name="wizard_permissions_root">Permissão Concedida</string>
+  <string name="wizard_permissions_stock">Permissões do Orbot</string>
+  <string name="wizard_premissions_msg_root">Excelente! Detectamos que você habilitou permissões de root para Orbot. Nós usaremos este poder com sabedoria.</string>
+  <string name="wizard_permissions_msg_stock"> Enquanto não é requerido, o Orbot pode se tornar uma ferramenta mais poderosa se seu dispositivo tivesse acesso root. Use o botão abaixo para conceder superpoderes ao Orbot! </string>
+  <string name="wizard_permissions_no_root">Se você não tem acesso root ou não tem idéia sobre o que estamos falando, só tenha a certeza de usar apps feitas para trabalhar com o Orbot.</string>
+  <string name="wizard_permissions_consent">Eu entendo e gostaria de continuar sem o Superusuário</string>
+  <string name="wizard_permission_enable_root">Conceder acesso Root ao Orbot</string>
+  <string name="wizard_configure">Configurar Torificação</string>
+  <string name="wizard_configure_msg">Orbot dá a você a opção de rotear todo o tráfego de aplicação através do Tor OU para escolher suas aplicações individualmente.</string>
+  <string name="wizard_configure_all">Usar Proxy para Todas Apps Através do Tor</string>
+  <string name="wizard_configure_select_apps">Selecionar Apps Individuais para o Tor</string>
+  <string name="wizard_tips_tricks">Apps habilitadas para Orbot</string>
+  <string name="wizard_tips_msg">As apps abaixo foram desenvolvidas para trabalhar com Orbot. Clique em cada botão para instalar agora, ou você pode encontrá-las posteriormente no Android Market.</string>
+  <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="wizard_tips_twitter">Define o proxy do Twitter para \"localhost\" e a porta 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Faça uma história e deixe-a para o tor por segurança!</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>
+  <string name="wizard_proxy_help_msg">Se a app Android que você está usando puder suportar o uso de proxy HTTP ou SOCKS, então você pode configurar para conectar ao Orbot e usar o Tor. As configurações de host são 127.0.0.1 ou \"localhost\". Para HTTP, a porta configurada é 8118. Para SOCKS, o proxy é 9050. Você deve usar SOCKS4A ou SOCKS5 se possível. Você pode aprender mais sobre proxy no Android através do FAQ em: http://tinyurl.com/proxyandroid</string>
+  <string name="wizard_final">Orbot está pronto!</string>
+  <string name="wizard_final_msg">Centenas de milhares de pessoas ao redor do mundo usam o Tor por uma enorme variedade de razões. Jornalistas e bloggers, defensores dos direitos humanos, oficiais da lei, soldados, corporações, cidadãos em regimes repressivos, e somente cidadãos comuns... e agora você está pronto para usar, também! </string>
+  <string name="wizard_exit_at_first_screen_toast">Por favor, configure o Orbot antes de começar a usá-lo!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Você se conectou à rede Tor com sucesso - mas isto NÃO significa que seu dispositivo é seguro. Você pode usar a opção \'Checar\' no menu para testar seu navegador. Visite-nos em https://guardianproject.info/apps/orbot ou envie um e-mail para help at guardianproject.info para saber mais.</string>
+  <string name="tor_check">Isto irá abrir seu navegador web em https://check.torproject.org com o intuito de ver se o Orbot está provavelmente configurado e você está conectado ao Tor.</string>
+  <string name="pref_hs_group">Serviços Ocultos</string>
+  <string name="pref_general_group">Geral</string>
+  <string name="pref_start_boot_title">Iniciar Orbot no Boot</string>
+  <string name="pref_start_boot_summary">Automaticamente iniciar o Orbot e conectar o Tor quando seu Android bootar.</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot trouxe Tor para Android!! Tor ajuda você a se defender contra filtro de conteúdo, análises de tráfego e vigilância de rede que ameaçam sua privacidade, informação confidencial e relacionamentos pessoais. Este assistente irá ajudá-lo a configurar o Orbot e Tor no seu dispositivo.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Aviso</string>
+  <string name="wizard_warning_msg">Simplesmente instalando o Orbot não irá automaticamente anonimizar seu tráfego móvel. Você deve configurar apropriadamente o Orbot, seu dispositivo e outras apps para usar o Tor com sucesso.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permissões</string>
+  <string name="wizard_permissions_root_msg1">Você pode opcionalmente garantir ao Orbot acesso de \'Superusuário\' para habilitar recursos avançados, como um proxy transparente.</string>
+  <string name="wizard_permissions_root_msg2">Se você não quiser fazer isto, tenha certeza de usar apps feitas para trabalhar com o Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Seu dispositivo não parece ser roteado ou prover um acesso \'Superusuário\'. De maneira a você se beneficiar do Tor, você precisará usar apps criadas para trabalhar com o Orbot, ou que suportem configurações de proxy HTTP ou SOCKS. </string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox: navegador de privacidade aprimorada que funciona através do Tor</string>
+  <string name="wizard_tips_play">Encontre todos os aplicativos da Guardian Project no Google Play</string>
+  <string name="wizard_tips_fdroid">Encontre todos os aplicativos da Guardian Project no F-Droid </string>
+  <string name="wizard_tips_fdroid_org">Encontre todos os aplicativos da Guardian Project no https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxy Transparente</string>
+  <string name="wizard_transproxy_msg">Isto permite à suas apps automaticamente rodarem através da rede Tor sem nenhuma configuração.</string>
+  <string name="wizard_transproxy_hint">(Selecione esta caixa se você não souber do que estamos falando)</string>
+  <string name="wizard_transproxy_none">Nenhum</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Habilitar Proxy Transparente para Tor Dispositivos de Toque Wifi e Usb (requer reinicialização)</string>
+  <string name="button_grant_superuser">Acesso Superusuário Requerido</string>
+  <string name="pref_select_apps">Selecionar Apps</string>
+  <string name="pref_select_apps_summary">Escolha as Apps para Rotearem Através do Tor</string>
+  <string name="pref_node_configuration">Configuração de Nó</string>
+  <string name="pref_node_configuration_summary">Aqui estão as configurações avançadas que podem reduzir seu anonimato.</string>
+  <string name="pref_entrance_node">Nós de Entrada</string>
+  <string name="pref_entrance_node_summary">Impressões digitais, apelidos, países e endereços para a primeira etapa</string>
+  <string name="pref_entrance_node_dialog">Insira os Nós de Entrada</string>
+  <string name="pref_allow_background_starts_title">Permitir estrelas em segundo plano</string>
+  <string name="button_proxy_all">Todo o Proxy</string>
+  <string name="button_proxy_none">Nenhum Proxy</string>
+  <string name="button_invert_selection">Inverter Sele</string>
+  <string name="pref_proxy_title">Proxy de saída da rede (Opcional)</string>
+  <string name="pref_proxy_type_title">Tipo de Proxy</string>
+  <string name="pref_proxy_type_summary">Protocolo para usar no servidor proxy: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Insira o Tipo de Proxy</string>
+  <string name="pref_proxy_host_title">Proxy Host</string>
+  <string name="pref_proxy_host_summary">Endereço do servidor Proxy</string>
+  <string name="pref_proxy_host_dialog">Insira o Host do Proxy</string>
+  <string name="pref_proxy_port_title">Porta do Proxy</string>
+  <string name="pref_proxy_port_summary">Porta do servidor Proxy</string>
+  <string name="pref_proxy_port_dialog">Insira a porta do Proxy</string>
+  <string name="pref_proxy_username_title">Nome de usuário do Proxy de saída</string>
+  <string name="pref_proxy_username_summary">Nome de usuário do Proxy (Opcional)</string>
+  <string name="pref_proxy_username_dialog">Digite o nome de usuário do Proxy</string>
+  <string name="pref_proxy_password_title">Senha do Proxy de saída</string>
+  <string name="pref_proxy_password_summary">Senha do Proxy (Opcional)</string>
+  <string name="pref_proxy_password_dialog">Digite a senha do Proxy</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Configurando proxy com total transparência...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Configurando apps baseadas em transparência de proxy...</string>
+  <string name="transparent_proxying_enabled">Proxy Transparente HABILITADO</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy habilitado para Toque!</string>
+  <string name="warning_error_starting_transparent_proxying_">AVISO: erro ao iniciar o proxy transparente!</string>
+  <string name="transproxy_rules_cleared">Regras TransProxy limpas</string>
+  <string name="couldn_t_start_tor_process_">Não foi possível iniciar o processo Tor: </string>
+  <string name="privoxy_is_running_on_port_">Polipo está rodando na porta:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Configurando proxy transparente baseado em porta...</string>
+  <string name="bridge_error">Erro na Ponte</string>
+  <string name="bridge_requires_ip">Como condição para usar o recurso de ponte, você deve inserir pelo menos um endereço IP de ponte.</string>
+  <string name="send_email_for_bridges">Envie um email para bridges at torproject.org com a linha \"get bridges\" sozinha no corpo do e-mail, a partir de uma conta do gmail</string>
+  <string name="error">Erro</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Suas configurações de Endereços Acessíveis causou uma exceção!</string>
+  <string name="your_relay_settings_caused_an_exception_">Suas configurações de retransmissão causaram uma exceção!</string>
+  <string name="exit_nodes">Nós de Saída</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Impressões digitais, apelidos, países e endereços para a última etapa.</string>
+  <string name="enter_exit_nodes">Insira os Nós de Saída</string>
+  <string name="exclude_nodes">Nós Excluídos</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Impressões digitais, apelidos, países e endereços para excluir</string>
+  <string name="enter_exclude_nodes">Insira Nós Excluídos</string>
+  <string name="strict_nodes">Nós Estritos</string>
+  <string name="use_only_these_specified_nodes">Use *somente* estes nós específicos</string>
+  <string name="bridges">Pontes</string>
+  <string name="use_bridges">Usar pontes</string>
+  <string name="bridges_obfuscated">Pontes Ofuscadas</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilitar nós de entrada alternativos dentro da rede Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilitar se pontes configuradas forem pontes ofuscadas</string>
+  <string name="ip_address_and_port_of_bridges">Endereço IP e porta das pontes</string>
+  <string name="enter_bridge_addresses">Insira os Endereços das Pontes</string>
+  <string name="relays">Retransmissores</string>
+  <string name="relaying">Retransmitindo</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Habilitar seu dispositivo para não ser um retransmissor de saída</string>
+  <string name="relay_port">Porta Retransmissora</string>
+  <string name="listening_port_for_your_tor_relay">Ouvindo porta do seu retransmissor Tor</string>
+  <string name="enter_or_port">Insira porta OR</string>
+  <string name="relay_nickname">Apelido do Retransmissor</string>
+  <string name="the_nickname_for_your_tor_relay">O apelido para seu retransmissor Tor</string>
+  <string name="enter_a_custom_relay_nickname">Insira um apelido de retransmissor customizado</string>
+  <string name="reachable_addresses">Endereços Atingíveis</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Rodar como um cliente atrás de um firewall com políticas restritivas.</string>
+  <string name="reachable_ports">Portas Atingíveis</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Portas atingíveis atrás de um firewall restritivo</string>
+  <string name="enter_ports">Insira as portas</string>
+  <string name="enable_hidden_services">Habilitar Serviços Ocultos</string>
+  <string name="run_servers_accessible_via_the_tor_network">rodar servidores acessíveis via rede Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">insira as portas local para serviços ocultos</string>
+  <string name="hidden_service_ports">Portas de Serviço Oculto</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">o nome enderessável para seu serviço oculto (gerado automaticamente)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">habilitar debug log para saída (deve usar adb ou aLogCat para ver)</string>
+  <string name="project_home">Home(s) do Projeto: </string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">A Licença Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Software de Terceiros</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Uma app quer abrir a porta %S oculta do servidor para a rede Tor. Isto é seguro se você confia na app.</string>
+  <string name="found_existing_tor_process">procurando processos Tor existentes...</string>
+  <string name="something_bad_happened">Algo ruim aconteceu. Cheque o lo</string>
+  <string name="hidden_service_on">serviço oculto em:</string>
+  <string name="unable_to_read_hidden_service_name">habilitar ler o nome do serviço oculto</string>
+  <string name="unable_to_start_tor">Habilitar iniciar o Tor:</string>
+  <string name="unable_to_reset_tor">Reinicie seu dispositivo, incapaz de resetar Tor!</string>
+  <string name="pref_use_sys_iptables_title">Usar tabelas de IP padrão:</string>
+  <string name="pref_use_sys_iptables_summary">usar as tabelas ip binárias embutidas ao invés das tabelas do pacote Orbot</string>
+  <string name="error_installing_binares">Os binários Tor não estão disponíveis para serem instalados ou atualizados.</string>
+  <string name="pref_use_persistent_notifications">Sempre manter o ícone na barra de tarefas quando o Orbot está conectado</string>
+  <string name="pref_use_persistent_notifications_title">Notificações Sempre Ligadas</string>
+  <string name="pref_use_expanded_notifications">Mostrar notificação expandida com Tor país de saída e IP</string>
+  <string name="pref_use_expanded_notifications_title">Notificações Expandidas</string>
+  <string name="notification_using_bridges">Pontes habilitadas!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Idioma</string>
+  <string name="set_locale_summary">Escolha o local e idioma para o Orbot</string>
+  <string name="wizard_locale_title">Escolha o Idioma</string>
+  <string name="wizard_locale_msg">Deixe o padrão ou troque o idioma atual</string>
+  <string name="powered_by">distribuído por Tor</string>
+  <string name="btn_save_settings">Salvar Configurações</string>
+  <string name="no_internet_connection_tor">Sem conexão na internet; Tor está na espera...</string>
+  <string name="bandwidth_">Largura de banda:</string>
+  <string name="down">down</string>
+  <string name="up">up</string>
+  <string name="pref_disable_network_title">Modo de espera automático</string>
+  <string name="pref_disable_network_summary">Colocar o Tor em modo de espera quando não houver acesso Internet disponível</string>
+  <string name="newnym">Você trocou para uma nova identidade Tor!</string>
+  <string name="menu_verify_browser">Navegador</string>
+  <string name="menu_use_chatsecure">Usar ChatSecure</string>
+  <string name="permission_manage_tor_label">Gerenciar Tor</string>
+  <string name="permission_manage_tor_description">Habilitar este app a controlar o serviço Tor</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Parece que você não tem o Orweb instalado. Quer ajuda com isso ou devemos apenas abrir o navegador?</string>
+  <string name="install_apps_">Instalar apps?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Sem conectividade na rede. Colocando o Tor para dormir...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Conectividade da rede está boa. Acordando Tor</string>
+  <string name="updating_settings_in_tor_service">atualizando configurações no serviço Tor</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Porta que Tor oferece seu proxy SOCKS (padrão: 9050 ou 0 para desativar)</string>
+  <string name="pref_socks_dialog">Config da Porta SOCKS</string>
+  <string name="pref_transport_title">Porta TransProxy Tor</string>
+  <string name="pref_transport_summary">Porta que Tor oferece seu Proxy Transparente no (padrão: 9040 ou 0 para desativar)</string>
+  <string name="pref_transport_dialog">Config da Porta TransProxy</string>
+  <string name="pref_dnsport_title">Porta DNS Tor</string>
+  <string name="pref_dnsport_summary">Porta que Tor oferece seu DNS no (padrão: 5400 ou 0 para desativar)</string>
+  <string name="pref_dnsport_dialog">Config da Porta DNS</string>
+  <string name="pref_torrc_title">Config Personalizada do Torrc</string>
+  <string name="pref_torrc_dialog">Torrc Personalizado</string>
+  <string name="your_tor_public_ips_">Seus IPs Públicos do Tor:</string>
+  <string name="app_conflict">Conflito de aplicattivo</string>
+  <string name="pref_transproxy_flush_title">Transproxy FORÇAR REMOÇÃO</string>
+  <string name="you_do_not_have_root_access_enabled">Você não tem acesso root ativado</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Você pode precisar parar e iniciar Orbot para as configurações de mudar para ser ativado.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Pontes Atualizadas</string>
+  <string name="restart_orbot_to_use_this_bridge_">Por favor reinicie Orbot para habilitar as mundanças</string>
+  <string name="menu_qr">QR Codes</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Se a sua rede móvel ativamente blocos Tor, você pode usar uma ponte para acessar a rede. Selecione um dos tipos de pontes acima, para permitir pontes.</string>
+  <string name="bridge_mode">Modo Ponte</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Atvar</string>
+  <string name="apps_mode">Modo Apps VPN</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Você pode permitir que todos os aplicativos em seu dispositivo para executar através da rede Tor usando o recurso VPN do Android.\n\n*AVISO* Esta é uma característica nova, experimental e em alguns casos pode não começar automaticamente, ou pode parar.   Não deve ser usado para manter o anonimato, e serão utilizadas apenas para obter através de firewalls e filtros.</string>
+  <string name="send_email">Enviar Email</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Você pode obter um endereço de ponte através de e-mail, web ou lendo um código QR ponte. Selecione \'E-mail\' ou \'Web\' abaixo para solicitar uma ponte endereço. \n\nUma vez que você tem um endereço, copie & colá-lo na "Bridges" preferência na configuração e reiniciar do Orbot.</string>
+  <string name="install_orweb">Instalar Orfox</string>
+  <string name="standard_browser">Navegador Padrão</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTA: Apenas pontes Tor padrão funcionam em dispositivos Atom/Intel X86</string>
+  <string name="vpn_default_world">Mundo</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-pt-rPT/strings.xml b/orbotservice/src/main/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..20ba24b
--- /dev/null
+++ b/orbotservice/src/main/res/values-pt-rPT/strings.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="wizard_title">Orbot</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-pt/strings.xml b/orbotservice/src/main/res/values-pt/strings.xml
new file mode 100644
index 0000000..69f7a77
--- /dev/null
+++ b/orbotservice/src/main/res/values-pt/strings.xml
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">iniciar e parar Tor</string>
+  <string name="tor_proxy_service_process">serviço proxy Tor</string>
+  <string name="status_starting_up">O Orbot está a iniciar...</string>
+  <string name="status_activated">Conetado à rede Tor</string>
+  <string name="status_disabled">O Orbot está desativado</string>
+  <string name="tor_process_starting">A iniciar o cliente Tor...</string>
+  <string name="tor_process_complete">completo.</string>
+  <string name="tor_process_waiting">a aguardar.</string>
+  <string name="not_anonymous_yet">AVISO: O seu tráfego não está anónimo! Por favor, configure as suas aplicações para utilizarem o proxy HTTP 127.0.0.1:8118 ou o proxy SOCKS4A ou SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Início</string>
+  <string name="menu_browse">Explorar</string>
+  <string name="menu_settings">Configurações</string>
+  <string name="menu_log">Registo</string>
+  <string name="menu_info">Ajuda</string>
+  <string name="menu_start">Iniciar</string>
+  <string name="menu_stop">Parar</string>
+  <string name="menu_about">Sobre</string>
+  <string name="main_layout_download">Transferir</string>
+  <string name="main_layout_upload">Enviar</string>
+  <string name="button_help">Ajuda</string>
+  <string name="button_close">Fechar</string>
+  <string name="button_about">Sobre</string>
+  <string name="button_clear_log">Limpar Registo</string>
+  <string name="menu_verify">Verificar</string>
+  <string name="menu_exit">Sair</string>
+  <string name="menu_scan">Digitalizar BridgeQR</string>
+  <string name="menu_share_bridge">Compartilhar BridgeQR</string>
+  <string name="press_to_start">- pressionar longo para iniciar - </string>
+  <string name="pref_trans_proxy_group">Proxy Transparente (requer \'Root\')</string>
+  <string name="pref_trans_proxy_title">Proxy Transparente</string>
+  <string name="pref_transparent_all_title">Tor em Tudo</string>
+  <string name="pref_transparent_all_summary">Passar todo o tráfego das apps via Tor</string>
+  <string name="pref_transparent_port_fallback_summary">AVISO: Rodear as portas comuns (80, 443, etc...). *USAR APENAS* se o modo  \'Todas\' ou \'App\' não funcionar.</string>
+  <string name="pref_transparent_port_title">Lista de Portas</string>
+  <string name="pref_transparent_port_summary">Lista de portas para o proxy. *USAR APENAS* se o modo \'Todas\' ou \'App\' não funcionar.</string>
+  <string name="pref_transparent_port_dialog">Insira as portas para o proxy</string>
+  <string name="pref_has_root">Solicitar Acesso \'Root\'</string>
+  <string name="pref_has_root_summary">Solicitar acesso \'root\' para o proxy transparente</string>
+  <string name="status_install_success">Binários do Tor instalados com sucesso!</string>
+  <string name="status_install_fail">Não foi possível instalar os ficheiros binário do Tor. Por favor, verifique o registo de eventos e notifique tor-assistants at torproject.org</string>
+  <string name="title_error">Erro de Aplicação</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Sobre o Orbot</string>
+  <string name="btn_next">Seguinte</string>
+  <string name="btn_back">Voltar</string>
+  <string name="btn_finish">Terminar</string>
+  <string name="btn_okay">OK</string>
+  <string name="btn_cancel">Cancelar</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Alguns Detalhes do Orbot</string>
+  <string name="wizard_permissions_root">Autorização Concedida</string>
+  <string name="wizard_permissions_stock">Autorizações do Orbot</string>
+  <string name="wizard_permissions_consent">Eu compreendo e gostaria de continuar sem a Superuser</string>
+  <string name="wizard_permission_enable_root">Conceder \'Root\' para o Orbot</string>
+  <string name="wizard_configure">Configurar Acesso do Tor</string>
+  <string name="wizard_configure_all">Passar Todas as Aplicações Via Tor</string>
+  <string name="wizard_configure_select_apps">Selecione Individualmente as Apps para o Tor</string>
+  <string name="wizard_tips_tricks">Orbot - Apps ativadas</string>
+  <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="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>
+  <string name="wizard_final">O Orbot está pronto!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_hs_group">Serviço de Hospedagem Ocultado</string>
+  <string name="pref_general_group">Geral</string>
+  <string name="pref_start_boot_title">Iniciar o Orbot no Arranque</string>
+  <string name="pref_start_boot_summary">Iniciar automaticamente o Orbot e conetar o Tor quando o seu dispositivo Android inicia</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Aviso</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Autorizações</string>
+  <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_permissions_root_msg2">Se não quer isto, por favor, certifique-se que usa as apps criadas para funcionarem com a Orbot</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot - Apps Ativadas</string>
+  <string name="wizard_tips_play">Encontre todas as apps do Projeto Guardian na Play Store da Google</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxy Transparente</string>
+  <string name="wizard_transproxy_hint">(Selecione esta caixa se não souber do que estamos a falar)</string>
+  <string name="wizard_transproxy_none">Nenhum</string>
+  <string name="pref_transparent_tethering_title">\"Tethering\" Tor</string>
+  <string name="pref_transparent_tethering_summary">Ativar o Proxy Transparente Tor para a rede Sem Fios e Dispositivos USB \"Tethered\" (necessário reiniciar)</string>
+  <string name="button_grant_superuser">Solicitar Acesso de Administrador</string>
+  <string name="pref_select_apps">Selecionar Apps</string>
+  <string name="pref_select_apps_summary">Escolher Apps para Encaminhar Via Tor</string>
+  <string name="button_proxy_all">Tudo com o Proxy</string>
+  <string name="button_proxy_none">Nenhum Proxy</string>
+  <string name="button_invert_selection">Inverter Seleção</string>
+  <string name="pref_proxy_title">Proxy de Rede de Saída (Opcional)</string>
+  <string name="pref_proxy_type_title">Tipo de Proxy de Saída</string>
+  <string name="pref_proxy_type_summary">Protocolo para usar para o servidor proxy: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Inserir Tipo de Proxy</string>
+  <string name="pref_proxy_host_title">Anfitrião Proxy de Saída</string>
+  <string name="pref_proxy_host_summary">Nome do Hospedeiro do Servidor Proxy</string>
+  <string name="pref_proxy_host_dialog">Inserir Hospedeiro Proxy</string>
+  <string name="pref_proxy_port_title">Porta Proxy de Saída</string>
+  <string name="pref_proxy_port_summary">Porta do Servidor Proxy</string>
+  <string name="pref_proxy_port_dialog">Inserir Porta do Proxy</string>
+  <string name="pref_proxy_username_title">Nome do Utilizador do Proxy de Saída</string>
+  <string name="pref_proxy_username_summary">Nome do Utilizador do Proxy (Opcional)</string>
+  <string name="pref_proxy_username_dialog">Inserir Nome de Utilizador do Proxy</string>
+  <string name="pref_proxy_password_title">Senha do Proxy de Saída</string>
+  <string name="pref_proxy_password_summary">Senha do Proxy (Opcional)</string>
+  <string name="pref_proxy_password_dialog">Inserir Senha do Proxy</string>
+  <string name="status">Estado</string>
+  <string name="couldn_t_start_tor_process_">Não foi possível iniciar o processo Tor: </string>
+  <string name="error">Erro</string>
+  <string name="bridges">Pontes</string>
+  <string name="use_bridges">Usar Pontes</string>
+  <string name="ip_address_and_port_of_bridges">Endereço de IP e porta das pontes</string>
+  <string name="enter_or_port">Inserir OU porta</string>
+  <string name="reachable_ports">Portas alcançáveis</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Portas alcançáveis por detrás de uma Firewal restritiva</string>
+  <string name="enter_ports">Insira as portas</string>
+  <string name="enable_hidden_services">Hospedeiro de Serviço Ocultado</string>
+  <string name="hidden_service_ports">Portas de Serviço Ocultadas</string>
+  <string name="project_home">Projeto Home(s): </string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">A Licença do Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Programas de Terceiros: </string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Uma app pretende abrir a porta %S do servidor ocultado para a rede Tor. Isto é seguro, se confiar na app.</string>
+  <string name="found_existing_tor_process">encontrado o processo Tor existente...</string>
+  <string name="something_bad_happened">Aconteceu algo de mau. Verifique o registo de eventos.</string>
+  <string name="hidden_service_on">serviço ocultado em:</string>
+  <string name="unable_to_read_hidden_service_name">não é possível ler o nome do serviço ocultado</string>
+  <string name="unable_to_start_tor">Não é possível iniciar o Tor:</string>
+  <string name="unable_to_reset_tor">Reinicie o seu dispositivo, não é possível reiniciar Tor!</string>
+  <string name="pref_use_sys_iptables_title">Usar Tabelas de IP Predefinidas</string>
+  <string name="pref_use_persistent_notifications_title">Notificações Sempre Ativadas</string>
+  <string name="pref_use_expanded_notifications_title">Notificações Estendidas</string>
+  <string name="notification_using_bridges">Pontes ativadas!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Idioma</string>
+  <string name="set_locale_summary">Escolha o local e o idioma para o Orbot</string>
+  <string name="wizard_locale_title">Escolher Idioma</string>
+  <string name="wizard_locale_msg">Deixe a predefinição ou mude o idioma atual</string>
+  <string name="btn_save_settings">Guardar Definições</string>
+  <string name="bandwidth_">Largura de banda:</string>
+  <string name="down">para baixo</string>
+  <string name="up">para cima</string>
+  <string name="newnym">Mudou para uma nova identidade do Tor!</string>
+  <string name="menu_use_chatsecure">Usar ChatSecure</string>
+  <string name="permission_manage_tor_label">Gerir Tor</string>
+  <string name="permission_manage_tor_description">Ative esta app para controlar o serviço Tor</string>
+  <string name="install_apps_">Instalar apps?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Nenhuma conetividade de rede. A hibernar Tor…</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">A conetividade de rede é boa. A iniciar Tor…</string>
+  <string name="updating_settings_in_tor_service">a atualizar as definições no serviço Tor</string>
+  <string name="pref_socks_title">SOCKS Tor</string>
+  <string name="pref_dnsport_title">Porta DNS Tor</string>
+  <string name="your_tor_public_ips_">Os seus IPs Públicos Tor:</string>
+  <string name="app_conflict">Conflito de App</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Pontes Atualizadas</string>
+  <string name="menu_qr">Códigos QR</string>
+  <string name="get_bridges_email">Correio Eletrónico</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Ativar</string>
+  <string name="send_email">Enviar Mensagem</string>
+  <string name="standard_browser">Navegador Padrão</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-ro-rRO/strings.xml b/orbotservice/src/main/res/values-ro-rRO/strings.xml
new file mode 100644
index 0000000..f0ae485
--- /dev/null
+++ b/orbotservice/src/main/res/values-ro-rRO/strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_home">Pagina de start</string>
+  <string name="menu_browse">Răsfoieşte</string>
+  <string name="menu_settings">Setări</string>
+  <string name="menu_info">Asistenţă</string>
+  <string name="menu_about">Despre</string>
+  <string name="button_help">Asistenţă</string>
+  <string name="button_close">Închide</string>
+  <string name="button_about">Despre</string>
+  <string name="menu_exit">Ieşire</string>
+  <string name="btn_back">Înapoi</string>
+  <string name="btn_cancel">Revocare</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Setări proxy</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">General</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Avertizare</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">Nimic</string>
+  <string name="status">Stare</string>
+  <string name="error">Eroare</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Salvează setările</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-ro/strings.xml b/orbotservice/src/main/res/values-ro/strings.xml
new file mode 100644
index 0000000..01166b4
--- /dev/null
+++ b/orbotservice/src/main/res/values-ro/strings.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">pornește și oprește Tor</string>
+  <string name="tor_proxy_service_process">serviciu proxy tor</string>
+  <string name="status_starting_up">Orbot porneste...</string>
+  <string name="status_activated">Conectat la reteaua Tor</string>
+  <string name="status_disabled">Orbot este dezactivat</string>
+  <string name="tor_process_starting">Porneste clientul Tor...</string>
+  <string name="tor_process_complete">terminat.</string>
+  <string name="tor_process_waiting">asteptare.</string>
+  <string name="not_anonymous_yet">ATENTIE: Traficul inca nu este anonim! Configureaza aplicatile sa foloseasca proxy-ul HTTP 127.0.0.1:8118 sau SOCKS4A sau proxy-ul SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Pagina de start</string>
+  <string name="menu_browse">Răsfoieşte</string>
+  <string name="menu_settings">Setări</string>
+  <string name="menu_log">log</string>
+  <string name="menu_info">Asistenţă</string>
+  <string name="menu_start">Start</string>
+  <string name="menu_stop">Stop</string>
+  <string name="menu_about">Despre</string>
+  <string name="main_layout_download">Descarca</string>
+  <string name="main_layout_upload">Incarca</string>
+  <string name="button_help">Asistenţă</string>
+  <string name="button_close">Închide</string>
+  <string name="button_about">Despre</string>
+  <string name="button_clear_log">Goleste log-ul</string>
+  <string name="menu_verify">Verifica</string>
+  <string name="menu_exit">Ieşire</string>
+  <string name="press_to_start">- apasa lung pentru pornire -</string>
+  <string name="pref_trans_proxy_group">Proxy transparent (necesita root)</string>
+  <string name="pref_trans_proxy_title">Proxy transparent</string>
+  <string name="pref_trans_proxy_summary">Aplicare automata a Tor la aplicatii</string>
+  <string name="pref_transparent_all_title">Tor tot</string>
+  <string name="pref_transparent_all_summary">Toate aplicatile folosesc Tor pentru trafic</string>
+  <string name="pref_transparent_port_fallback_title">Port proxy de rezerva</string>
+  <string name="pref_transparent_port_fallback_summary">ATENTIE: Ocoleste porturile comune (80, 443, etc.). *FOLOSESTE DOAR* daca modurile \"Toate\" sau \"Aplicatii\" nu functioneaza</string>
+  <string name="pref_transparent_port_title">Lista porturi</string>
+  <string name="pref_transparent_port_summary">Lista porturi pentru proxy. *FOLOSESTE DOAR* daca modurile \"Toate\" sau \"Aplicatii\" nu functioneaza</string>
+  <string name="pref_transparent_port_dialog">Introdu porturile pentru proxy</string>
+  <string name="pref_has_root">Necesita acces root</string>
+  <string name="pref_has_root_summary">Necesita acces root pentru proxy transparent</string>
+  <string name="status_install_success">Fisierele binare Tor instalate cu succes!</string>
+  <string name="status_install_fail">Fisierele binare Tor nu au putut fi instalate. Verificati log-ul si raportati bug-ul la tor-assistants at torproject.org</string>
+  <string name="title_error">Eroare de aplicatie</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Despre Orbot</string>
+  <string name="btn_next">Urmatorul</string>
+  <string name="btn_back">Înapoi</string>
+  <string name="btn_finish">Termina</string>
+  <string name="btn_okay">Ok</string>
+  <string name="btn_cancel">Revocare</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Detalii Orbot</string>
+  <string name="wizard_permissions_root">Permisiune acordata</string>
+  <string name="wizard_permissions_stock">Permisiuni Orbot</string>
+  <string name="wizard_premissions_msg_root">Excelent! Am detectat ca ai permis acces root pentru Orbot. Vom folosi aceasta putere cu raspundere.</string>
+  <string name="wizard_permissions_msg_stock">Desi nu este necesar, Orbot poate fi mai puternic daca dispozitivul dumneavoastra are acces root. Foloseste butonul de mai jos pentru ai oferi superputeri lui Orbot!</string>
+  <string name="wizard_permissions_no_root">Daca nu ai acces root, sau nu ai habar despre ce vorbim, asigura-te ca folosesti aplicatii facute sa functioneze cu Orbot.</string>
+  <string name="wizard_permissions_consent">Inteleg si as vrea sa continui fara Superuser</string>
+  <string name="wizard_permission_enable_root">Aproba root pentru Orbot</string>
+  <string name="wizard_configure">Configureaza Tor</string>
+  <string name="wizard_configure_msg">Orbot ofera posibilitatea sa trimita tot traficul prin Tor SAU sa alegi aplicatii individuale.</string>
+  <string name="wizard_configure_all">Toate aplicatiile folosesc Tor</string>
+  <string name="wizard_configure_select_apps">Alege aplicatii individuale pentru Tor</string>
+  <string name="wizard_tips_tricks">Aplicatii compatibile Orbot</string>
+  <string name="wizard_tips_msg">Aplicatiile de mai jos au fost create sa fie compatibile cu Orbot. Apasa pe fiecare buton pentru a instala acum, sau le poti gasi mai tarziu pe Google Play, pe site-ul GuardianProject.info sau pe F-Droid.org.</string>
+  <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="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>
+  <string name="wizard_final">Orbot este pregatit!</string>
+  <string name="wizard_exit_at_first_screen_toast">Configurați Orbot înainte de a începe să-l utilizați!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Vom deschide pagina https://check.torproject.org pentru a verifica daca Orbot este configurat corespunzator si daca este conectat la Tor.</string>
+  <string name="pref_hs_group">Serviciu de gazduire ascuns</string>
+  <string name="pref_general_group">General</string>
+  <string name="pref_start_boot_title">Porneste Orbot la boot-are</string>
+  <string name="pref_start_boot_summary">Porneste Orbot automat si conecteaza-te la Tor cand porneste dispozitivul</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Atentie</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permisiuni</string>
+  <string name="wizard_permissions_root_msg1">Optional, ii poti oferi lui Orbot acces \"Superuser\" pentru a activa optiuni avansate, cum ar fi proxy transparent.</string>
+  <string name="wizard_permissions_root_msg2">Daca nu vrei sa faci asta, asigura-te ca folosesti aplicatii compatibile cu Orbot.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_play">Gaseste toate aplicatile Guardian Project pe Google Play</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxy transparent</string>
+  <string name="wizard_transproxy_msg">Asta va permite aplicatilor tale sa foloseasca Tor automat fara nici o configurare.</string>
+  <string name="wizard_transproxy_hint">(Bifeaza asta daca nu ai idee despre ce vorbim)</string>
+  <string name="wizard_transproxy_none">Nimic</string>
+  <string name="pref_transparent_tethering_title">Partajarea conexiunii Tor</string>
+  <string name="pref_transparent_tethering_summary">Activeaza proxy transparent pentru conexiuni partajate prin WiFi si USB (necesita restart)</string>
+  <string name="button_grant_superuser">Cere acces Superuser</string>
+  <string name="pref_select_apps">Selecteaza aplicatii</string>
+  <string name="pref_select_apps_summary">Alege aplicatii care sa foloseasca Tor</string>
+  <string name="pref_node_configuration">Configurare nod</string>
+  <string name="pref_node_configuration_summary">Setari avansate care ar putea sa iti reduca anonimitatea</string>
+  <string name="pref_entrance_node">Noduri de intrare</string>
+  <string name="pref_entrance_node_summary">Amprente, nick name-uri si adrese pentru primul hop</string>
+  <string name="pref_entrance_node_dialog">Introdu noduri de intrare</string>
+  <string name="pref_proxy_title">Proxy de retea pentru iesire (optional)</string>
+  <string name="pref_proxy_type_title">Tipul proxy-ului de iesire</string>
+  <string name="pref_proxy_type_summary">Tipul protocolului pentru proxy: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Introdu tipul proxy-ului</string>
+  <string name="pref_proxy_host_title">Host-ul proxy-ului de iesire</string>
+  <string name="pref_proxy_host_summary">Hostname-ul server-ului proxy</string>
+  <string name="pref_proxy_host_dialog">Introdu host-ul proxy-ului</string>
+  <string name="pref_proxy_port_title">Port-ul proxy-ului de iesire</string>
+  <string name="pref_proxy_port_summary">Port-ul serverului proxy</string>
+  <string name="pref_proxy_port_dialog">Introdu port-ul proxy</string>
+  <string name="pref_proxy_username_title">Username-ul proxy-ului de iesire</string>
+  <string name="pref_proxy_username_summary">Username-ul proxy-ului (optional)</string>
+  <string name="pref_proxy_username_dialog">Introdu username-ul proxy-ului</string>
+  <string name="pref_proxy_password_title">Parola pentru proxy-ul de iesire</string>
+  <string name="pref_proxy_password_summary">Parola pentru proxy (optional)</string>
+  <string name="pref_proxy_password_dialog">Introdu parola pentru proxy</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Configurez proxy transparent complet...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Configurez un proxy transparent bazat pe aplicatie...</string>
+  <string name="transparent_proxying_enabled">Proxy transparent ACTIVAT</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy activat pentru partajare!</string>
+  <string name="warning_error_starting_transparent_proxying_">ATENTIE: eroare la pornirea proxy-ului transparent!</string>
+  <string name="transproxy_rules_cleared">Reguli TransProxy golite</string>
+  <string name="couldn_t_start_tor_process_">Nu am putut porni procesul Tor:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Configurez proxy transparent bazat pe port...</string>
+  <string name="bridge_error">Eroare de punte</string>
+  <string name="bridge_requires_ip">Pentru a putea folosi optiunea de punte, trebuie introdusa cel putin o adresa IP pentru punte.</string>
+  <string name="send_email_for_bridges">Trimite un e-mail la bridges at torproject.org cu linia \"get bridges\" in continutul mail-ului de pe un cont de GMail.</string>
+  <string name="error">Eroare</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Setarile tale pentru adrese accesibile au cauzat o exceptie!</string>
+  <string name="your_relay_settings_caused_an_exception_">Setarile tale de relay au cauzat o exceptie!</string>
+  <string name="exit_nodes">Noduri de iesire</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Amprente, nick name-uri, tari si adrese pentru ultimul hop</string>
+  <string name="enter_exit_nodes">Introdu noduri de iesire</string>
+  <string name="exclude_nodes">Noduri de exclus</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Amprente, nick name-uri, tari si adrese de exclus</string>
+  <string name="enter_exclude_nodes">Introdu noduri de exclus</string>
+  <string name="strict_nodes">Noduri stricte</string>
+  <string name="use_only_these_specified_nodes">Foloseste *doar* nodurile specificate</string>
+  <string name="bridges">Punti</string>
+  <string name="use_bridges">Foloseste punti</string>
+  <string name="bridges_obfuscated">Punti mascate</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Activeaza noduri de intrare alternative in reteaua Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Activeaza daca puntile configurate sunt punti mascate</string>
+  <string name="ip_address_and_port_of_bridges">Adresa IP si port pentru punti</string>
+  <string name="enter_bridge_addresses">Introdu adresa pentru punte</string>
+  <string name="relays">Comutatoare</string>
+  <string name="relaying">Comutare</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Activeaza dispozitivul sa fie un comutator fara iesire</string>
+  <string name="relay_port">Port de retransmitere</string>
+  <string name="listening_port_for_your_tor_relay">Port pentru comutatorul tau Tor</string>
+  <string name="enter_or_port">Introdu portul OR</string>
+  <string name="relay_nickname">Nick name-ul comutatorului</string>
+  <string name="the_nickname_for_your_tor_relay">Nick name-ul pentru comutatorul tau Tor</string>
+  <string name="enter_a_custom_relay_nickname">Introdu un nick name pentru comutator</string>
+  <string name="reachable_addresses">Adresa accesibila</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Ruleaza ca si client in spatele firewall-ului cu politici restrictive</string>
+  <string name="reachable_ports">Porturi accesibile</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Porturi accesibile in spatele unui firewall restrictiv</string>
+  <string name="enter_ports">Introdu porturi</string>
+  <string name="enable_hidden_services">Serviciu de gazduire ascuns</string>
+  <string name="run_servers_accessible_via_the_tor_network">permite serverului de pe dispozitiv sa fie accesibil in reteaua Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">introdu porturile localhost-ului pentru servicile ascunse</string>
+  <string name="hidden_service_ports">Porturi de serviciu ascunse</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">numele serviciului tau ascuns (generat automat)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">activeaza exportul log-ului (trebuie folosit adb sau LogCat pentru vizualizare)</string>
+  <string name="project_home">Casa(le) proiectului:</string>
+  <string name="the_tor_license">Licenta Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Aplicatii tertiare:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">O aplicatie vrea sa deschida portul ascuns %S spre reteaua Tor. Este sigur daca ai incredere in aplicatie.</string>
+  <string name="found_existing_tor_process">gasit proces Tor existent...</string>
+  <string name="something_bad_happened">Ceva rau s-a intamplat. Verifica log-ul</string>
+  <string name="hidden_service_on">serviciu ascuns pe:</string>
+  <string name="unable_to_read_hidden_service_name">nu am putut citi numele serviciului ascuns</string>
+  <string name="unable_to_start_tor">Nu am reusit sa pornesc Tor:</string>
+  <string name="pref_use_sys_iptables_title">Foloseste Iptables implicite</string>
+  <string name="pref_use_sys_iptables_summary">foloseste fisierele binare iptables incorporate in locul celor din Orbot</string>
+  <string name="error_installing_binares">Fisierele binare Tor nu au putut fi instalate sau actualizate.</string>
+  <string name="pref_use_persistent_notifications">Arata tot timpul icoana in bara cand Orbot este conectat</string>
+  <string name="pref_use_persistent_notifications_title">Notificari active tot timpul</string>
+  <string name="notification_using_bridges">Punti activate!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Limbă</string>
+  <string name="set_locale_summary">Alege localele si limba pentru Orbot</string>
+  <string name="wizard_locale_title">Alege limba</string>
+  <string name="wizard_locale_msg">Lasa implicit sau schimba limba curenta</string>
+  <string name="btn_save_settings">Salvează setarile</string>
+  <string name="no_internet_connection_tor">Nu este conexiune la internet; Tor este în așteptare...</string>
+  <string name="bandwidth_">Lățime de bandă:</string>
+  <string name="down">jos</string>
+  <string name="up">sus</string>
+  <string name="pref_disable_network_title">Fără adormirea automată a rețelei</string>
+  <string name="pref_disable_network_summary">Pune Tor să doarmă dacă nu este internet disponibil</string>
+  <string name="newnym">Ați comutat la o nouă identitate Tor!</string>
+  <string name="menu_use_chatsecure">Utilizați ChatSecure</string>
+  <string name="permission_manage_tor_label">Administrare Tor</string>
+  <string name="permission_manage_tor_description">Activați această aplicație pentru a controla serviciile Tor</string>
+  <string name="install_apps_">Se instalează aplicația?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Nu este conexiune la rețea. Se pune Tor în adormire...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Conexiunea la rețea este bună. Se trezește Tor...</string>
+  <string name="updating_settings_in_tor_service">se actualizează configurările în serviciul Tor</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="you_do_not_have_root_access_enabled">Nu aveți activat accesul ca ROOT</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KiO</string>
+  <string name="mb">MiO</string>
+  <string name="menu_qr">Coduri QR</string>
+  <string name="bridge_mode">Mod punte</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Activează</string>
+  <string name="send_email">Trimite email</string>
+  <string name="standard_browser">Navigator standard</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-rs-rAR/strings.xml b/orbotservice/src/main/res/values-rs-rAR/strings.xml
new file mode 100644
index 0000000..132b67e
--- /dev/null
+++ b/orbotservice/src/main/res/values-rs-rAR/strings.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">reiniciar Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot está iniciándose…</string>
+  <string name="status_activated">Conectado a la red Tor</string>
+  <string name="status_disabled">\"Orbot está Desactivado</string>
+  <string name="status_shutting_down">Orbot se está apagando</string>
+  <string name="tor_process_complete">Completar</string>
+  <string name="not_anonymous_yet">CIUDADO: Tu tráfico no es anónimo aún! Por favor configura tus aplicaciones para que usen el HTTP proxy 127.0.0.1:8118 o SOCKS4A o el proxy SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Inicio</string>
+  <string name="menu_browse">Navegar</string>
+  <string name="menu_settings">Configuración</string>
+  <string name="menu_log">Registro</string>
+  <string name="menu_info">Ayuda</string>
+  <string name="menu_apps">Apps</string>
+  <string name="menu_start">Iniciar</string>
+  <string name="menu_stop">Detener</string>
+  <string name="menu_about">Acerca de</string>
+  <string name="menu_wizard">Asistente</string>
+  <string name="button_help">Ayuda</string>
+  <string name="button_close">Cerrar</string>
+  <string name="button_about">Acerca de</string>
+  <string name="button_clear_log">Borrar Registros</string>
+  <string name="menu_verify">Chequear</string>
+  <string name="menu_exit">Salir</string>
+  <string name="pref_trans_proxy_group">Proxying Transparente (Requiere Root)</string>
+  <string name="pref_trans_proxy_title">Proxying Transparente</string>
+  <string name="pref_trans_proxy_summary">Torificación Automática de Aplicaciones</string>
+  <string name="pref_transparent_all_title">Torear Todo</string>
+  <string name="btn_next">Siguiente</string>
+  <string name="btn_back">Atrás</string>
+  <string name="btn_finish">Finalizar</string>
+  <string name="btn_cancel">Cancelar</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_final">Orbot está listo!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">General</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+
+
+
+
+  <!--Transparent Proxy screen-->
+  <!--<string name="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
+  <string name="default_bridges"/>
+  <string name="powered_by">potenciado por The Tor Project</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-ru/strings.xml b/orbotservice/src/main/res/values-ru/strings.xml
new file mode 100644
index 0000000..94029fb
--- /dev/null
+++ b/orbotservice/src/main/res/values-ru/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot - это свободная программа для прокси-соединений, она позволяет другим приложениям более безопасно использовать интернет-соединение. Orbot использует Tor для шифрования интернет-трафика, который затем скрывается в ходе пересылки через несколько компьютеров в разных частях планеты. Tor является свободным программным приложением, а также открытой сетью, помогающей защититься от слежки в сетях, угрожающей личной свободе и частной жизни, конфиденциальным бизнес-деятельности и контактам, а также государственной программе бÐ
 µÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚и, известной как анализ трафика.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">Запуск и остановка Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Запуск Orbot...</string>
+  <string name="status_activated">Подключён к сети Tor</string>
+  <string name="status_disabled">Orbot отключён</string>
+  <string name="status_shutting_down">Служба Tor выключается</string>
+  <string name="tor_process_starting">Запускается клиент Tor...</string>
+  <string name="tor_process_complete">завершено.</string>
+  <string name="tor_process_waiting">ожидание.</string>
+  <string name="not_anonymous_yet">ПРЕДУПРЕЖДЕНИЕ: ваш трафик ещё не анонимен! Пожалуйста, настройте свои приложения на использование HTTP-прокси 127.0.0.1:8118 или же SOCKS4A или SOCKS5-прокси 127.0.0.1:9050</string>
+  <string name="menu_home">Домашняя страница</string>
+  <string name="menu_browse">Просмотр</string>
+  <string name="menu_settings">Настройки</string>
+  <string name="menu_log">Журнал</string>
+  <string name="menu_info">Справка</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Запустить</string>
+  <string name="menu_stop">Остановить</string>
+  <string name="menu_about">О программе</string>
+  <string name="menu_promo_apps">Получить приложения...</string>
+  <string name="main_layout_download">Загрузка</string>
+  <string name="main_layout_upload">Отправка</string>
+  <string name="button_help">Справка</string>
+  <string name="button_close">Закрыть</string>
+  <string name="button_about">О программе</string>
+  <string name="button_clear_log">Очистить журнал</string>
+  <string name="menu_verify">Проверка</string>
+  <string name="menu_exit">Выход</string>
+  <string name="menu_scan">Сканировать QR-код моста</string>
+  <string name="menu_share_bridge">Опубликовать QR-код моста</string>
+  <string name="press_to_start">- долгое нажатие для запуска -</string>
+  <string name="pref_trans_proxy_group">Прозрачный прокси (требуется root-доступ)</string>
+  <string name="pref_trans_proxy_title">Прозрачный прокси</string>
+  <string name="pref_trans_proxy_summary">Автоматическая Tor-ификация приложений</string>
+  <string name="pref_transparent_all_title">Направлять всё через Tor</string>
+  <string name="pref_transparent_all_summary">Направлять трафик всех приложений через Tor</string>
+  <string name="pref_transparent_port_fallback_title">Резервный порт прокси</string>
+  <string name="pref_transparent_port_fallback_summary">ПРЕДУПРЕЖДЕНИЕ: обходит общие порты (80, 443, и т.д.). *ИСПОЛЬЗОВАТЬ ТОЛЬКО* если режимы \'Всё\' или \'Приложение\' не работают.</string>
+  <string name="pref_transparent_port_title">Список портов</string>
+  <string name="pref_transparent_port_summary">Список портов для проксификации. *ИСПОЛЬЗОВАТЬ ТОЛЬКО* если режимы \'Всё\' или \'Приложение\' не работают.</string>
+  <string name="pref_transparent_port_dialog">Введите порты для проксификации</string>
+  <string name="pref_has_root">Запросить root-доступ</string>
+  <string name="pref_has_root_summary">Запросить root-доступ для прозрачной проксификации</string>
+  <string name="status_install_success">Программа Tor успешно установлена!</string>
+  <string name="status_install_fail">Не удалось установить программу Tor. Пожалуйста, проверьте системный журнал и сообщите нам: tor-assistants at torproject.org</string>
+  <string name="title_error">Ошибка приложения</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Об Orbot</string>
+  <string name="btn_next">Вперёд</string>
+  <string name="btn_back">Назад</string>
+  <string name="btn_finish">Завершить</string>
+  <string name="btn_okay">OK</string>
+  <string name="btn_cancel">Отмена</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Некоторые сведения о программе Orbot</string>
+  <string name="wizard_details_msg">Orbot — это приложение с открытым исходным кодом, которое содержит Tor, LibEvent и Privoxy. Оно предоставляет локальный HTTP-прокси (8118) и SOCKS-прокси (9050) в сеть Tor. Orbot также позволяет на устройствах с правами root пересылать весь интернет-трафик через Tor.</string>
+  <string name="wizard_permissions_root">Разрешение получено</string>
+  <string name="wizard_permissions_stock">Разрешения Orbot</string>
+  <string name="wizard_premissions_msg_root">Отлично! Мы определили, что вы предоставили root-права для Orbot. Мы будем использовать эту возможность с умом.</string>
+  <string name="wizard_permissions_msg_stock">Хотя это и не требуется, Orbot может быть более мощным инструментом, если ваше устройство имеет права root. Нажмите на кнопку ниже и предоставьте Orbot супервозможности!</string>
+  <string name="wizard_permissions_no_root">Если у вас нет root-прав или вы не имеете представления о чём мы говорим, просто убедитесь, что используете приложения, разработанные для Orbot.</string>
+  <string name="wizard_permissions_consent">Я понимаю и хочу продолжить без прав суперпользователя</string>
+  <string name="wizard_permission_enable_root">Дать root-права Orbot</string>
+  <string name="wizard_configure">Настроить Tor-ификацию</string>
+  <string name="wizard_configure_msg">Программа Orbot даёт вам возможность направлять трафик всех приложений через Tor ИЛИ выбрать приложения для перенаправления самостоятельно.</string>
+  <string name="wizard_configure_all">Направлять все приложения через Tor</string>
+  <string name="wizard_configure_select_apps">Направлять выбранные приложения через Tor</string>
+  <string name="wizard_tips_tricks">Orbot-задействованные приложения</string>
+  <string name="wizard_tips_msg">Мы советуем вам скачать и использовать приложения, которые умеют работать напрямую через Orbot. Нажмите на кнопки ниже, чтобы запустить процесс установки.</string>
+  <string name="wizard_tips_otrchat">ChatSecure - защищённый обмен сообщениями в Android</string>
+  <string name="wizard_tips_proxy">Настройки прокси: узнайте, как настроить приложения для работы с Orbot</string>
+  <string name="wizard_tips_duckgo">Приложение поисковой системы DuckDuckGo</string>
+  <string name="wizard_tips_twitter">Twitter поддерживает http-прокси \"localhost:8118\"</string>
+  <string name="wizard_tips_story_maker">StoryMaker - напишите рассказ и оставьте его Tor для обеспечения безопасности!</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_proxy_help_msg">Если используемое вами приложение для Android поддерживает HTTP или SOCKS-прокси, то вы можете настроить его на подключение к Orbot и использование Tor.\n\n\nЗначение хоста - 127.0.0.1 или \"localhost\". Для HTTP номер порта - 8118. Для SOCKS-прокси - 9050. По возможности используйте SOCKS4A или SOCKS5.\n \n\n\nВы можете узнать больше о работе через прокси на Android, прочитав этот FAQ: http://tinyurl.com/proxyandroid\n </string>
+  <string name="wizard_final">Orbot готов к использованию!</string>
+  <string name="wizard_final_msg">Миллионы людей во всём мире используют Tor по различным причинам. Журналисты и блоггеры, правозащитники, сотрудники правоохранительных органов, солдаты, корпорации, граждане стран с репрессивным режимом и просто обычные граждане..., а теперь готовы и вы!</string>
+  <string name="wizard_exit_at_first_screen_toast">Пожалуйста, настройте Orbot прежде чем приступить к использованию!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Вы успешно подключились к сети Tor, но это НЕ значит, что ваше устройство безопасно. Вы можете воспользоваться функцией \'Проверка\' из меню, чтобы протестировать ваш браузер.\n\nПосетите наш сайт https://guardianproject.info/apps/orbot или отправьте письмо на адрес help at guardianproject.info, чтобы узнать больше.</string>
+  <string name="tor_check">Это приведёт к запуску браузера, выбранного на вашем устройстве по умолчанию, и подключению к сайту https://check.torproject.org с целью проверки правильности работы Orbot и определения, подключены ли вы к сети Tor.</string>
+  <string name="pref_hs_group">Скрытые службы</string>
+  <string name="pref_general_group">Общие</string>
+  <string name="pref_start_boot_title">Запускать Orbot при загрузке</string>
+  <string name="pref_start_boot_summary">Автоматически запускать Orbot и подключаться к сети Tor при загрузке вашего Android-устройства</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot позволяет использовать Tor на Android!\n\nTor позволяет вам защититься от фильтрации содержимого, анализа трафика и наблюдения за сетью, которые ставят под угрозу приватность, конфиденциальную информацию и личные отношения.\n\nЭтот мастер поможет вам настроить Orbot и Tor на вашем устройстве.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Предупреждение</string>
+  <string name="wizard_warning_msg">Сама по себе установка Orbot не сделает автоматически ваш мобильный трафик анонимным.\n\nВы должны правильно настроить Orbot, ваше устройство и другие приложения, что бы успешно использовать Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Разрешения</string>
+  <string name="wizard_permissions_root_msg1">Вы так же можете по желанию дать Orbot права \'Суперпользователя\' для доступа к дополнительным возможностям типа прозрачной проксификации.</string>
+  <string name="wizard_permissions_root_msg2">Если вы не хотите делать это, пожалуйста, удостоверьтесь, что используете приложения, созданные для работы с Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Похоже, ваше устройство не имеет root-прав и не предоставляет доступ \'Суперпользователя\'.\n\nЧтобы использовать Tor, вам надо использовать приложения, построенные для работы с Orbot или те, которые поддерживают использование HTTP или SOCKS-прокси.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Приложения, работающие с Orbot:</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: приложение для безопасной переписки с конфиденциальным шифрованием</string>
+  <string name="wizard_tips_orweb">Orfox: конфиденциальный браузер, работающий через Tor</string>
+  <string name="wizard_tips_play">Найти все приложения Guardian Project на Google Play</string>
+  <string name="wizard_tips_fdroid">Найти все приложения Guardian Project на F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Найти все приложения Guardian Project на сайте https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Прозрачное проксирование</string>
+  <string name="wizard_transproxy_msg">Это позволяет вашим приложениям автоматически работать по сети Tor без какого-либо конфигурирования.</string>
+  <string name="wizard_transproxy_hint">(Отметьте данный пункт, если вы не знаете о чём идёт речь)</string>
+  <string name="wizard_transproxy_none">Нет</string>
+  <string name="pref_transparent_tethering_title">Тетеринг Tor</string>
+  <string name="pref_transparent_tethering_summary">Включить прозрачную проксификацию Tor для устройств с тетерингом по Wi-Fi и USB (требуется перезапуск)</string>
+  <string name="button_grant_superuser">Запросить доступ Суперпользователя</string>
+  <string name="pref_select_apps">Выбранные приложения</string>
+  <string name="pref_select_apps_summary">Выбрать приложения для направления через Tor</string>
+  <string name="pref_node_configuration">Конфигурация узла</string>
+  <string name="pref_node_configuration_summary">Это дополнительные настройки, которые могут снизить вашу анонимность</string>
+  <string name="pref_entrance_node">Входные узлы</string>
+  <string name="pref_entrance_node_summary">Отпечатки, псевдонимы, страны и адреса для первого прыжка</string>
+  <string name="pref_entrance_node_dialog">Введите входные узлы</string>
+  <string name="pref_allow_background_starts_title">Разрешить фоновую загрузку</string>
+  <string name="pref_allow_background_starts_summary">Позволить любому приложению требовать от Orbot запускать Tor и относящиеся к нему сервисы</string>
+  <string name="button_proxy_all">Проксировать всё</string>
+  <string name="button_proxy_none">Не проксировать </string>
+  <string name="button_invert_selection">Инвертировать выделенное</string>
+  <string name="pref_proxy_title">Исходящий сетевой прокси (необязательно)</string>
+  <string name="pref_proxy_type_title">Тип прокси</string>
+  <string name="pref_proxy_type_summary">Протокол для использования прокси-сервером: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Введите тип прокси</string>
+  <string name="pref_proxy_host_title">Хост прокси</string>
+  <string name="pref_proxy_host_summary">Имя хоста прокси-сервера</string>
+  <string name="pref_proxy_host_dialog">Введите хост прокси</string>
+  <string name="pref_proxy_port_title">Порт прокси</string>
+  <string name="pref_proxy_port_summary">Порт прокси-сервера</string>
+  <string name="pref_proxy_port_dialog">Введите порт прокси</string>
+  <string name="pref_proxy_username_title">Имя пользователя прокси</string>
+  <string name="pref_proxy_username_summary">Имя пользователя прокси-сервера (необязательно)</string>
+  <string name="pref_proxy_username_dialog">Введите имя пользователя прокси</string>
+  <string name="pref_proxy_password_title">Пароль пользователя прокси</string>
+  <string name="pref_proxy_password_summary">Пароль пользователя прокси-сервера (необязательно)</string>
+  <string name="pref_proxy_password_dialog">Введите пароль пользователя прокси</string>
+  <string name="status">Статус</string>
+  <string name="setting_up_full_transparent_proxying_">Установка общей прозрачной проксификации...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Установка основанной на приложениях прозрачной проксификации...</string>
+  <string name="transparent_proxying_enabled">Прозрачная проксификация ВКЛЮЧЕНА</string>
+  <string name="transproxy_enabled_for_tethering_">Прозрачный прокси поддерживает тетеринг!</string>
+  <string name="warning_error_starting_transparent_proxying_">ВНИМАНИЕ: ошибка запуска прозрачной проксификации!</string>
+  <string name="transproxy_rules_cleared">Правила прозрачного прокси удалены</string>
+  <string name="couldn_t_start_tor_process_">Невозможно запустить Tor: </string>
+  <string name="privoxy_is_running_on_port_">Polipo работает на порту:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Установка основанной на портах прозрачной проксификации...</string>
+  <string name="bridge_error">Ошибка моста</string>
+  <string name="bridge_requires_ip">Для использования необходимо задать IP-адрес как минимум одного моста.</string>
+  <string name="send_email_for_bridges">Отправьте письмо на адрес bridges at torproject.org со строкой \"get bridges\" в теле сообщения из учётной записи GMail.</string>
+  <string name="error">Ошибка</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Ваши настройки доступных адресов вызвали исключение!</string>
+  <string name="your_relay_settings_caused_an_exception_">Настройки вашего ретранслятора вызвали исключение!</string>
+  <string name="exit_nodes">Выходные узлы</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Отпечатки, псевдонимы, страны и адреса для последнего прыжка</string>
+  <string name="enter_exit_nodes">Введите выходные узлы</string>
+  <string name="exclude_nodes">Исключённые узлы</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Отпечатки, псевдонимы, страны и адреса на исключение</string>
+  <string name="enter_exclude_nodes">Введите исключённые узлы</string>
+  <string name="strict_nodes">Точные узлы</string>
+  <string name="use_only_these_specified_nodes">Использовать *только* эти заданные узлы</string>
+  <string name="bridges">Мосты</string>
+  <string name="use_bridges">Использовать мосты</string>
+  <string name="bridges_obfuscated">Обфусцированные мосты</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Включить альтернативные входные узлы в сеть Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Заданные мосты обфусцированы</string>
+  <string name="ip_address_and_port_of_bridges">IP-адреса и порты мостов</string>
+  <string name="enter_bridge_addresses">Введите адреса мостов</string>
+  <string name="relays">Ретрансляторы</string>
+  <string name="relaying">Ретрансляция</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Разрешить вашему устройству быть невыходным ретранслятором</string>
+  <string name="relay_port">Порт ретранслятора</string>
+  <string name="listening_port_for_your_tor_relay">Слушающий порт для вашего ретранслятора Tor</string>
+  <string name="enter_or_port">Введите порт OR</string>
+  <string name="relay_nickname">Имя ретранслятора</string>
+  <string name="the_nickname_for_your_tor_relay">Имя для вашего ретранслятора Tor</string>
+  <string name="enter_a_custom_relay_nickname">Введите пользовательское имя ретранслятора</string>
+  <string name="reachable_addresses">Доступные адреса</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Запускать как клиент за межсетевым экраном с ограничивающими политиками</string>
+  <string name="reachable_ports">Доступные порты</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Порты, доступные из-за ограничительного сетевого экрана</string>
+  <string name="enter_ports">Введите порты</string>
+  <string name="enable_hidden_services">Включить скрытые службы</string>
+  <string name="run_servers_accessible_via_the_tor_network">Запустить сервера, доступные через сеть Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">Введите локальные порты для скрытых служб</string>
+  <string name="hidden_service_ports">Порты скрытой службы</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Адресуемое имя для вашей скрытой службы (создаётся автоматически)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Включить вывод журнала отладки (требует использовать adb или aLogCat для просмотра)</string>
+  <string name="project_home">Домашняя страница проекта: </string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Лицензия Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Программы сторонних разработчиков: </string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Приложение хочет открыть скрытый порт сервера %S сети Tor. Это безопасно, если вы доверяете данному приложению.</string>
+  <string name="found_existing_tor_process">найден существующий процесс Tor...</string>
+  <string name="something_bad_happened">Произошла какая-то ошибка. Проверьте журнал.</string>
+  <string name="hidden_service_on">скрытая служба на:</string>
+  <string name="unable_to_read_hidden_service_name">невозможно прочитать имя скрытой службы</string>
+  <string name="unable_to_start_tor">Невозможно запустить Tor:</string>
+  <string name="unable_to_reset_tor">Перезагрузите устройство, невозможно переустановить Tor!</string>
+  <string name="pref_use_sys_iptables_title">Использовать Iptables по умолчанию</string>
+  <string name="pref_use_sys_iptables_summary">Использовать встроенный файл iptables вместо поставляемого с Orbot</string>
+  <string name="error_installing_binares">Исполняемые файлы Tor не смогли установиться или обновится.</string>
+  <string name="pref_use_persistent_notifications">Всегда отображать иконку в панели задач когда Orbot подключен</string>
+  <string name="pref_use_persistent_notifications_title">Постоянное уведомление о работе</string>
+  <string name="pref_use_expanded_notifications">Показать расширенное уведомление Tor со страной выхода и IP</string>
+  <string name="pref_use_expanded_notifications_title">Расширенные уведомления</string>
+  <string name="notification_using_bridges">Мосты включены!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Язык</string>
+  <string name="set_locale_summary">Выбрать язык интерфейса для Orbot</string>
+  <string name="wizard_locale_title">Выбрать язык</string>
+  <string name="wizard_locale_msg">Оставить по умолчанию или переключить текущий язык</string>
+  <string name="powered_by">основано на Tor</string>
+  <string name="btn_save_settings">Сохранить настройки</string>
+  <string name="no_internet_connection_tor">Отсутствует подключение к интернету, Tor находится в режиме ожидания…</string>
+  <string name="bandwidth_">Канал:</string>
+  <string name="down">к нам</string>
+  <string name="up">от нас</string>
+  <string name="pref_disable_network_title">Автозасыпание без сети</string>
+  <string name="pref_disable_network_summary">Переводить Tor в спящий режим при отсутствии интернета</string>
+  <string name="newnym">Вы переключились на новый идентификатор Tor!</string>
+  <string name="menu_verify_browser">Проверить браузер</string>
+  <string name="menu_use_chatsecure">Использовать ChatSecure</string>
+  <string name="permission_manage_tor_label">Управление Tor</string>
+  <string name="permission_manage_tor_description">Разрешить приложению управлять сервисом Tor</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Не похоже, что у вас установлен Orfox. Хотите справку на эту тему или просто открыть браузер?</string>
+  <string name="install_apps_">Установить приложения?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Нет подключения к сети. Tor входит в режим сна...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Подключение к сети установлено. Tor просыпается...</string>
+  <string name="updating_settings_in_tor_service">обновление настроек в сервисе Tor</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Порт, на котором Tor предоставляет свой SOCKS-прокси (по умолчанию: 9050, 0 - для отключения)</string>
+  <string name="pref_socks_dialog">Настройка порта SOCKS</string>
+  <string name="pref_transport_title">Порт прозрачного прокси Tor</string>
+  <string name="pref_transport_summary">Порт, на котором Tor предоставляет свой прозрачный прокси (по умолчанию: 9040, 0 - для отключения)</string>
+  <string name="pref_transport_dialog">Настройка порта прозрачного прокси</string>
+  <string name="pref_dnsport_title">Порт DNS Tor</string>
+  <string name="pref_dnsport_summary">Порт, на котором Tor предоставляет свой DNS (по умолчанию: 5400, 0 - для отключения)</string>
+  <string name="pref_dnsport_dialog">Настройка порта DNS</string>
+  <string name="pref_torrc_title">Пользовательские настройки Torrc</string>
+  <string name="pref_torrc_summary">ТОЛЬКО ДЛЯ ЭКСПЕРТОВ: внесите настройки напрямую в строки файла конфигурации torrc</string>
+  <string name="pref_torrc_dialog">Пользовательские Torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus -  приложение Benetech документация по правам человека </string>
+  <string name="your_tor_public_ips_">Ваши публичные IP-адреса Tor:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Пожалуйста, отключите эту программу в Android->Настройки->Приложения, если у вас возникли проблемы с Orbot:</string>
+  <string name="app_conflict"> Конфликт приложений</string>
+  <string name="pref_transproxy_refresh_title">Автообновление прозрачного прокси</string>
+  <string name="pref_transproxy_refresh_summary">Повторно применить правила прозрачного прокси при изменении состояния сети</string>
+  <string name="pref_transproxy_flush_title">ПРИНУДИТЕЛЬНОЕ УДАЛЕНИЕ прозрачного прокси</string>
+  <string name="pref_transproxy_flush_summary">Нажмите здесь, чтобы НЕМЕДЛЕННО очистить все сетевые правила прозрачного прокси</string>
+  <string name="transparent_proxy_rules_flushed_">Правила прозрачного прокси удалены!</string>
+  <string name="you_do_not_have_root_access_enabled">У вас не включён root-доступ</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Возможно, потребуется остановить и запустить Orbot заново для подключения изменений настроек.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">кбит/с</string>
+  <string name="mbps">мбит/с</string>
+  <string name="kb">КБ</string>
+  <string name="mb">МБ</string>
+  <string name="bridges_updated">Мосты обновлены</string>
+  <string name="restart_orbot_to_use_this_bridge_">Пожалуйста, перезапустите Orbot для вступления изменения в силу</string>
+  <string name="menu_qr">QR-коды</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Если ваша сеть мобильной связи активно блокирует Tor, вы можете использовать мосты Tor для доступа к сети. Выберите один из типов мостов выше, чтобы включить эту функцию.</string>
+  <string name="bridge_mode">Режим моста</string>
+  <string name="get_bridges_email">Эл. почта</string>
+  <string name="get_bridges_web">Сайт</string>
+  <string name="activate">Активация</string>
+  <string name="apps_mode">VPN-режим приложений</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Вы можете включить функцию перенаправления всех приложений на вашем устройстве через сеть Tor, используя функцию VPN в Android.\n\n* ПРЕДУПРЕЖДЕНИЕ * Это новая экспериментальная функция и в некоторых случаях может остановиться или не запуститься автоматически. Она не должна быть использована для анонимности, а ТОЛЬКО для прохождения фильтров и межсетевых экранов.</string>
+  <string name="send_email">Отправить письмо</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Вы можете получить адрес моста по электронной почте, с сайта или путём сканирования QR-кода. Выберите \"Эл. почта\" или \"Сайт\" ниже, чтобы запросить адрес моста.\n\nПолученный адрес скопируйте и вставьте его в разделе настроек Orbot \"Мосты\", после чего перезапустите приложение.</string>
+  <string name="install_orweb">Установить Orfox</string>
+  <string name="standard_browser">Стандартный браузер</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">ПРИМЕЧАНИЕ: только стандартные мосты Tor работают на устройствах Intel X86/Atom</string>
+  <string name="vpn_default_world">Мир</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-si-rLK/strings.xml b/orbotservice/src/main/res/values-si-rLK/strings.xml
new file mode 100644
index 0000000..e4dc474
--- /dev/null
+++ b/orbotservice/src/main/res/values-si-rLK/strings.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">Tor ආරම්භ කිරීම හා නැවතීම</string>
+  <string name="tor_proxy_service_process">Tor නියුතු සේවා </string>
+  <string name="status_starting_up">Orbot ආරම්භ කරමින්…</string>
+  <string name="status_activated">Tor ජාලයට සබැදියි</string>
+  <string name="status_disabled">Orbot ක්‍රියාවිරහිත කර ඇත </string>
+  <string name="tor_process_starting">Tor දායකයා ආරම්භ කරමින්...</string>
+  <string name="tor_process_complete">සම්පුර්ණයි.</string>
+  <string name="tor_process_waiting">රැදී සිටියි.</string>
+  <string name="not_anonymous_yet">අවවාදයයි: ඔබේ ගනුදෙනු තවම නිර්නාමික නොමැත. කරුණාකර ඔබේ යෙදුම් සදහා HTTP proxy 127.0.0.1:8118 හෝ SOCKS4A හෝ SOCKS5 proxy 127.0.0.1:9050 භාවිතා වන පරිදි වින්‍යාස කරගන්න.</string>
+  <string name="menu_home">මුල්පිටුව</string>
+  <string name="menu_browse">පිරික්සන්න</string>
+  <string name="menu_settings">සිටවුම්</string>
+  <string name="menu_log">ලොගය </string>
+  <string name="menu_info">උදව්</string>
+  <string name="menu_start">අරඹන්න</string>
+  <string name="menu_stop">නවත්වන්න</string>
+  <string name="menu_about">පිළිබද</string>
+  <string name="main_layout_download">භාගත කරන්න </string>
+  <string name="main_layout_upload">උඩුගත කරන්න </string>
+  <string name="button_help">උදව්</string>
+  <string name="button_close">වසන්න</string>
+  <string name="button_about">පිළිබද</string>
+  <string name="button_clear_log">ලොගය හිස් කරන්න </string>
+  <string name="menu_verify">පරීක්ෂා කරන්න</string>
+  <string name="menu_exit">ඉවත් වන්න</string>
+  <string name="press_to_start">- ආරම්භ කිරීමට ටික වෙලාවක් තදකරන්න -</string>
+  <string name="pref_trans_proxy_group">පාරදෘශ්‍ය නියුතුසේවා (මුලය අවශ්‍ය වේ)</string>
+  <string name="pref_trans_proxy_title">පාරදෘශ්‍ය නියුතුසේවා</string>
+  <string name="pref_trans_proxy_summary">යොමුන් ස්වයංක්‍රීයව ටොර්කරණය </string>
+  <string name="pref_transparent_all_title">Tor සියල්ල</string>
+  <string name="pref_transparent_all_summary">Tor තුල සියළු යොමුවලට පවතින නියුතුසේවා තදබදය</string>
+  <string name="pref_transparent_port_fallback_title">පෝට නියුතුසේවා පසුබැසීම </string>
+  <string name="pref_transparent_port_fallback_summary">අවවාදයයි: මගහැරිය යුතු පොදු පෝට (80, 443, යනාදිය). *භාවිතාව හුදෙක්* \'සියළු\' සෝ \'යොමු\' ප්‍රකාර වැඩ නොකරන්නේ නම් පමණි.</string>
+  <string name="pref_transparent_port_title">පෝට ලැයිස්තුව </string>
+  <string name="pref_transparent_port_summary">නියුතුසේවා සදහා පෝට ලැයිස්තුව. *භාවිතාව හුදෙක්* \'සියළු\' සෝ \'යොමු\' ප්‍රකාර වැඩ නොකරන්නේ නම් පමණි.</string>
+  <string name="pref_transparent_port_dialog">පෝට නියුතුසේවාවට එක් කරන්න</string>
+  <string name="pref_has_root">මුල ප්‍රවේශය ඉල්ලන්න </string>
+  <string name="pref_has_root_summary">පාරදෘශ්‍ය නියුතුසේවා සදහා මුල ප්‍රවේශය ඉල්ලන්න </string>
+  <string name="status_install_success">Tor ද්විමයන් සාර්ථකව ස්ථාපනය කරන ලදී!</string>
+  <string name="status_install_fail">Tor ද්විමය ගොනුවන් ස්ථාපනය කිරීමට නොහැකි විය. කරුණාකර ලොගය පරික්ෂාකර tor-assistants at torproject.org ට දැනුම් දෙන්න</string>
+  <string name="title_error">යෙදුම් දෝෂ </string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Orbot පිලිබදව </string>
+  <string name="btn_next">ඊලග </string>
+  <string name="btn_back">පසුපසට</string>
+  <string name="btn_finish">අවසානයි </string>
+  <string name="btn_okay">එකගයි</string>
+  <string name="btn_cancel">අවලංගු කරන්න</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Orbot පිළිබද ඇතැම් විස්තර </string>
+  <string name="wizard_permissions_root">අනුමැතිය ලැබී ඇත.</string>
+  <string name="wizard_permissions_stock">Orbot අනුමැතියන් </string>
+  <string name="wizard_premissions_msg_root">අනර්ඝයි! ඔබ මුල Orbot සදහා මුල අනුමැතියන් සබල කර ඇති බව අපට අනාවරණය විය. අප මෙම බලය නැණවත් ලෙස භාවිතා කිරීමට පොරොන්දු වෙමු.</string>
+  <string name="wizard_permissions_msg_stock">අත්‍යවශ්‍ය නොවුවත් Orbot හට මුල ප්‍රවේශය ලබාදීමෙන් එය බලගතු මෙවලමක් බවට පත්වේ. පහල බොත්තම භාවිතයෙන් Orbot හට සුපිරිබලය ලබාදෙන්න!</string>
+  <string name="wizard_permissions_no_root">ඔබට මුල ප්‍රවේශය සම්බන්ධව කිසිදු අවබෝධයක් නොමැති නම්, Orbot වල වඩා කරන යොමුන් පමණක් භාවිතා කරන්න.</string>
+  <string name="wizard_permissions_consent">මා හට වැටහෙයි. සුපිරි පරිශිලකයා නොමැතිව දිගටම කරගෙන යාමට කැමැත්තෙමි.</string>
+  <string name="wizard_permission_enable_root">Orbot හට මුලය ප්‍රදානය කරන්න </string>
+  <string name="wizard_configure">ටොර්කරණය වින්‍යාස කරන්න </string>
+  <string name="wizard_configure_msg">Orbot ඔබට සියළු යොමුවල ගනුදෙනු Tor තුලින් යැවීමට හෝ ඔබේ යොමු තනි තනිව තෝරාගැනීමට අවකාශ ලබාදේ.</string>
+  <string name="wizard_configure_all">සියළු යොමුවලට පවතින නියුතුසේවා Tor තුලින් යවන්න </string>
+  <string name="wizard_configure_select_apps">තනි යොමුන් Tor සදහා තෝරාගන්න </string>
+  <string name="wizard_tips_tricks">Orbot සබල කල යොමු </string>
+  <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="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>
+  <string name="wizard_final">Orbot සුදානම්!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">මෙමගින් ඔබේ වෙබ් බ්‍රව්සරය https://check.torproject.org ට විවෘත වේ. එවිට ඔබට Orbot නිසි ලෙස වින්‍යාස වී ඇතිදැයි හා ඔබ Tor ජාලයට සම්බන්ධ වී ඇතිදැයි දැකගත හැක.</string>
+  <string name="pref_hs_group">සැගවුණු සේවා සත්කාර කරමින් </string>
+  <string name="pref_general_group">පොදු</string>
+  <string name="pref_start_boot_title">Orbot ඇරඹුම් ධාවකයේ අරඹන්න </string>
+  <string name="pref_start_boot_summary">Orbot ස්වයංක්‍රියව ආරම්භ කර, ඔබේ Android උපකරණය පටන්ගත් විට Tor වලට සම්බන්ධ කරගන්න.</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">අවවාදයයි</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">අනුමැතිය</string>
+  <string name="wizard_permissions_root_msg1">ඔබට අවශ්‍ය නම් Orbot සුපිරි පරිශීලකයාට පාරදෘශ්‍ය නියුතු සේවා වැනි ප්‍රගමන විශේෂාංග සබල කිරීමට අවසර ලබාදිය හැක. </string>
+  <string name="wizard_permissions_root_msg2">ඔබට මෙය සිදු කිරීමට අවශ්‍යතාවක් නොමැති නම්, Orbot වල වැඩා කරන යොමුන් පමණක් භාවිතා කරන්න.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Orbot සබල කල යොමු</string>
+  <string name="wizard_tips_play">Google Play තුලින් Guardian Project apps තෝරාගන්න </string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">පාරදෘශ්‍ය නියුතුසේවා</string>
+  <string name="wizard_transproxy_msg">මෙමගින් ඔබේ යොමුන්ට කිසිදු වින්‍යසකරණයක් නොමැතිව Tor ජාලය හරහා ස්වයංක්‍රියව ක්‍රියාත්මක විය හැක.</string>
+  <string name="wizard_transproxy_hint">(ඔබට අප සදහන් කල කරුණු පිළිබද අවබෝධයක් නොමැති නම් මෙම කොටුව සලකුණු කරන්න)</string>
+  <string name="wizard_transproxy_none">කිසිවක් නොමැත</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Wifi හා USB Tethered උපාංග සදහා Tor පාරදෘශ්‍ය නියුතු සේවාව සබල කරන්න (නැවත ආරම්භ කිරීමක් අවශ්‍යවේ)</string>
+  <string name="button_grant_superuser">සුපිරි පරිශීලකයාගේ ප්‍රවේශය ඉල්ලන්න </string>
+  <string name="pref_select_apps">යොමුන් තෝරාගන්න </string>
+  <string name="pref_select_apps_summary">Tor හරහා යැවීමට යොමුන් තෝරාගන්න </string>
+  <string name="pref_node_configuration">නොඩු වින්‍යාසකරණය </string>
+  <string name="pref_node_configuration_summary">මේවා ඔබේ නිර්නාමිකතාව අඩු කරන ප්‍රගමන සිටුවම් ය.</string>
+  <string name="pref_entrance_node">ඇතුළු විමේ නොඩු </string>
+  <string name="pref_entrance_node_summary">පළමු hop සදහා අගිලිසලකුණු, nicks, රටවල් හා ලිපිනයන් </string>
+  <string name="pref_entrance_node_dialog">ඇතුළු විමේ නොඩුවලට පිවිසෙන්න </string>
+  <string name="pref_proxy_title">Outbound ජාල නියුතු </string>
+  <string name="pref_proxy_type_title">Outbound නියුතු වර්ගයකි </string>
+  <string name="pref_proxy_type_summary">නියුතු සේවාදායකයන් සදහා ප්‍රොටෝකෝල: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">නියුතු සේවා වර්ගය ඇතුලත් කරන්න </string>
+  <string name="pref_proxy_host_title">Outbound නියුතු සත්කාරයකි  </string>
+  <string name="pref_proxy_host_summary">නියුතු සේවාදායකගේ සත්කාරක නාමය </string>
+  <string name="pref_proxy_host_dialog">නියුතුසේවා සත්කාරය ඇතුලු කරන්න </string>
+  <string name="pref_proxy_port_title">Outbound නියුතු පොර්ටයකි </string>
+  <string name="pref_proxy_port_summary">නියුතු සේවාදායක පෝටය</string>
+  <string name="pref_proxy_port_dialog">නියුතු සේවා පෝටය ඇතුළු කරන්න </string>
+  <string name="status">තත්වය</string>
+  <string name="setting_up_full_transparent_proxying_">සම්පුර්ණ පාරදෘශ්‍ය නියුතුසේවා පිහිටුවීම...</string>
+  <string name="setting_up_app_based_transparent_proxying_">යොමු පදනම් කරගෙන ක්‍රියාත්මක වන පාරදෘශ්‍ය නියුතුසේවා පිහිටුවීම...</string>
+  <string name="transparent_proxying_enabled">පාරදෘශ්‍ය නියුතුසේවා සබල කර ඇත </string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy Tethering සදහා සබල කර ඇත!</string>
+  <string name="warning_error_starting_transparent_proxying_">අවවාදයයි: පාරදෘශ්‍ය නියුතුසේවාවෙන් දෝෂයක් හටගෙන ඇත!</string>
+  <string name="transproxy_rules_cleared">TransProxy කොන්දේසි ඉවත් කර ඇත </string>
+  <string name="couldn_t_start_tor_process_">Tor ක්‍රියාවලින් ආරම්භ කිරීමට නොහැකි විය:</string>
+  <string name="setting_up_port_based_transparent_proxying_">පෝට පදනම් කරගෙන ක්‍රියාත්මක වන පාරදෘශ්‍ය නියුතුසේවා පිහිටුවීම...</string>
+  <string name="bridge_error">සේතු දෝෂයකි</string>
+  <string name="bridge_requires_ip">සේතු විශේෂාංග භාවිතාය සදහා ඔබ අඩු තරමින් එක් සේතු IP ලිපිනයක් හෝ ඇතුලත් කල යුතුය.</string>
+  <string name="send_email_for_bridges">\"get bridges\" නම් පේලිය විද්‍යුත් ලිපියේ දේහයේ ඇතුලත් කර gmail ගිණුමකින් bridges at torproject.org ලිපිනයට යවන්න.</string>
+  <string name="error">දෝෂයකි</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">ඔබේ සේන්දුවන ලිපිනයෙහි සිටුවම්වල ව්‍යතිරේකයක් හටගෙන ඇත!</string>
+  <string name="your_relay_settings_caused_an_exception_">ඔබේ ප්‍රතියෝජක සිටුවම්වල ව්‍යතිරේකයක් හටගෙන ඇත!</string>
+  <string name="exit_nodes">පිටවුම් නෝඩු</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">පළමු hop සදහා අගිලිසලකුණු, nicks, රටවල් හා ලිපිනයන්</string>
+  <string name="enter_exit_nodes">පිටවුම් නොඩුවලට පිවිසෙන්න</string>
+  <string name="exclude_nodes">අත්හරින නොඩු</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">අත්හරින අගිලිසලකුණු, nicks, රටවල් හා ලිපිනයන්</string>
+  <string name="enter_exclude_nodes">අත්හරින නොඩුඩුවලට පිවිසෙන්න</string>
+  <string name="strict_nodes">දැඩි නොඩු </string>
+  <string name="use_only_these_specified_nodes">ඉහත සදහන් නොඩු *පමණක්* භාවිතා කරන්න </string>
+  <string name="bridges">සේතු</string>
+  <string name="use_bridges">සේතු භාවිතා කරන්න </string>
+  <string name="bridges_obfuscated">සේතු අදුරු කරන්න </string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Tor ජාලයට විකල්ප ඇතුළු විමේ නොඩු සබල කරන්න </string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">වින්‍යාස කර ඇති සේතු අදුරු කල සේතු නම් ඒවා සබල කරන්න </string>
+  <string name="ip_address_and_port_of_bridges">IP ලිපිනය හා සේතුවල පෝට</string>
+  <string name="enter_bridge_addresses">සේතු ලිපිනයන් ඇතුළු කරන්න </string>
+  <string name="relays">ප්‍රතියෝජකය</string>
+  <string name="relaying">ප්‍රතියෝජනය </string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">ඔබේ උපාංගය නික්ම-නොයන ප්‍රතියෝජකයක් බවට සබල කරන්න </string>
+  <string name="relay_port">ප්‍රතියෝජක පෝටය</string>
+  <string name="listening_port_for_your_tor_relay">Tor ප්‍රතියෝජකයට සවන්දෙන පෝටය </string>
+  <string name="enter_or_port">OR පෝටය ඇතුළු කරන්න </string>
+  <string name="relay_nickname">ප්‍රතියෝජක අපනාමය</string>
+  <string name="the_nickname_for_your_tor_relay">ඔබේ Tor ප්‍රතියෝජකයේ අපනාමය</string>
+  <string name="enter_a_custom_relay_nickname">ව්‍යාවහාරික ප්‍රතියෝජක අපනාමය ඇතුළු කරන්න </string>
+  <string name="reachable_addresses">සේන්දු වියහැකි ලිපිනය </string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">සේවාදායකයෙකු ලෙස firewall පිටුපස සිට සිමාකාරී පිළිවෙත් සමග ක්‍රියාකරන්න</string>
+  <string name="reachable_ports">සේන්දු වියහැකි පෝටයන්</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">සිමාකාරී firewall පිටුපස සේන්දුවිය හැකි පෝටයන්</string>
+  <string name="enter_ports">පෝටයන් ඇතුළු කරන්න </string>
+  <string name="enable_hidden_services">සැගවුණු සේවා සත්කාර කරමින් </string>
+  <string name="run_servers_accessible_via_the_tor_network">උපාංග මත දිවෙන සේවාදායකයාට Tor ජාලයට ප්‍රවේශවීමට ඉඩදෙන්න</string>
+  <string name="enter_localhost_ports_for_hidden_services">සැගවුණු සේවා සදහා ඇති localhost පෝටයන් ඇතුළු කරන්න </string>
+  <string name="hidden_service_ports">සැගවුණු සේවා පෝටයන්</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">ඔබේ සැගවුණු සේවා සදහා අමතන නාමය (ස්වයංක්‍රියව ජනනය වූ)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">නිදොස් කිරීමේ ලොගය ප්‍රතිදානය සදහා සබල කරන්න (නැරඹීම සදහා adb or aLogCat භාවිතා කරන්න)</string>
+  <string name="project_home">ව්‍යාපෘති නිවහන(න්):</string>
+  <string name="the_tor_license">Tor බලපත්‍රය</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3 වන පාර්ශව මෘදුකාංග</string>
+  <string name="hidden_service_request">යොමුවකට සැගවුණු සේවාදායක %S පෝටය Tor ජාලයට විවෘත කිරීමට උවමනාය. මෙය සුරක්ෂිතවන්නේ ඔබ මෙම යොමුව විශ්වාස කරනවා නම්  පමණි.</string>
+  <string name="found_existing_tor_process">පවතින Tor ක්‍රියාවලි හමුවිය...</string>
+  <string name="something_bad_happened">යම් නොමනා දෙයක් සිදුවිය. ලොගය පරික්ෂා කර බලන්න </string>
+  <string name="hidden_service_on">සැගවුණු සේවා පිහිටන්නේ:</string>
+  <string name="unable_to_read_hidden_service_name">සැගවුණු සේවා නාමය කියවීමට නොහැකිය </string>
+  <string name="unable_to_start_tor">Tor ආරම්භ කිරීමට නොහැකිය:</string>
+  <string name="pref_use_sys_iptables_title">පෙරනිමි IP වගුව භාවිතා කරන්න </string>
+  <string name="pref_use_sys_iptables_summary">Orbot හී ද්විමය ip වගු වෙනුවට උපාංගයේ පිහිටි ද්විමය ip වගු භාවිතා කරන්න </string>
+  <string name="error_installing_binares">Tor දිවිමයන් ස්ථාපනයට හෝ උත්ශ්‍රේණි කිරීමට නොහැකි විය.</string>
+  <string name="pref_use_persistent_notifications">Orbot සම්බන්ධ වී ඇති සැමවිටම විට මෙවලම් තීරුවේ නිරූපකය තබාගන්න</string>
+  <string name="pref_use_persistent_notifications_title">නිවේදන ලැබීමට සලස්වන්න </string>
+  <string name="notification_using_bridges">සේතු සබල කර ඇත!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Orbot සදහා පෙදෙසිය සහ භාෂාව තෝරන්න </string>
+  <string name="wizard_locale_title">භාෂාව තෝරන්න </string>
+  <string name="wizard_locale_msg">සම්මතය අතහැර වර්තමාන භාෂාවට මාරුවෙන්න </string>
+  <string name="btn_save_settings">සිටුවම් සුරැකින්න</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-sk-rSK/strings.xml b/orbotservice/src/main/res/values-sk-rSK/strings.xml
new file mode 100644
index 0000000..b7578c4
--- /dev/null
+++ b/orbotservice/src/main/res/values-sk-rSK/strings.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_info">Pomocník</string>
+  <string name="button_help">Pomocník</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Nastavenia proxy</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-sk/strings.xml b/orbotservice/src/main/res/values-sk/strings.xml
new file mode 100644
index 0000000..2f648ef
--- /dev/null
+++ b/orbotservice/src/main/res/values-sk/strings.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">štart a stop Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot štartuje…</string>
+  <string name="status_activated">Pripojený do Tor siete</string>
+  <string name="status_disabled">Orbot je deaktivovaný</string>
+  <string name="tor_process_starting">Štartujem Tor klienta...</string>
+  <string name="tor_process_complete">hotovo.</string>
+  <string name="tor_process_waiting">čakám.</string>
+  <string name="not_anonymous_yet">VAROVANIE: Váš prenos nie je ešte anonymný! Prosím, nakonfigurujte aplikácie aby používali HTTP proxy 127.0.0.1:8118 alebo SOCKS4A alebo SOCKS5 proxy server 127.0.0.1:9050</string>
+  <string name="menu_home">Domov</string>
+  <string name="menu_browse">Prehliadať</string>
+  <string name="menu_settings">Nastavenia</string>
+  <string name="menu_info">Pomocník</string>
+  <string name="menu_about">O aplikácií</string>
+  <string name="button_help">Pomocník</string>
+  <string name="button_close">Zatvoriť</string>
+  <string name="button_about">O aplikácií</string>
+  <string name="menu_verify">Skontrolovať</string>
+  <string name="menu_exit">Ukončiť</string>
+  <string name="btn_back">Späť</string>
+  <string name="btn_cancel">Zrušiť</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Nastavenie proxy</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Všeobecné</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Varovanie</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">Žiadny</string>
+  <string name="status">Stav</string>
+  <string name="error">Chyba</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Uložiť nastavenie</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-sl/strings.xml b/orbotservice/src/main/res/values-sl/strings.xml
new file mode 100644
index 0000000..1b8a4c6
--- /dev/null
+++ b/orbotservice/src/main/res/values-sl/strings.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org/?lang=sl</string>
+  <string name="secure_default_web_url">https://check.torproject.org/?lang=sl</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">začni in ustavi Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot se zaganja...</string>
+  <string name="status_activated">Povezan v omrežje Tor</string>
+  <string name="status_disabled">Orbot ni aktiviran</string>
+  <string name="tor_process_starting">Zagon Tor klijenta...</string>
+  <string name="tor_process_complete">končano.</string>
+  <string name="tor_process_waiting">čakam.</string>
+  <string name="not_anonymous_yet">POZOR: Vaš promet še ni anonimen! Prosimo, nastavite vaše aplikacije da uporabijo HTTP posredniški strežnik 127.0.0.1:8118 ali SOCKS4A ali SOCKS5 posredniški strežnik 127.0.0.1:9050</string>
+  <string name="menu_home">Glavni meni</string>
+  <string name="menu_browse">Brskaj</string>
+  <string name="menu_settings">Nastavitve</string>
+  <string name="menu_log">Dnevnik</string>
+  <string name="menu_info">Pomoč</string>
+  <string name="menu_start">Začni</string>
+  <string name="menu_stop">Ustavi</string>
+  <string name="menu_about">O programu</string>
+  <string name="main_layout_download">Prenesi</string>
+  <string name="main_layout_upload">Naloži</string>
+  <string name="button_help">Pomoč</string>
+  <string name="button_close">Zapri</string>
+  <string name="button_about">O programu</string>
+  <string name="button_clear_log">Počisti dnevnik</string>
+  <string name="menu_verify">Preveri</string>
+  <string name="menu_exit">Izhod</string>
+  <string name="press_to_start">- dolg pritisk za začetek -</string>
+  <string name="pref_trans_proxy_group">Transparentno delovanje prek posredniškega strežnika (potrebuje root)</string>
+  <string name="pref_trans_proxy_title">Transparentno delovanje prek posredniškega strežnika</string>
+  <string name="pref_trans_proxy_summary">Samodejno preusmerjanje aplikacij preko Tor</string>
+  <string name="pref_transparent_all_title">Tor karkoli</string>
+  <string name="pref_transparent_all_summary">Posredovanje prometa za vse aplikacije preko Tor</string>
+  <string name="pref_transparent_port_fallback_title">Nadomestna posredniška vrata</string>
+  <string name="pref_transparent_port_fallback_summary">OPOZORILO: Obide skupne porte (80, 443, itd.) * UPORABI LE * v primeru če  \"Vsi\" ali \"App\" način ne deluje.</string>
+  <string name="pref_transparent_port_title">Seznam vrat</string>
+  <string name="pref_transparent_port_summary">Seznam portov za posredniški strežnik. * UPORABI LE * v primeru če \"Vsi\" ali \"App\" način ne deluje</string>
+  <string name="pref_transparent_port_dialog">Vnesi vrata za posredniški strežnik</string>
+  <string name="pref_has_root">Zahtevaj korenski dostop</string>
+  <string name="pref_has_root_summary">Zahtevaj korenski dostop za transparentno posredovanje</string>
+  <string name="status_install_success">Tor binarne datoteke so uspešno nameščene!</string>
+  <string name="status_install_fail">Ni bilo možno namestiti Tor binarnih datotek. Prosimo preverite log in obvestite tor-assistants at torproject.org</string>
+  <string name="title_error">Napaka v programu</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">O programu Orbot</string>
+  <string name="btn_next">Naprej</string>
+  <string name="btn_back">Nazaj</string>
+  <string name="btn_finish">Zaključi</string>
+  <string name="btn_okay">Potrdi</string>
+  <string name="btn_cancel">Prekini</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Nekaj podrobnosti o Orbot-u</string>
+  <string name="wizard_permissions_root">Dovoljenje dodeljeno</string>
+  <string name="wizard_permissions_stock">Orbot dovoljenja</string>
+  <string name="wizard_premissions_msg_root">Odlično! Ugotovili smo, da imate omogočeno root dovoljenje za Orbot. To moč bomo modro uporabili.</string>
+  <string name="wizard_permissions_msg_stock">Čeprav to ni potrebno, lahko Orbot postane bolj zmogljivo orodje, če ima vaša naprava korenski dostop. Uporabite spodnji gumb za odobritev Orbot velesile!</string>
+  <string name="wizard_permissions_no_root">Če nimate korenski dostop ali nimate pojma o čem je beseda, se le prepričajte, da uporabljate aplikacije, narejene za delo z Orbot.</string>
+  <string name="wizard_permissions_consent">Razumem in želim nadaljevati kot Superuporabnik.</string>
+  <string name="wizard_permission_enable_root">Dodeli Root za Orbot</string>
+  <string name="wizard_proxy_help_info">Nastavitve posredniškega (proxy) strežnika</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Splošno</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Opozorilo</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Dovoljenja</string>
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="status">Stanje</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Shrani nastavitve</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-sn/strings.xml b/orbotservice/src/main/res/values-sn/strings.xml
new file mode 100644
index 0000000..ad1cd1d
--- /dev/null
+++ b/orbotservice/src/main/res/values-sn/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="menu_settings">Zvamada</string>
+  <string name="menu_about">Maererano</string>
+  <string name="button_about">Maererano</string>
+  <string name="menu_exit">Buda</string>
+  <string name="wizard_btn_tell_me_more">Maererano Orbot</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Proxy Zvamada</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-sq/strings.xml b/orbotservice/src/main/res/values-sq/strings.xml
new file mode 100644
index 0000000..5a7c989
--- /dev/null
+++ b/orbotservice/src/main/res/values-sq/strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_home">Shpi</string>
+  <string name="menu_browse">Lundro</string>
+  <string name="menu_settings">Zgjedhjet</string>
+  <string name="menu_info">Ndihmë</string>
+  <string name="menu_about">Informacione</string>
+  <string name="button_help">Ndihmë</string>
+  <string name="button_close">Mbylle</string>
+  <string name="button_about">Informacione</string>
+  <string name="menu_exit">Dil</string>
+  <string name="btn_back">Mbrapa</string>
+  <string name="btn_cancel">Anullo</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_proxy_help_info">Konfigurimi i Proxy</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Të Përgjithshme</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Warning</string>
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_none">Asnjë</string>
+  <string name="status">Gjëndja</string>
+  <string name="error">Gabim</string>
+  <string name="default_bridges"></string>
+  <string name="btn_save_settings">Shpëto Konfigurmin</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-sr/strings.xml b/orbotservice/src/main/res/values-sr/strings.xml
new file mode 100644
index 0000000..b3cc7ed
--- /dev/null
+++ b/orbotservice/src/main/res/values-sr/strings.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Орбот</string>
+  <string name="app_description">Орбот је бесплатна прокси апликација која даје моћ другим апликацијама да безбедније користе интернет. Орбот користи Тор за шифровање вашег интернет саобраћаја и онда га скрива слањем кроз низ рачунара широм света. Тор је слободан софтвер и отворена мрежа која помаже да се одбраните од разних облика надзора мрежа који угрожавају личну слободу и приватност, поверљиве пословне активности и личне односе и државне безбедности познате као анализа саобраћаја.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">покрени и заустави Tor</string>
+  <string name="tor_proxy_service_process">Тор прокси услуга</string>
+  <string name="status_starting_up">Орбот се покреће...</string>
+  <string name="status_activated">Повезан са Тор мрежом</string>
+  <string name="status_disabled">Орбот је деактивиран</string>
+  <string name="tor_process_starting">Покреће се Тор клијент...</string>
+  <string name="tor_process_complete">завршено.</string>
+  <string name="tor_process_waiting">чекам.</string>
+  <string name="not_anonymous_yet">УПОЗОРЕЊЕ: Ваш промет још није анониман! Молимо вас да подесите Ваше апликације да користе HTTP прокси 127.0.0.1:8118 или SOCKS4A или SOCKS5 прокси 127.0.0.1:9050</string>
+  <string name="menu_home">Почетна</string>
+  <string name="menu_browse">Разгледање</string>
+  <string name="menu_settings">Подешавања</string>
+  <string name="menu_log">Логови</string>
+  <string name="menu_info">Помоћ</string>
+  <string name="menu_apps">ВПН</string>
+  <string name="menu_start">Крени</string>
+  <string name="menu_stop">Заустави</string>
+  <string name="menu_about">О нама</string>
+  <string name="main_layout_download">Преузимање</string>
+  <string name="main_layout_upload">Отпремање</string>
+  <string name="button_help">Помоћ</string>
+  <string name="button_close">Затвори</string>
+  <string name="button_about">О нама</string>
+  <string name="button_clear_log">Очисти логове</string>
+  <string name="menu_verify">Провери</string>
+  <string name="menu_exit">Излаз</string>
+  <string name="press_to_start">- задржите дужи притисак  за почетак -</string>
+  <string name="pref_trans_proxy_group">Транспарентно проксирање (захтева root приступ)</string>
+  <string name="pref_trans_proxy_title">Транспарентно слање кроз прокси</string>
+  <string name="pref_trans_proxy_summary">Аутоматско торифицирање апликација</string>
+  <string name="pref_transparent_all_title">Торофикуј све</string>
+  <string name="pref_transparent_all_summary">Проследи промет од свих апликација кроз Тор</string>
+  <string name="pref_transparent_port_fallback_title">Резерван порт проксија</string>
+  <string name="pref_transparent_port_fallback_summary">УПОЗОРЕЊЕ: Заобилажење честих портова (80, 443 итд). КОРИСТИТЕ САМО ако подешавања на \"Све\" или \"Апликација\" не раде.</string>
+  <string name="pref_transparent_port_title">Листа портова</string>
+  <string name="pref_transparent_port_summary">Листа портова за прокси. Користити САМО ако опције \"Све\" или \"Апликације\" не раде.</string>
+  <string name="pref_transparent_port_dialog">Упишите портове за прослеђивање на прокси</string>
+  <string name="pref_has_root">Затражи root приступ</string>
+  <string name="pref_has_root_summary">Затражи root приступ за транспарентно проксирање</string>
+  <string name="status_install_success">Тор бинари успешно инсталирани!</string>
+  <string name="status_install_fail">Бинарне Тор датотеке нису успешно инсталиране. Молимо прегледајте логове и обавестите нас на tor-assistants at torproject.org</string>
+  <string name="title_error">Грешка у апликацији</string>
+  <string name="wizard_title">Орбот</string>
+  <string name="wizard_btn_tell_me_more">Информације о Орботу</string>
+  <string name="btn_next">Следеће</string>
+  <string name="btn_back">Назад</string>
+  <string name="btn_finish">Заврши</string>
+  <string name="btn_okay">У реду</string>
+  <string name="btn_cancel">Откажи</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Детаљи о Орботу</string>
+  <string name="wizard_details_msg">Orbot je otvorena aplikacija koja sadrzi Tor, LibEvent i Polipo. Obezbeđuje lokalni HTTP proksi (8118) i SOCKS proksi (9050) u Tor mrežu. Takođe poseduje sposobnost, da kroz Tor, šalje sav internet saobraćaj sa rutovanih uređaja.</string>
+  <string name="wizard_permissions_root">Дозвола одобрена</string>
+  <string name="wizard_permissions_stock">Орбот дозволе</string>
+  <string name="wizard_premissions_msg_root">Одлично! Детектовали смо да имате root дозволе за Орбот. Мудро ћемо искрористити ову моћ.</string>
+  <string name="wizard_permissions_msg_stock">Иако није захтевано, Орбот постаје много јачи алат ако Ваш уређај има root приступ. Користите дугме испод да бисте омогућили Орботу супер моћи.</string>
+  <string name="wizard_permissions_no_root">Ако немате root приступ или немате појма о чему причамо, само се побрините да користите апликације које су направљене да функционишу са Орботом.</string>
+  <string name="wizard_permissions_consent">Разумем и желео бих да наставим без root приступа</string>
+  <string name="wizard_permission_enable_root">Дозволи root за Орбот</string>
+  <string name="wizard_configure">Подеси торификацију</string>
+  <string name="wizard_configure_msg">Орбот Вам даје опцију да проследите сав промет од стране свих апликација или да изаберете посебно апликације које желите да проследите кроз Тор мрежу.</string>
+  <string name="wizard_configure_all">Пошаљи промет од свих апликација кроз Тор</string>
+  <string name="wizard_configure_select_apps">Означи посебно апликације чији ће се промет проследити кроз Тор</string>
+  <string name="wizard_tips_tricks">Орбот-омогућене Апликације</string>
+  <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="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>
+  <string name="wizard_final">Орбот је спреман!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Ово ће отворити Ваш веб претраживач и посетити страницу https://check.torproject.org да би проверили да ли је Орбот правилно подешен и да ли сте спојени са Тор мрежом.</string>
+  <string name="pref_hs_group">Хостинг на скривеном сервису</string>
+  <string name="pref_general_group">Опште</string>
+  <string name="pref_start_boot_title">Покрени Орбот при покретању уређаја</string>
+  <string name="pref_start_boot_summary">Аутоматски покрените Орбот и конектујте се са Тор мрежом када се упали Ваш Андроид уређај.</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Упозорење</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Дозволе</string>
+  <string name="wizard_permissions_root_msg1">Можете опционално дозволити Орботу приступ као \"Супер корисник\" да би омогућили напредне функције као што је транспарентно слање кроз прокси.</string>
+  <string name="wizard_permissions_root_msg2">Ако не желите ово да урадите, молимо Вас да се уверите да користите апликације које су подешене да раде са Орботом.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Апликације са омогућеним Орботом.</string>
+  <string name="wizard_tips_play">Пронађите све Guardian Project апликације на Google Play сервису</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Транспарентно слање кроз прокси</string>
+  <string name="wizard_transproxy_msg">Ово омогућава Вашим апликацијама да аутоматски преусмеравају промет кроз Тор мрежу без икакве конфигурације.</string>
+  <string name="wizard_transproxy_hint">(Означите овај квадратић ако немате појма о чему причамо)</string>
+  <string name="wizard_transproxy_none">Ниједан</string>
+  <string name="pref_transparent_tethering_title">Привезивање тора</string>
+  <string name="pref_transparent_tethering_summary">Омогућава Торово транспарентно слање кроз прокси за бежичне и УСБ повезивајуће уређаје (захтева рестартовање)</string>
+  <string name="button_grant_superuser">Затражи приступ као \'Superuser\'</string>
+  <string name="pref_select_apps">Изаберите апликације</string>
+  <string name="pref_select_apps_summary">Изаберите апликације чији промет ћете проследити кроз Тор</string>
+  <string name="pref_node_configuration">Конфигурација чворова</string>
+  <string name="pref_node_configuration_summary">Ово су напредне поставке које могу да смање Вашу анонимност</string>
+  <string name="pref_entrance_node">Почетни чворови</string>
+  <string name="pref_entrance_node_summary">Отисци прстију, надимци, државе и адресе првог скока</string>
+  <string name="pref_entrance_node_dialog">Унесите почетне чворове</string>
+  <string name="pref_proxy_title">Мрежни прокси за одлазећи промет (Необавезно)</string>
+  <string name="pref_proxy_type_title">Тип проксија за одлазећи промет</string>
+  <string name="pref_proxy_type_summary">Протокол који ће се користити за прокси сервер: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Унесите тип проксија</string>
+  <string name="pref_proxy_host_title">Хост проксија за одлазећи промет</string>
+  <string name="pref_proxy_host_summary">Име хоста за прокси сервер</string>
+  <string name="pref_proxy_host_dialog">Унесите хост од проксија</string>
+  <string name="pref_proxy_port_title">Порт проксија за одлазећи промет</string>
+  <string name="pref_proxy_port_summary">Порт прокси сервера</string>
+  <string name="pref_proxy_port_dialog">Унесите порт проксија</string>
+  <string name="pref_proxy_username_title">Корисничко име на проксију за одлазећи промет</string>
+  <string name="pref_proxy_username_summary">Име проксија (Необавезно)</string>
+  <string name="pref_proxy_username_dialog">Унесите корисничко име Проксија  </string>
+  <string name="pref_proxy_password_title">Шифра на проксију за одлазећи промет</string>
+  <string name="pref_proxy_password_summary">Шифра проксија (необавезно)</string>
+  <string name="pref_proxy_password_dialog">Унесите шифру проксија</string>
+  <string name="status">Статус</string>
+  <string name="setting_up_full_transparent_proxying_">Постављање потпуно трапспарентног слања кроз прокси</string>
+  <string name="setting_up_app_based_transparent_proxying_">Подешавање трапспарентног проксија од стране апликације</string>
+  <string name="transparent_proxying_enabled">Транспарентно слање кроз прокси је ОМОГУЋЕНО</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy је омогућен за привезивање</string>
+  <string name="warning_error_starting_transparent_proxying_">УПОЗОРЕЊЕ: грешка при стартовању транспарентног слања кроз прокси!</string>
+  <string name="transproxy_rules_cleared">TransProxy правила очишћена</string>
+  <string name="couldn_t_start_tor_process_">Није могуће покренути Тор процес:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Подешавање транспарентног проксирања од стране порта...</string>
+  <string name="bridge_error">Грешка у мосту</string>
+  <string name="bridge_requires_ip">Да бисте користили bridge могућност, морате унети бар једну bridge IP адресу.</string>
+  <string name="send_email_for_bridges">Пошаљите мејл на bridges at torproject.org са речима \"get bridges\" у тексту поруке мејла са gmail корисничког рачуна.</string>
+  <string name="error">Грешка</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Ваше ReachableAddresses поставке су изазвале изузетак!</string>
+  <string name="your_relay_settings_caused_an_exception_">Ваше поставке релеја су изазвале изузетак!</string>
+  <string name="exit_nodes">Излазни чворови</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Отисци, надимци, државе и адресе задњег скока</string>
+  <string name="enter_exit_nodes">Унесите излазне чворове</string>
+  <string name="exclude_nodes">Одстраните чворове</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Отисци, надимци, државе и адресе за одстрањење</string>
+  <string name="enter_exclude_nodes">Унесите чворове за одстрањење</string>
+  <string name="strict_nodes">Стриктни чворови</string>
+  <string name="use_only_these_specified_nodes">Користи САМО ове наведене чворове</string>
+  <string name="bridges">Мостови</string>
+  <string name="use_bridges">Користи bridge</string>
+  <string name="bridges_obfuscated">Мостови са bridges</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Омогући алтернативне чворове за улаз у Тор мрежу</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Омогућити ако су конфигурисани мостови мостови са баговима</string>
+  <string name="ip_address_and_port_of_bridges">IP адреса и порт bridge-а</string>
+  <string name="enter_bridge_addresses">Унесите bridge адресу </string>
+  <string name="relays">Релеји</string>
+  <string name="relaying">Релејирање</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Омогућите вашем уређају да буде релеј без излаза</string>
+  <string name="relay_port">Порт за релеј</string>
+  <string name="listening_port_for_your_tor_relay">Порт за слушање за твој Тор релеј</string>
+  <string name="enter_or_port">Укуцајте ИЛИ порт</string>
+  <string name="relay_nickname">Надимак релеја</string>
+  <string name="the_nickname_for_your_tor_relay">Надимак вашег Тор релеја</string>
+  <string name="enter_a_custom_relay_nickname">Унесите по избору надимак за релеј</string>
+  <string name="reachable_addresses">Доступне адресе</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Покрените као клијента иза firewall-а који је рестриктивно подешен</string>
+  <string name="reachable_ports">Доступни портови</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Портови доступни иза рестриктивног firewall-а</string>
+  <string name="enter_ports">Унесите портове</string>
+  <string name="enable_hidden_services">Хостинг на скривеном сервису</string>
+  <string name="run_servers_accessible_via_the_tor_network">дозволите серверу на уређају да буде доступан преко Тор мреже</string>
+  <string name="enter_localhost_ports_for_hidden_services">унесите localhost портове за скривене сервисе</string>
+  <string name="hidden_service_ports">Портови на скривеном сервису</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">адресабилно име за Ваш скривени сервис (генерише се аутоматско)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">омогућите debug логовоање (мора се користити adb или aLogCat да би се прегледали)</string>
+  <string name="project_home">Почетна за пројекте:</string>
+  <string name="the_tor_license">Тор лиценца</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Софтвер од стране неслужбених издавача:</string>
+  <string name="hidden_service_request">Апликација жели да отвори сакривен порт %S на серверу за Тор мрежу. Ово је сигуран потез уколико верујете апликацији.</string>
+  <string name="found_existing_tor_process">нађен покренути Тор процес...</string>
+  <string name="something_bad_happened">Нешто лоше се догодило. Прегледајте логове</string>
+  <string name="hidden_service_on">сакривен сервис на:</string>
+  <string name="unable_to_read_hidden_service_name">нисам у могућности да прочитам име сакривеног сервиса</string>
+  <string name="unable_to_start_tor">Тор није у могућности да се покрене:</string>
+  <string name="pref_use_sys_iptables_title">Користити уобичајене Иптабеле</string>
+  <string name="pref_use_sys_iptables_summary">користи уграђене ИПтабеле уместо оних које долазе са Орботом</string>
+  <string name="error_installing_binares">Тор бинари нису у могућности да се инсталирају или надограде.</string>
+  <string name="pref_use_persistent_notifications">Увек прикажи икону у тулбару када је Орбот конектован</string>
+  <string name="pref_use_persistent_notifications_title">Стално укључене нотификације</string>
+  <string name="notification_using_bridges">Мостови омогућени!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Изаберите локална и језичка подешавања за Орбот</string>
+  <string name="wizard_locale_title">Изаберите језик</string>
+  <string name="wizard_locale_msg">Користи подразумевајући или пребаци на тренутни језик</string>
+  <string name="btn_save_settings">Сачувај подешавања</string>
+  <string name="menu_vpn">ВПН</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-sv/strings.xml b/orbotservice/src/main/res/values-sv/strings.xml
new file mode 100644
index 0000000..5654a28
--- /dev/null
+++ b/orbotservice/src/main/res/values-sv/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot är en gratis proxyapp som möjliggör andra appar att använda internet mer säkert. Orbot använder Tor för att kryptera din internettrafik och döljer den genom att den studsar genom ett antal datorer världen över. Tor är fri programvara och ett öppet nätverk som hjälper dig att skydda dig mot en form av nätverksövervakning som hotar personlig integritet och frihet, hemliga affärsaktiviteter och relationer, och skyddar mot statlig övervakning även kallad trafikanalys.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">start and stop Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot startar...</string>
+  <string name="status_activated">Uppkopplad till Tor nätverket</string>
+  <string name="status_disabled">Orbot är inaktiverad</string>
+  <string name="status_shutting_down">TorService avslutas</string>
+  <string name="tor_process_starting">Startar Tor klient...</string>
+  <string name="tor_process_complete">färdig.</string>
+  <string name="tor_process_waiting">väntar.</string>
+  <string name="not_anonymous_yet">VARNING: Din trafik är inte anonym än! Vänligen konfigurera dina appar att använda HTTP proxy 127.0.0.1:8118 eller SOCKS4A/5 proxy 127.0.0.1:9050</string>
+  <string name="menu_home">Hem</string>
+  <string name="menu_browse">Bläddra</string>
+  <string name="menu_settings">Inställningar</string>
+  <string name="menu_log">Logg</string>
+  <string name="menu_info">Hjälp</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Start</string>
+  <string name="menu_stop">Stopp</string>
+  <string name="menu_about">Om</string>
+  <string name="menu_promo_apps">Skaffa appar...</string>
+  <string name="main_layout_download">Ladda Ner</string>
+  <string name="main_layout_upload">Ladda Upp</string>
+  <string name="button_help">Hjälp</string>
+  <string name="button_close">Stäng</string>
+  <string name="button_about">Om</string>
+  <string name="button_clear_log">Rensa logg</string>
+  <string name="menu_verify">Kontrollera</string>
+  <string name="menu_exit">Avsluta</string>
+  <string name="menu_scan">Skanna BridgeQR</string>
+  <string name="menu_share_bridge">Dela BridgeQR</string>
+  <string name="press_to_start">- tryck länge för att starta -</string>
+  <string name="pref_trans_proxy_group">Transparent proxy (kräver root)</string>
+  <string name="pref_trans_proxy_title">Transparent proxy</string>
+  <string name="pref_trans_proxy_summary">Automatisk torifiering av appar</string>
+  <string name="pref_transparent_all_title">Tor:a Allt</string>
+  <string name="pref_transparent_all_summary">Proxy trafik för alla appar genom Tor</string>
+  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
+  <string name="pref_transparent_port_fallback_summary">VARNING: Kringgår vanliga portar (80, 443, etc). *ANVÄND ENDAST* om \'Alla\' eller \'App\'-läge inte fungerar.</string>
+  <string name="pref_transparent_port_title">Port-lista</string>
+  <string name="pref_transparent_port_summary">Lista över portar att köra genom proxy. *ANVÄND ENDAST* om \'Alla\' eller \'App\'-läge inte fungerar</string>
+  <string name="pref_transparent_port_dialog">Skriv in portar till proxy</string>
+  <string name="pref_has_root">Begär root-åtkomst</string>
+  <string name="pref_has_root_summary">Begär root-åtkomst för transparent proxy</string>
+  <string name="status_install_success">Tor-filerna installerades utan problem!</string>
+  <string name="status_install_fail">De körbara Tor-filerna kunde inte installeras. Kontrollera loggen och underrätta tor-assistants at torproject.org</string>
+  <string name="title_error">Applikationsfel</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Om Orbot</string>
+  <string name="btn_next">Nästa</string>
+  <string name="btn_back">Tillbaka</string>
+  <string name="btn_finish">Slutför</string>
+  <string name="btn_okay">Okej</string>
+  <string name="btn_cancel">Avbryt</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Orbot-information</string>
+  <string name="wizard_details_msg">Orbot är en mjukvara med öppen källkod som använder sig av Tor, LibEvent och Polipo. Den tillhandahåller en lokal HTTP-proxy (8118) och en SOCKS-proxy (9050) till Tor-nätverket. Orbot har också möjligheten att, på rootade enheter, skicka all trafik genom Tor.</string>
+  <string name="wizard_permissions_root">Tillstånd givet</string>
+  <string name="wizard_permissions_stock">Orbot rättigheter</string>
+  <string name="wizard_premissions_msg_root">Utmärkt! Vi har upptäckt att du har root tillstånd aktiverat för Orbot. Vi kommer använda denna makt ansvarsfullt.</string>
+  <string name="wizard_permissions_msg_stock">Det är inte nödvändigt, men Orbot kan bli ett kraftfullare verktyg om din enhet har root tillgång. Använd knappen nedan för att ge Orbot superkrafter!</string>
+  <string name="wizard_permissions_no_root">Om du inte har root tillgång eller inte har en aning om vad vi pratar om, använd bara appar som är gjorda att fungera med Orbot.</string>
+  <string name="wizard_permissions_consent">Jag förstår och vill fortsätta utan Superuser.</string>
+  <string name="wizard_permission_enable_root">Ge Orbot root tillgång</string>
+  <string name="wizard_configure">Konfigurera torifikation</string>
+  <string name="wizard_configure_msg">Orbot ger dig möjligheten att skicka all applikationstrafik genom Tor ELLER att själv välja applikationer individuellt.</string>
+  <string name="wizard_configure_all">Proxy alla appar genom Tor</string>
+  <string name="wizard_configure_select_apps">Välj enskilda appar för Tor</string>
+  <string name="wizard_tips_tricks">Orbot-anpassade appar</string>
+  <string name="wizard_tips_msg">Apparna nedanför var utvecklade att fungera med Orbot. Klicka varje knapp för att installera nu, eller hitta dom senare på Google Play, på GuardianProject.info, eller via F-Droid.org.</string>
+  <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="wizard_tips_twitter">Ställ in Twitter proxy till värd \"localhost\" och port 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Skapa en story och ge den till Tor för säkerhet!</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>
+  <string name="wizard_proxy_help_msg">Om Android-appen du använder har stöd för en HTTP- eller SOCKS-proxy, så kan du konfigurera den at ansluta till Orbot och använda Tor.\n\n\nInställningen för värdnamn är 127.0.0.1 eller \"localhost\". För HTTP är portinställningen 8118. För SOCKS är porten 9050. Du bör använda SOCKS4A eller SOCKS5 om möjligt.\n\n\n\nDu kan lära dig mer om proxy på Android via FAQ på: http://tinyurl.com/proxyandroid\n</string>
+  <string name="wizard_final">Orbot är redo!</string>
+  <string name="wizard_final_msg">Miljoner människor världen över använder sig av Tor av flera olika orsaker.\n\nJournalister och bloggare, människorättsförsvarare, brottsbekämpare, soldater, företag, innevånare i repressiva regimer, och bara vanliga innevånare... och nu är du redo också!</string>
+  <string name="wizard_exit_at_first_screen_toast">Vänligen konfigurera Orbot innan du kan använda den!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Du har anslutit till Tor-nätverket - men detta betyder INTE att din enhet är säker. Du kan använda knappen \'Webbläsare\' för att testa din anslutning. \n\nBesök oss på https://guardianproject.info/apps/orbot eller skicka e-post till help at guardianproject.info för mer information.</string>
+  <string name="tor_check">Det här kommer att öppna din webbläsare mot https://check.torproject.org för att se om Orbot är rätt konfigurerad och du är uppkopplad mot Tor.</string>
+  <string name="pref_hs_group">Gömd Service Hosting</string>
+  <string name="pref_general_group">Allmänt</string>
+  <string name="pref_start_boot_title">Starta Orbot vid Uppstart</string>
+  <string name="pref_start_boot_summary">Starta Orbot automatiskt och anslut till Tor när din Android enhet startar upp</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot tar Tor till Android!\n\nTor hjälper dig att skydda dig från innehållsfiltrering, trafikanalys och nätverksövervakning som hotar integritet, hemlig information och personliga relationer.\n\nDen här guiden hjälper dig att konfigurera Orbot och Tor på din enhet.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Varning</string>
+  <string name="wizard_warning_msg">Bara genom att installera Orbot anonymiseras inte din mobiltrafik.\n\nDu måste ställa in Orbot, din enhet och andra appar för att använda Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Rättigheter</string>
+  <string name="wizard_permissions_root_msg1">Du kan alternativt ge Orbot \'Superuser\' tillgång för att aktivera avancerade inställningar, som till exempel Transparent Proxy.</string>
+  <string name="wizard_permissions_root_msg2">Om du inte vill göra detta, se till att bara använda appar som anpassats till Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Din enhet verkar inte vara rootad eller ge root eller \'Superuser\'-åtkomst.\n\nVänligen försök använda \'Appar\'-läget i huvudmenyn istället.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox: Integritetsförbättrad webbläsare som går genom Tor</string>
+  <string name="wizard_tips_play">Hitta alla Guardian Project appar på Google Play</string>
+  <string name="wizard_tips_fdroid">Hitta alla Guardian Project-appar i F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Hitta alla Guardian Project-appar på https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparent Proxy</string>
+  <string name="wizard_transproxy_msg">Detta tillåter dina appar att automatiskt köra genom Tor nätverket utan någon konfiguration.</string>
+  <string name="wizard_transproxy_hint">(Markera denna om du inte har någon aning om vad vi pratar om)</string>
+  <string name="wizard_transproxy_none">Ingen</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Aktivera Tor Transparent Proxy för Wifi och USB Thetered Enheter (omstart krävs)</string>
+  <string name="button_grant_superuser">Begär Superuser Tillgång</string>
+  <string name="pref_select_apps">Välj Appar</string>
+  <string name="pref_select_apps_summary">Välj Appar att Leda Genom Tor</string>
+  <string name="pref_node_configuration">Nod Konfiguration</string>
+  <string name="pref_node_configuration_summary">Det här är avancerade inställningar som kan minska din anonymitet</string>
+  <string name="pref_entrance_node">Ingångsnoder</string>
+  <string name="pref_entrance_node_summary">Fingeravtryck, nicks, länder, och adresser för första hoppet</string>
+  <string name="pref_entrance_node_dialog">Skriv in Ingångs Noder</string>
+  <string name="pref_allow_background_starts_title">Tillåt start i bakgrunden</string>
+  <string name="pref_allow_background_starts_summary">Låt alla appar säga åt Orbot att starta Tor och relaterade tjänster</string>
+  <string name="button_proxy_all">Allt genom proxy</string>
+  <string name="button_proxy_none">Inget genom proxy</string>
+  <string name="button_invert_selection">Invertera val</string>
+  <string name="pref_proxy_title">Utgående nätverksproxy (Valfri)</string>
+  <string name="pref_proxy_type_title">Proxy-typ</string>
+  <string name="pref_proxy_type_summary">Protokoll att använda för proxyserver: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Skriv in Proxy Typ</string>
+  <string name="pref_proxy_host_title">Proxy-värd</string>
+  <string name="pref_proxy_host_summary">Proxyserverns värdnamn</string>
+  <string name="pref_proxy_host_dialog">Skriv in Proxy Värd</string>
+  <string name="pref_proxy_port_title">Utgående Proxy Port</string>
+  <string name="pref_proxy_port_summary">Proxyserverns port</string>
+  <string name="pref_proxy_port_dialog">Skriv in Proxy port</string>
+  <string name="pref_proxy_username_title">Utgående proxy användarnamn</string>
+  <string name="pref_proxy_username_summary">Proxyanvändarnamn (Valfri)</string>
+  <string name="pref_proxy_username_dialog">Ange proxyanvändarnamn</string>
+  <string name="pref_proxy_password_title">Utgående proxy lösenord</string>
+  <string name="pref_proxy_password_summary">Proxylösenord (Valfri)</string>
+  <string name="pref_proxy_password_dialog">Ange proxylösenord</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Ställer in full transparent proxyfiering...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Ställer in app-baserad transparent proxyfiering...</string>
+  <string name="transparent_proxying_enabled">Transparent proxy AKTIVERAD</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy aktiverad för Tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">VARNING: kunde ej starta transparent proxy!</string>
+  <string name="transproxy_rules_cleared">TransProxy regler rensade</string>
+  <string name="couldn_t_start_tor_process_">Kunde inte starta Tor-process:</string>
+  <string name="privoxy_is_running_on_port_">Polipo körs på port:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Ställer in port-baserad transparent proxyfiering...</string>
+  <string name="bridge_error">Bro Error</string>
+  <string name="bridge_requires_ip">För att använda bro funktionen måste du skriva in minst en bro IP adress.</string>
+  <string name="send_email_for_bridges">Skicka ett email till bridges at torproject.org med linjen \"get bridges\" ensamt som meddelande från ett gmail konto.</string>
+  <string name="error">Fel</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Din NåbaraAdresser inställning orsakade ett undantag!</string>
+  <string name="your_relay_settings_caused_an_exception_">Din relä inställning orsakade ett undantag!</string>
+  <string name="exit_nodes">Utgångsnoder</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingeravtryck, nicks, länder, och adresser för sista hoppet</string>
+  <string name="enter_exit_nodes">Skriv in Exit Noder</string>
+  <string name="exclude_nodes">Exkludera Noder</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingeravtryck, nicks, länder och adresser att exkludera</string>
+  <string name="enter_exclude_nodes">Skriv in Exkluderade Noder</string>
+  <string name="strict_nodes">Strikta Noder</string>
+  <string name="use_only_these_specified_nodes">Använd *enbart* dessa specificerade noder</string>
+  <string name="bridges">Broar</string>
+  <string name="use_bridges">Använd Broar</string>
+  <string name="bridges_obfuscated">Förvillande Broar</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Aktivera alternativa ingångsnoder till Tor nätverket</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktivera om konfigurerade broar är förvillande broar</string>
+  <string name="ip_address_and_port_of_bridges">IP adress och port för broar</string>
+  <string name="enter_bridge_addresses">Skriv in Bro Adresser</string>
+  <string name="relays">Reläer</string>
+  <string name="relaying">Överföring</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Aktivera din enhet till att vara ett icke-utgångsrelä</string>
+  <string name="relay_port">Relä Port</string>
+  <string name="listening_port_for_your_tor_relay">Lyssningsport för din Tor relä</string>
+  <string name="enter_or_port">Allmänt</string>
+  <string name="relay_nickname">Relä namn</string>
+  <string name="the_nickname_for_your_tor_relay">Namnet för din Tor relä</string>
+  <string name="enter_a_custom_relay_nickname">Skriv in ett anpassat relä namn</string>
+  <string name="reachable_addresses">Nåbara Adresser</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Kör som klient bakom en brandvägg med restriktiva policys</string>
+  <string name="reachable_ports">Nåbara portar</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Portar nåbara bakom en restriktiv brandvägg</string>
+  <string name="enter_ports">Skriv in portar</string>
+  <string name="enable_hidden_services">Gömd Tjänstehosting</string>
+  <string name="run_servers_accessible_via_the_tor_network">Tillåt server på enheten att vara tillgänglig via Tor nätverket</string>
+  <string name="enter_localhost_ports_for_hidden_services">Skriv in localhost portar för gömda tjänster</string>
+  <string name="hidden_service_ports">Gömda Tjänsteportar</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">det adresserade namnet för din gömda tjänst (genereras automatiskt)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Aktivera debug loggen för output (måste använda adb eller aLogCat för att se)</string>
+  <string name="project_home">Projektets hemsidor:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor-licensen</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Tredjepartsprogramvara:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">En app vill öppna gömd tjänsteport %S till Tor nätverket. Detta är säkert om du litar på appen.</string>
+  <string name="found_existing_tor_process">hittade existerande Tor process...</string>
+  <string name="something_bad_happened">Något dåligt hände. Kolla loggen.</string>
+  <string name="hidden_service_on">gömd tjänst på:</string>
+  <string name="unable_to_read_hidden_service_name">kan inte läsa gömda tjänstens namn</string>
+  <string name="unable_to_start_tor">Kan inte starta Tor:</string>
+  <string name="unable_to_reset_tor">Starta om din enhet, kunde inte återställa Tor!</string>
+  <string name="pref_use_sys_iptables_title">Använd standard Iptables</string>
+  <string name="pref_use_sys_iptables_summary">Använd den inbyggda iptables binären istället för den som kommer med Orbot</string>
+  <string name="error_installing_binares">Tor binärerna kunde inte installeras eller uppgraderas.</string>
+  <string name="pref_use_persistent_notifications">Behåll alltid ikonen i verktygsfältet när Orbot är ansluten</string>
+  <string name="pref_use_persistent_notifications_title">Alltid-På Notifikationer</string>
+  <string name="pref_use_expanded_notifications">Visa utökad notis med Tors utgångsland och IP</string>
+  <string name="pref_use_expanded_notifications_title">Utökade notiser</string>
+  <string name="notification_using_bridges">Broar aktiverade!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Språk</string>
+  <string name="set_locale_summary">Välj plats och språk för Orbot</string>
+  <string name="wizard_locale_title">Välj språk</string>
+  <string name="wizard_locale_msg">Lämna standard eller byt nuvarande språk</string>
+  <string name="powered_by">drivs av Tor</string>
+  <string name="btn_save_settings">Spara Inställningar</string>
+  <string name="no_internet_connection_tor">Ingen internetanslutning; Tor är i standby-läge...</string>
+  <string name="bandwidth_">Bandbredd:</string>
+  <string name="down">nere</string>
+  <string name="up">uppe</string>
+  <string name="pref_disable_network_title">Ingen auto-sömn för nätverket</string>
+  <string name="pref_disable_network_summary">Låt Tor sova när inget internet finns tillgängligt</string>
+  <string name="newnym">Du har bytt till en ny Tor identitet!</string>
+  <string name="menu_verify_browser">Webbläsare</string>
+  <string name="menu_use_chatsecure">Använd ChatSecure</string>
+  <string name="permission_manage_tor_label">Hantera Tor</string>
+  <string name="permission_manage_tor_description">Låt denna app kontrollera Tor-servicen</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Det verkar inte som att du har Orfox installerad. Vill du ha hjälp med det, eller ska vi bara öppna webbläsaren?</string>
+  <string name="install_apps_">Installera appar?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Ingen nätverksanslutning. Försätter Tor i dvala...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Nätverksanslutningen fungerar. Väcker Tor...</string>
+  <string name="updating_settings_in_tor_service">uppdaterar inställningar i Tor-tjänsten</string>
+  <string name="pref_socks_title">Tor-SOCKS</string>
+  <string name="pref_socks_summary">Port som Tor erbjuder sin SOCKS-proxy på (standard: 9050 eller 0 för att inaktivera)</string>
+  <string name="pref_socks_dialog">SOCKS-port-inställningar</string>
+  <string name="pref_transport_title">Tor TransProxy-port</string>
+  <string name="pref_transport_summary">Port som Tor erbjuder sin transparenta proxy på (standard: 9040 eller 0 för att inaktivera)</string>
+  <string name="pref_transport_dialog">TransProxy-port-inställningar</string>
+  <string name="pref_dnsport_title">Tor DNS-port</string>
+  <string name="pref_dnsport_summary">Port som Tor erbjuder sin DNS på (standard: 5400 eller 0 för att inaktivera)</string>
+  <string name="pref_dnsport_dialog">DNS-port-inställningar</string>
+  <string name="pref_torrc_title">Torrc anpassad konfiguration</string>
+  <string name="pref_torrc_summary">ENDAST EXPERTER: ange torrc konfiguration direkt</string>
+  <string name="pref_torrc_dialog">Anpassad Torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string>
+  <string name="your_tor_public_ips_">Ditt publika IP via Tor:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Vänligen inaktivera den här appen i Android->Inställningar->Appar om du har problem med Orbot:</string>
+  <string name="app_conflict">Appkonflikt</string>
+  <string name="pref_transproxy_refresh_title">Transproxy auto-uppdatering</string>
+  <string name="pref_transproxy_refresh_summary">Sätt Transproxy regler igen när nätverksstatus ändras</string>
+  <string name="pref_transproxy_flush_title">Transproxy TVINGA BORTTAGNING</string>
+  <string name="pref_transproxy_flush_summary">Klicka här för att rensa alla transproxy nätverksregler NU</string>
+  <string name="transparent_proxy_rules_flushed_">Regler för transparent proxy rensade!</string>
+  <string name="you_do_not_have_root_access_enabled">Du har inte root-åtkomst aktiverad</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Du kan behöva stänga av och starta Orbot för att ändringar i inställningar ska slå igenom.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kb/s</string>
+  <string name="mbps">mb/s</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Bryggor uppdaterade</string>
+  <string name="restart_orbot_to_use_this_bridge_">Vänligen starta om Orbot för att aktivera ändringarna</string>
+  <string name="menu_qr">QR-koder</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Om ditt mobilnätverk aktivt blockerar Tor så kan du använda en brygga för att komma åt nätverket. VÄLJ en typ av brygga ovan för att aktivera bryggor.</string>
+  <string name="bridge_mode">Bryggläge</string>
+  <string name="get_bridges_email">E-post</string>
+  <string name="get_bridges_web">Webb</string>
+  <string name="activate">Aktivera</string>
+  <string name="apps_mode">Appars VPN-läge</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Du kan få alla appar på din enhet att köra via Tor-nätverket genom att använda VPN-funktionen i Android.\n\n*VARNING* Det här är en ny, experimentell funktion och kanske i vissa fall inte startas automatiskt, eller avslutas. Det bör INTE användas för anonymitet, tan BARA för att ta sig genom brandväggar och filter.</string>
+  <string name="send_email">Skicka e-post</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Du kan få en brygg-adress via e-post, via webben eller genom att skanna en QR-kod för en brygga. Välj \'E-post\' eller \'Webb\' nedan för att begära en brygg-adress.\n\nNär du väl har en adress, kopiera & klistra in den i inställningen för \"Bryggor\" i Orbot och starta om.</string>
+  <string name="install_orweb">Installera Orfox</string>
+  <string name="standard_browser">Standard-webbläsare</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTERA: Endast vanliga Tor-bryggor fungerar på Intel X86/ATOM-enheter</string>
+  <string name="vpn_default_world">Världen</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-ta/strings.xml b/orbotservice/src/main/res/values-ta/strings.xml
new file mode 100644
index 0000000..5a24f44
--- /dev/null
+++ b/orbotservice/src/main/res/values-ta/strings.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">ஆர்பாட் </string>
+  <string name="app_description">ஆர்பாட், இன்னும பாதுகாப்பான முறையில் இணைய பயன்படுத்த மற்ற பயன்பாடுகள் பலப்படுத்துகிறார் என்று ஒரு இலவச ப்ராக்ஸி பயன்பாடு ஆகும். ஆர்பாட் உங்கள் இணைய போக்குவரத்து குறியாக்க தோர் பயன்படுத்துகிறது மற்றும் அதன் பின்னர் உலகம் முழுவதும் கணினிகள் ஒரு தொடர் மூலம் எதிர்க்கிறது அதை மறுத்தவர். தோர் இலவச மென்பொருள் மற்றும் நீங்கள் போக்குவரத்து பகுப்பாய்வு
  என்ற தனிப்பட்ட சுதந்திரம் மற்றும் தனியுரிமை, ரகசிய வணிக நடவடிக்கைகள் மற்றும் உறவுகள், மற்றும் மாநில பாதுகாப்பை அச்சுறுத்தும் நெட்வொர்க் கண்காணிப்பு வடிவ எதிராக பாதுகாக்க உதவுகிறது என்று ஒரு திறந்த நெட்வொர்க் ஆகும்.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">தோர் துவக்க மற்றும் நிறுத்த</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">ஆர்பாட் துவங்குகிறது...</string>
+  <string name="status_activated">தோர் நெட்வொர்க் இணைக்கப்பட்ட</string>
+  <string name="status_disabled">ஆர்பாட் நிறுத்தப்பட்டது</string>
+  <string name="tor_process_starting">தோர் துவங்கப்படுகிறது...</string>
+  <string name="tor_process_complete">முடிந்தது.</string>
+  <string name="tor_process_waiting">காத்திருக்கிறது</string>
+  <string name="not_anonymous_yet">எச்சரிக்கை: உங்கள் போக்குவரத்து இன்னும் அநாமதேய அல்ல! HTTP பதிலாள் 127.0.0.1:8118 அல்லது SOCKS4A அல்லது SOCKS5 ப்ராக்ஸி 127.0.0.1:9050 பயன்படுத்த உங்கள் பயன்பாடுகள் கட்டமைக்க கொள்ளவும்</string>
+  <string name="menu_home">ஹோம்</string>
+  <string name="menu_browse">உலவிடு</string>
+  <string name="menu_settings">அமைப்புகள்</string>
+  <string name="menu_log">பதிவுகள்</string>
+  <string name="menu_info">உதவி</string>
+  <string name="menu_start">துவங்கு</string>
+  <string name="menu_stop">நிறுத்து</string>
+  <string name="menu_about">ஆர்பாட் பற்றி</string>
+  <string name="main_layout_download">பதிவிறக்கு</string>
+  <string name="main_layout_upload">பதிவேற்று</string>
+  <string name="button_help">உதவி</string>
+  <string name="button_close">மூடு</string>
+  <string name="button_about">ஆர்பாட் பற்றி </string>
+  <string name="button_clear_log">பதிவுகளை நீக்கு</string>
+  <string name="menu_verify">சரி பார்த்தல்</string>
+  <string name="menu_exit">வெளியேறு</string>
+  <string name="menu_scan">ஸ்கேன் BridgeQR</string>
+  <string name="menu_share_bridge">BridgeQR பகிர்ந்திடு</string>
+  <string name="press_to_start">- தொடங்க தொடர்ந்து அழுத்துக -</string>
+  <string name="pref_transparent_port_fallback_summary">எச்சரிக்கை: பொதுவான துறைகளை (80, 443, போன்றவை) circumvents. * பயன்படுத்த மட்டுமே * \'அனைத்து\' அல்லது \'ஆப்\' முறையில் வேலை இல்லை என்றால்.</string>
+  <string name="wizard_title">ஆர்பாட் </string>
+  <string name="wizard_btn_tell_me_more">ஆர்பாட் பற்றி</string>
+  <string name="btn_next">அடுத்து</string>
+  <string name="btn_back">பின் செல்</string>
+  <string name="btn_finish">முடித்திடு</string>
+  <string name="btn_okay">சரி</string>
+  <string name="btn_cancel">ரத்து செய்</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">ஆர்பாட் பற்றிய தகவல்</string>
+  <string name="wizard_details_msg">Orbot தோர், LibEvent மற்றும் Polipo கொண்டுள்ளது என்று ஒரு திறந்த மூல பயன்பாடு ஆகும். இது ஒரு local HTTP பதிலாள் (8118) மற்றும் தோர் நெட்வொர்க் ஒரு SOCKS ப்ராக்ஸி (9050) வழங்குகிறது. Orbot மேலும் தோர் மூலம் அனைத்து இணைய போக்குவரத்து அனுப்பும் திறனை, ROOTED சாதனத்தில் கொண்டிருக்கிறது.</string>
+  <string name="wizard_permissions_root">அனுமதி வழங்கப்பட்டது</string>
+  <string name="wizard_tips_duckgo">டக் டக் கோ தேடுபொறி செயலி</string>
+  <string name="wizard_proxy_help_info">பதிலாள் அமைப்புகள்</string>
+  <string name="wizard_final">ஆர்பாட் தயாராக உள்ளது!</string>
+  <string name="wizard_exit_at_first_screen_toast">தயவு செய்து, ஆர்பாடை கட்மைத்த பின் பயன்படுத்தவும்</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">எச்சரிக்கை</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">அனுமதிகள்</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">ஆர்பாடுடன் செயல்படும் செயலிகள்</string>
+  <!--Transparent Proxy screen-->
+  <string name="pref_select_apps">செயலிகளை தேர்ந்தெடு</string>
+  <string name="pref_proxy_password_summary">பதிலாள் கடவுச்சொல் (கட்டாயமற்ற)</string>
+  <string name="pref_proxy_password_dialog">பதிலாள் கடவுச்சொல்லை உள்ளிடவும்</string>
+  <string name="status">நிலை</string>
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-th/strings.xml b/orbotservice/src/main/res/values-th/strings.xml
new file mode 100644
index 0000000..81d5f0f
--- /dev/null
+++ b/orbotservice/src/main/res/values-th/strings.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">เริ่มและหยุด Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_activated">เชื่อมต่อกับเครือข่าย Tor</string>
+  <string name="tor_process_complete">เสร็จ</string>
+  <string name="tor_process_waiting">กำลังรอ</string>
+  <string name="not_anonymous_yet">คำเตือน: ข้อมูลจราจรของคุณยังไม่เป็นนิรนาม! กรุณาตั้งค่าโปรแกรมของคุณให้ใช้ HTTP พร็อกซีที่ 127.0.0.1:8118 หรือใช้ SOCKS4A หรือ SOCKS5 พร็อกซีที่ 127.0.0.1:9050</string>
+  <string name="menu_home">หน้าหลัก</string>
+  <string name="menu_browse">เลือก</string>
+  <string name="menu_settings">ตั้งค่า</string>
+  <string name="menu_log">ปูม</string>
+  <string name="menu_info">ช่วยเหลือ</string>
+  <string name="menu_start">เริ่ม</string>
+  <string name="menu_stop">หยุด</string>
+  <string name="menu_about">เกี่ยวกับ</string>
+  <string name="button_help">ช่วยเหลือ</string>
+  <string name="button_close">ปิด</string>
+  <string name="button_about">เกี่ยวกับ</string>
+  <string name="button_clear_log">ล้างปูม</string>
+  <string name="menu_verify">ตรวจสอบ</string>
+  <string name="menu_exit">ออก</string>
+  <string name="press_to_start">- แตะค้างเพื่อเริ่ม -</string>
+  <string name="pref_trans_proxy_group">พร็อกซีล่องหน (ต้องการสิทธิ์ Root)</string>
+  <string name="pref_trans_proxy_title">พร็อกซีล่องหน</string>
+  <string name="pref_trans_proxy_summary">ให้โปรแกรมใช้งาน Tor โดยอัตโนมัติ</string>
+  <string name="pref_transparent_all_title">ใช้ Tor กับทุกอย่าง</string>
+  <string name="pref_transparent_all_summary">ให้การจราจรของทุกโปรแกรมผ่านพร็อกซีของ Tor</string>
+  <string name="pref_transparent_port_fallback_summary">คำเตือน: หลีกเลี่ยงพอร์ตทั่วไป (เช่น 80, 443) *ใช้ก็ต่อเมื่อ* โหมด \'ทั้งหมด\' หรือ \'โปรแกรม\' ใช้งานไม่ได้</string>
+  <string name="pref_transparent_port_title">รายการพอร์ต</string>
+  <string name="pref_transparent_port_summary">รายการพอร์ตที่ผ่านพร็อกซี *ใช้ก็ต่อเมื่อ* โหลด \'ทั้งหมด\' หรือ \'โปรแกรม\' ใช้งานไม่ได้</string>
+  <string name="pref_transparent_port_dialog">ระบุพอร์ตที่จะให้ผ่านพร็อกซี</string>
+  <string name="pref_has_root">ต้องการสิทธิ์ root</string>
+  <string name="pref_has_root_summary">ต้องการสิทธิ์ root เพื่อใช้งานพร็อกซีล่องหน</string>
+  <string name="status_install_success">ติดตั้งไบนารีของ Tor สำเร็จแล้ว</string>
+  <string name="status_install_fail">ไม่สามารถติดตั้งไบนารีของ Tor ได้ โปรดตรวจสอบปูมและแจ้งปัญหาที่ tor-assistants at torproject.org</string>
+  <string name="title_error">โปรแกรมทำงานผิดพลาด</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">เกี่ยวกับ Orbot</string>
+  <string name="btn_next">ต่อไป</string>
+  <string name="btn_back">ถอยหลัง</string>
+  <string name="btn_finish">เสร็จ</string>
+  <string name="btn_okay">ตกลง</string>
+  <string name="btn_cancel">ยกเลิก</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">รายละเอียดเกี่ยวกับ Orbot</string>
+  <string name="wizard_permissions_root">ให้สิทธิ์แล้ว</string>
+  <string name="wizard_permissions_stock">สิทธิ์ของ Orbot</string>
+  <string name="wizard_premissions_msg_root">ยอดเยี่ยม! เราพบว่าคุณให้สิทธิ์ root กับ Orbot เราจะใช้สิทธิ์นี้อย่างชาญฉลาด</string>
+  <string name="wizard_permissions_msg_stock">ถึงจะไม่ใช่เรื่องจำเป็น แต่ถ้าหาก Orbot จะทำงานได้อย่างมีประสิทธิภาพมากขึ้นถ้าได้รับสิทธิ์ root ใช้ปุ่มด้านล่างเพื่อมอบพลังนี้ให้ Orbot!</string>
+  <string name="wizard_permissions_no_root">ถ้าคุณไม่มีสิทธิ์ root หรือไม่เข้าใจว่าเรากำลังพูดถึงอะไรอยู่ ให้ใช้เฉพาะโปรแกรมที่สร้างมาเพื่อใช้กับ Orbot เท่านั้น</string>
+  <string name="wizard_permissions_consent">ฉันเข้าใจและต้องการทำต่อโดยไม่ใช้สิทธิ์ Superuser</string>
+  <string name="wizard_permission_enable_root">ให้สิทธิ์ root แก่ Orbot</string>
+  <string name="wizard_configure">ตั้งค่าการใช้งานผ่าน Tor</string>
+  <string name="wizard_configure_msg">Orbot มีตัวเลือกให้คุณส่งข้อมูลการจราจรของทุกโปรแกรมผ่าน Tor หรือเลือกใช้งานเฉพาะโปรแกรมก็ได้</string>
+  <string name="wizard_configure_all">ให้ทุกโปรแกรมผ่านพร็อกซีของ Tor</string>
+  <string name="wizard_configure_select_apps">เลือกโปรแกรมที่จะให้ใช้ Tor</string>
+  <string name="wizard_tips_tricks">โปรแกรมที่ใช้ได้กับ Orbot</string>
+  <string name="wizard_tips_proxy">การตั้งค่าพร็อกซี - เรียนรู้การตั้งค่าโปรแกรมให้ทำงานกับ Orbot ได้</string>
+  <string name="wizard_proxy_help_info">ตั้งค่าพร็อกซี</string>
+  <string name="wizard_final">Orbot พร้อมใช้งานแล้ว!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">จะใช้เว็บเบราว์เซอร์ของคุณเปิดหน้า https://check.torproject.org เพื่อตรวจสอบว่าการตั้งค่าของ Orbot ถูกต้องหรือไม่ และคุณได้เชื่อมต่อกับ Tor หรือไม่</string>
+  <string name="pref_general_group">ทั่วไป</string>
+  <string name="pref_start_boot_title">เริ่ม Orbot เมื่อเปิดระบบ</string>
+  <string name="pref_start_boot_summary">เริ่ม Orbot โดยอัตโนมัติและให้เชื่อมต่อกับ Tor เมื่ออุปกรณ์แอนดรอยด์ของคุณเริ่มทำงาน</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">คำเตือน</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">สิทธิ์</string>
+  <string name="wizard_permissions_root_msg1">คุณสามารถเลือกให้สิทธิ์ Superuser แก่ Orbot เพื่อเปิดใช้งานคุณสมบัติขั้นสูง เช่น พร็อกซีล่องหนได้</string>
+  <string name="wizard_permissions_root_msg2">ถ้าคุณไม่ต้องการ โปรดแน่ใจว่าคุณใช้โปรแกรมที่สร้างมาเพื่อใช้กับ Orbot</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">โปรแกรมที่ใช้ได้กับ Orbot</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">พร็อกซีล่อง</string>
+  <string name="wizard_transproxy_msg">จะอนุญาตให้โปรแกรมของคุณทำงานผ่านเครือข่าย Tor อัตโนมัติโดยไม่ต้องตั้งค่าใดๆ</string>
+  <string name="wizard_transproxy_hint">(ติ๊กตัวเลือกนี้ถ้าคุณไม่เข้าใจเรื่องที่เรากำลังอธิบาย)</string>
+  <string name="wizard_transproxy_none">ไม่มี</string>
+  <string name="pref_transparent_tethering_title">การเชื่อมต่อพ่วงผ่าน Tor</string>
+  <string name="pref_transparent_tethering_summary">เปิดใช้งานพร็อกซีล่องหนของ Tor ให้อุปกรณ์อื่นที่เชื่อมผ่าน Wifi และ USB (ต้องเริ่มใหม่)</string>
+  <string name="button_grant_superuser">ร้องขอการเข้าถึงสิทธิ์ Superuser</string>
+  <string name="pref_select_apps">เลือกโปรแกรม</string>
+  <string name="pref_select_apps_summary">เลือกโปรแกรมที่จะให้เชื่อมต่อผ่าน Tor</string>
+  <string name="pref_node_configuration">การตั้งค่าโหนด</string>
+  <string name="pref_node_configuration_summary">การตั้งค่าขั้นสูงเหล่านี้ทำให้ความเป็นนิรนามของคุณลดลงได้</string>
+  <string name="pref_entrance_node">โหนดทางเข้า</string>
+  <string name="pref_entrance_node_summary">ลายนิ้วมือ, ชื่อเล่น, ประเทศ และที่อยู่ของฮอพแรก</string>
+  <string name="pref_entrance_node_dialog">ระบุโหนดทางเข้า</string>
+  <string name="pref_proxy_type_summary">โพรโทคอลที่ใช้สำหรับเซิร์ฟเวอร์พร็อกซี: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">ระบุชนิดของพร็อกซี</string>
+  <string name="pref_proxy_host_dialog">ระบุเครื่องพร็อกซี</string>
+  <string name="pref_proxy_port_dialog">ระบุพอร์ตของพร็อกซี</string>
+  <string name="status">สถานะ</string>
+  <string name="setting_up_full_transparent_proxying_">กำลังติดตั้งพร็อกซีล่องหนแบบเต็ม…</string>
+  <string name="setting_up_app_based_transparent_proxying_">กำลังติดตั้งพร็อกซีล่องหนแบบระบุโปรแกรม…</string>
+  <string name="transparent_proxying_enabled">พร็อกซีล่องหนถูกเปิดใช้งาน</string>
+  <string name="transproxy_enabled_for_tethering_">พร็อกซีล่องหนถูกเปิดใช้สำหรับการเชื่อมต่อพ่วง!</string>
+  <string name="warning_error_starting_transparent_proxying_">คำเตือน: เกิดข้อผิดพลาดขณะที่พร็อกซีล่องหนเริ่มทำงาน</string>
+  <string name="transproxy_rules_cleared">กฎของพร็อกซีล่องหนถูกล้าง</string>
+  <string name="couldn_t_start_tor_process_">ไม่สามารถเริ่มโพรเซสของ Tor</string>
+  <string name="setting_up_port_based_transparent_proxying_">กำลังติดตั้งพร็อกซีล่องหนแบบระบุพอร์ต…</string>
+  <string name="bridge_error">สะพานขัดข้อง</string>
+  <string name="bridge_requires_ip">ในการใช้งานคุณสมบัติสะพาน คุณต้องระบุที่อยู่ไอพีของสะพานอย่างน้อย 1 ไอพี </string>
+  <string name="send_email_for_bridges">ส่งอีเมลไปที่ bridges at torproject.org โดยระบุแค่ \"get bridges\" ในเนื้อความอีเมล แล้วส่งโดยใช้บัญชีผู้ใช้ gmail</string>
+  <string name="error">ผิดพลาด</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">การตั้งค่า ReachableAddresses ของคุณทำให้เกิดข้อผิดพลาด</string>
+  <string name="your_relay_settings_caused_an_exception_">การตั้งค่ารีเลย์ของคุณทำให้เกิดข้อผิดพลาด</string>
+  <string name="exit_nodes">โหนดทางออก</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">ลายนิ้วมือ, ชื่อเล่น, ประเทศ และที่อยู่ของฮอพสุดท้าย</string>
+  <string name="enter_exit_nodes">ระบุโหนดทางออก</string>
+  <string name="exclude_nodes">โหนดยกเว้น</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">ลายนิ้วมือ, ชื่อเล่น, ประเทศ และที่อยู่ที่ละเว้น</string>
+  <string name="enter_exclude_nodes">ระบุโหนดยกเว้น</string>
+  <string name="strict_nodes">โหนดเข้มงวด</string>
+  <string name="use_only_these_specified_nodes">ใช้ *เฉพาะ* โหนดที่ระบุเหล่านี้เท่านั้น</string>
+  <string name="bridges">สะพาน</string>
+  <string name="use_bridges">ใช้งานสะพาน</string>
+  <string name="bridges_obfuscated">สะพานที่ถูกอำพราง</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">เปิดใช้งานโหนดทางเข้าอื่นเข้าสู่เครือข่าย Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">เปิดใช้งานถ้าสะพานที่ถูกตั้งค่าเป็นสะพานอำพราง</string>
+  <string name="ip_address_and_port_of_bridges">ที่อยู่ไอพีและพอร์ตของสะพาน</string>
+  <string name="enter_bridge_addresses">ระบุที่อยู่ของสะพาน</string>
+  <string name="relays">รีเลย์</string>
+  <string name="relaying">การรีเลย์</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">ทำให้อุปกรณ์ของคุณทำงานเป็นรีเลย์แบบไม่ใช่ทางออก</string>
+  <string name="relay_port">พอร์ตรีเลย์</string>
+  <string name="listening_port_for_your_tor_relay">พอร์ตที่ให้รีเลย์ของ Tor ทำงาน</string>
+  <string name="enter_or_port">ระบุพอร์ตของ OR</string>
+  <string name="relay_nickname">ชื่อเล่นของรีเลย์</string>
+  <string name="the_nickname_for_your_tor_relay">ชื่อเล่นสำหรับรีเลย์ของ Tor ของคุณ</string>
+  <string name="enter_a_custom_relay_nickname">ระบุชื่อเล่นของรีเลย์โดยกำหนดเอง</string>
+  <string name="reachable_addresses">ที่อยู่ซึ่งเข้าถึงได้</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">ทำงานเป็นเครื่องลูกข่ายหลังไฟร์วอลล์ด้วยนโยบายแบบเข้มงวด</string>
+  <string name="reachable_ports">พอร์ตที่เข้าถึงได้</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">พอร์ตที่เข้าถึงได้หลังไฟร์วอลล์แบบเข้มงวด</string>
+  <string name="enter_ports">ระบุพอร์ต</string>
+  <string name="enter_localhost_ports_for_hidden_services">ระบุพอร์ตของ localhost สำหรับให้บริการไม่เปิดเผยทำงาน </string>
+  <string name="hidden_service_ports">พอร์ตของบริการไม่เปิดเผย</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">ชื่อที่ใช้ระบุสำหรับบริการไม่เปิดเผยของคุณ (สร้างโดยอัตโนมัติ)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">เปิดให้ปูมดีบั๊กแสดงผล (ต้องใช้ adb หรือ aLogCat เพื่อดู)</string>
+  <string name="project_home">ที่อยู่โครงการ:</string>
+  <string name="the_tor_license">สัญญาอนุญาตของ Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">ซอฟต์แวร์โดยผู้ผลิตอื่น:</string>
+  <string name="hidden_service_request">โปรแกรมต้องการเปิดพอร์ต %S ที่ซ่อนอยู่ของเซิร์ฟเวอร์ให้เชื่อมกับเครือข่าย Tor การกระทำนี้ปลอดภัยถ้าคุณเชื่อถือโปรแกรมนั้น</string>
+  <string name="something_bad_happened">เกิดอะไรไม่ดีสักอย่าง ให้ตรวจดูจากปูม</string>
+  <string name="hidden_service_on">บริการไม่เปิดเผยอยู่บน:</string>
+  <string name="unable_to_read_hidden_service_name">ไม่สามารถอ่านชื่อของบริการไม่เปิดเผย</string>
+  <string name="unable_to_start_tor">ไม่สามารถเริ่ม Tor</string>
+  <string name="pref_use_sys_iptables_title">ใช้ Iptables ปริยาย</string>
+  <string name="pref_use_sys_iptables_summary">ใช้ไบนารีของ iptables ที่มีอยู่แล้วแทนตัวที่แถมมากับ Orbot</string>
+  <string name="error_installing_binares">ไม่สามารถติดตั้งหรือปรับรุ่นไบนารีของ Tor</string>
+  <string name="pref_use_persistent_notifications">แสดงไอคอนในทูลบาร์เสมอเมื่อ Orbot เชื่อมต่ออยู่</string>
+  <string name="pref_use_persistent_notifications_title">การแจ้งเตือนแบบตลอดเวลา</string>
+  <string name="notification_using_bridges">เปิดใช้งานสะพานแล้ว!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">เลือกโลแคลและภาษาสำหรับ Orbot</string>
+  <string name="wizard_locale_title">เลือกภาษา</string>
+  <string name="wizard_locale_msg">ใช้ค่าปริยายหรือเลือกภาษาปัจจุบัน</string>
+  <string name="btn_save_settings">บันทึกการตั้งค่า</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-tl/strings.xml b/orbotservice/src/main/res/values-tl/strings.xml
new file mode 100644
index 0000000..25b99db
--- /dev/null
+++ b/orbotservice/src/main/res/values-tl/strings.xml
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">simulan at ihinto ang Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Nagsisimula na ang Orbot…</string>
+  <string name="status_activated">Konektado sa Tor network</string>
+  <string name="status_disabled">Naka-deactivate ang Orbot</string>
+  <string name="tor_process_starting">Binubuksan ang Tor client…</string>
+  <string name="tor_process_complete">kumpleto na.</string>
+  <string name="tor_process_waiting">nag-hihintay</string>
+  <string name="not_anonymous_yet">BABALA: Ang iyong traffic ay hindi pa anonimo! Kung maaari sana ay ikompigura muna ang iyong applications na gumamit ng HTTP proxy 127.0.0.1:8118 o kaya ay SOCKS4A o kaya ay SOCKS5 proxy 127.0.0.1:9050</string>
+  <string name="menu_home">Tahanan</string>
+  <string name="menu_browse">Mag-browse</string>
+  <string name="menu_settings">Settings</string>
+  <string name="menu_log">Tala</string>
+  <string name="menu_info">Tulong</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Simulan</string>
+  <string name="menu_stop">Ihinto</string>
+  <string name="menu_about">Tungkol</string>
+  <string name="main_layout_download">Download</string>
+  <string name="main_layout_upload">Upload</string>
+  <string name="button_help">Tulong</string>
+  <string name="button_close">Isara</string>
+  <string name="button_about">Tungkol</string>
+  <string name="button_clear_log">Linisin ang tala</string>
+  <string name="menu_verify">Tiyakin</string>
+  <string name="menu_exit">Labasan</string>
+  <string name="menu_share_bridge">Ipamahagi ang BridgeQR</string>
+  <string name="press_to_start">- pindutin ng matagal para mag umpisa -</string>
+  <string name="pref_trans_proxy_group">Nanganganinag na pag Po-proxy (Kailangan ang Root)</string>
+  <string name="pref_trans_proxy_title">Nanganganinag na pag Po-proxy </string>
+  <string name="pref_trans_proxy_summary">Kusang pag Torifying ng mga Apps</string>
+  <string name="pref_transparent_all_title">Tor lahat</string>
+  <string name="pref_transparent_all_summary">I-proxy ang traffic ng lahat ng apps gamit ang Tor</string>
+  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
+  <string name="pref_transparent_port_fallback_summary">BABALA: Dayain ang mga karaniwang ports (80, 443, etc). *GAMITIN LAMANG* kung \'Lahat\' o kaya ang \'App\' na paraan ay hindi gumagana.</string>
+  <string name="pref_transparent_port_title">Lisatahan ng Port</string>
+  <string name="pref_transparent_port_summary">Lisatahan ng mga ports sa proxy. *GAMITIN LAMANG* kung \'Lahat\' o kaya ang \'App\' na paraan ay hindi gumagana.</string>
+  <string name="pref_transparent_port_dialog">Ipasok ang ports sa proxy</string>
+  <string name="pref_has_root">Humiling ng daanan sa Root</string>
+  <string name="pref_has_root_summary">Humiling ng daanan sa Root para sa nanganganinag na pag Po-proxy</string>
+  <string name="status_install_success">Ang Tor binaries ay matagumpay na i-install.</string>
+  <string name="status_install_fail">Ang Tor binary files ay hindi na install. Paki tignan ang tala at magbigay alam sa tor-assistants at torproject.org</string>
+  <string name="title_error">May mali sa Application</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Tungkol sa Orbot</string>
+  <string name="btn_next">Susunod</string>
+  <string name="btn_back">Balik</string>
+  <string name="btn_finish">Wakas</string>
+  <string name="btn_okay">Okay</string>
+  <string name="btn_cancel">Kanselahin</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Ilang detalye sa Orbot</string>
+  <string name="wizard_details_msg">Ang Orbot ay isang open-source application na naglalaman ng Tor, LibEvent at Polipo. Ito ay nagbibigay ng local HTTP proxy (8118) at SOCKS proxy (9050) sa Tor network. Ang Orbot ay nagbibigay din ng kakayahan, sa mga rooted device, na ipadala ang lahat ng trapiko sa internet sa pamamagitan  ng Tor.</string>
+  <string name="wizard_permissions_root">Napahintulotan na</string>
+  <string name="wizard_permissions_stock">Pahintulot ng Orbot</string>
+  <string name="wizard_premissions_msg_root">Mahusay! Natuklasan namin na mayroon pahintulot ang Orbot para sa root. Gagamitin namin ito ng mabuti.</string>
+  <string name="wizard_permissions_msg_stock">Ito ay hindi kinakailangan, ngunit mas mapapalawig ang kakayahan ng Orbot kung ang iyong device ay meron access sa root. Gamitin ang pindutan sa ibaba para bigyan ng superpowers ang Orbot!</string>
+  <string name="wizard_permissions_no_root">Kung wala kang access sa root o wala kang alam sa sinasabi namin, siguraduhin mu nalamang na gagamit ka ng mga apps na ginawa para sa Orbot.</string>
+  <string name="wizard_permissions_consent">Nauunawaan ko at mag-papatuloy ng walang Superuser</string>
+  <string name="wizard_permission_enable_root">Pahintulutan ang Orbot para sa Root</string>
+  <string name="wizard_configure">Kompigurahin ang Torification</string>
+  <string name="wizard_configure_msg">Binibigyan ka ng Orbot ng pagpipilian na i-route lahat ng application traffic gamit ang Tor o piliin ang application isa-isa.</string>
+  <string name="wizard_configure_all">I-proxy lahat ng Apps gamit ang Tor</string>
+  <string name="wizard_configure_select_apps">Pumili ng isa-isang apps para sa Tor</string>
+  <string name="wizard_tips_tricks">Orbot-enabled Apps</string>
+  <string name="wizard_tips_msg">Ang mga apps sa ibaba ay dinevelop upang gumana sa Orbot. I-click ang button para i-install, o sila ay mahahanap sa Google Play, sa GuardianProject.info website o sa F-Droid.org.</string>
+  <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="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>
+  <string name="wizard_proxy_help_msg">Kung ang ginagamit na Android app ay gumagamit ng HTTP o SOCKS proxy, ibig sabihin lang noon ay pwede mong isaayos para kumunekta sa Orbot sa paggamit ng Tor.\n\n\n Ang host settings ay 127.0.0.1 o \"localhost\". Para naan sa HTTP, ang port setting ay 8118. Para naman sa SOCKS, ang proxy ay 9050. Kailangan mong gamitin ang SOCKS4A o SOCKS5 kung posible.\n \n\n\n Mas marami kang matututunan sa proxying sa Android sa pamamagitan ng FAQ sa: http://tinyurl.com/proxyandroid .\n </string>
+  <string name="wizard_final">Handa na ang Orbot!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Bubuksan nito ang iyong browser sa https://check.torproject.org para matignan kung ang Orbot ay na-kompigura at konektado ka sa Tor.</string>
+  <string name="pref_hs_group">Tagong Service Hosting</string>
+  <string name="pref_general_group">Pangkalahatan</string>
+  <string name="pref_start_boot_title">Umpisahan ang Orboot sa Boot</string>
+  <string name="pref_start_boot_summary">Kusang umpisahan ang Orbot at kumonekta sa Tor sa pag bukas ng iyong Android Device</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Ang Orbot ang nagdala ng Tor sa Android!\n\nAng Tor ay tumutulong sa iyo na sanggain ang pagsala ng nilalaman, pag-analisa ng trapiko at pangmamatyag sa network na mapanganib sa iyong privacy, conpidensyal na impormasyon at personal na relasyon.\n\nAng wizard ang makakatulong sa iyo para isaayos ang Orbot at Tor sa iyong device.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Babala</string>
+  <string name="wizard_warning_msg">Sa pag-install nang Orbot, hindi nito awtomatikong ina-anonymize ang iyong trapiko sa iyong mobile.\n\nKailangan mong isaayos ng tama ang Orbot, sa iyong device at sa iba pang apps para matagumpay na magamit ang Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Mga Pahintulot</string>
+  <string name="wizard_permissions_root_msg1">Maari mong piliin bigyan ng pahintulot ang Orbot ng \'Superuser\' access para ma-enable ang mga advanced features tulad ng Transparent Proxying.</string>
+  <string name="wizard_permissions_root_msg2">Kapag ayaw mo itong gawin, siguraduhing gumamit ng apps na ginawa upang gumana kasama ang Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Mukang ang iyong device ay hindi pa rooted o hindi nagbibigay ng daan sa root o \'Superuser\'.\n\nPakiusap, o hindi kaya subukan ang paraan ng \'Apps\' sa pangunahing screen.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox: Privacy-enhanced browser na gumagana sa pamamagitan ng Tor.</string>
+  <string name="wizard_tips_play">Hanapin ang lahat ng Guardian Project apps sa Google Play</string>
+  <string name="wizard_tips_fdroid">Hanapin ang lahat ng Guardian Project apps sa F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Hanapin ang lahat ng Guardian Project apps sa https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Transparent Proxying</string>
+  <string name="wizard_transproxy_msg">Ito ay bibigyan ng pahintulot ang iyong mga apps na kusang mag-run sa Tor network kahit walang pag-kompigura na ginawa.</string>
+  <string name="wizard_transproxy_hint">(Lagyan ng check ang box na ito kung wala kang alam sa sinasabi namin)</string>
+  <string name="wizard_transproxy_none">Wala</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">I-enable ang Tor Transparent Proxying para sa Wifi at USB Tethered Devices (kailangan mag restart)</string>
+  <string name="button_grant_superuser">Humiling ng Superuser Access</string>
+  <string name="pref_select_apps">Pumili ng Apps</string>
+  <string name="pref_select_apps_summary">Pumili ng Apps para i-route sa Tor</string>
+  <string name="pref_node_configuration">Pagkompigura ng Node</string>
+  <string name="pref_node_configuration_summary">Ang mga ito ay advanced settings na maaring bawasan ang iyong anonymity</string>
+  <string name="pref_entrance_node">Entrance Nodes</string>
+  <string name="pref_entrance_node_summary">Fingerprints, nicks, mga bansa at mga address para sa unang lukso</string>
+  <string name="pref_entrance_node_dialog">Pumasok sa Entrance Nodes</string>
+  <string name="pref_allow_background_starts_title">Pahintulutan na magsimula sa background</string>
+  <string name="pref_allow_background_starts_summary">Hayaan ang kahit anong app na sabihin kay Orbot na magsimula ng Tor at anumang malapit na serbisyo.</string>
+  <string name="button_proxy_all">Proxy All</string>
+  <string name="button_proxy_none">Proxy None</string>
+  <string name="button_invert_selection">Baliktarin ang napili</string>
+  <string name="pref_proxy_title">Outbound Network Proxy (Optional)</string>
+  <string name="pref_proxy_type_title">Outbound Proxy Type</string>
+  <string name="pref_proxy_type_summary">Mga protocol na gagamitin para sa proxy server: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Ilagay ang Proxy Type</string>
+  <string name="pref_proxy_host_title">Outbound Proxy Host</string>
+  <string name="pref_proxy_host_summary">Proxy Server hostname</string>
+  <string name="pref_proxy_host_dialog">Ilagay ang Proxy Host</string>
+  <string name="pref_proxy_port_title">Outbound Proxy</string>
+  <string name="pref_proxy_port_summary">Proxy Server Port</string>
+  <string name="pref_proxy_port_dialog">Ilagay ang Proxy port</string>
+  <string name="pref_proxy_username_title">Outbound Proxy Username</string>
+  <string name="pref_proxy_username_summary">Proxy Username (Optional)</string>
+  <string name="pref_proxy_username_dialog">Ilagay ang Proxy Username</string>
+  <string name="pref_proxy_password_title">Outbound Proxy Password</string>
+  <string name="pref_proxy_password_summary">Proxy Password (Optional)</string>
+  <string name="pref_proxy_password_dialog">Ilagay ang Proxy Password</string>
+  <string name="status">Katayuan</string>
+  <string name="setting_up_full_transparent_proxying_">Isinasaayos ang kabuuang transparent proxying...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Isinasaayos ang app-based transparent proxying...</string>
+  <string name="transparent_proxying_enabled">Na i-enable na ang Transparent proxying</string>
+  <string name="transproxy_enabled_for_tethering_">Na i-enable na ang TransProxy para sa Thethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">BABALA: error sa pag start ng transparent proxying!</string>
+  <string name="transproxy_rules_cleared">Nalinis na ang mga batas ng TransProxy</string>
+  <string name="couldn_t_start_tor_process_">Hindi ma umpisahan ang proseso ng Tor:</string>
+  <string name="privoxy_is_running_on_port_">Ang Polipo ay gumagana ngayon sa port:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Isinasaayos ang port-based transpaprent proxying...</string>
+  <string name="bridge_error">Error sa Bridge</string>
+  <string name="bridge_requires_ip">Para magamit ang feature ng bridge, kailangan mong mag lagay ng kahit isang bridge IP address.</string>
+  <string name="send_email_for_bridges">Magpadala ng email sa bridges at torproject.org na mayroong linyang  \"get bridges\" at wala ng iba pang kasama sa katawa ng email gamit ang isang gmail account.</string>
+  <string name="error">Error</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Ang iyong ReachableAddresses settings ay nag sanhi ng exception!</string>
+  <string name="your_relay_settings_caused_an_exception_">Ang iyong relay settings ay nag sanhi ng exception!</string>
+  <string name="exit_nodes">Exit Nodes</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, mga bansa at address para sa huling talon</string>
+  <string name="enter_exit_nodes">Enter Exit Nodes</string>
+  <string name="exclude_nodes">Hindi kasama ang Nodes</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, mga bansa at mga address na hindi isasama</string>
+  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
+  <string name="strict_nodes">Strict Nodes</string>
+  <string name="use_only_these_specified_nodes">Gumamit ng *only* sa mga ispesipikong nodes </string>
+  <string name="bridges">Bridges</string>
+  <string name="use_bridges">Gumamit ng Bridges</string>
+  <string name="bridges_obfuscated">Obfuscated Bridges</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">I-enable ang kahaliling entrance nodes sa Tor Network</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">I-enable kung ang naisaayos na bridges ay obfuscated bridges</string>
+  <string name="ip_address_and_port_of_bridges">IP address at port ng bridges</string>
+  <string name="enter_bridge_addresses">Ilagay ang Bridge Addresses</string>
+  <string name="relays">Relays</string>
+  <string name="relaying">Relaying</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">I-enable ang iyong device na non-exit relay</string>
+  <string name="relay_port">Relay Port</string>
+  <string name="listening_port_for_your_tor_relay">Pinapakinggan ang port para sa iyong Tor relay</string>
+  <string name="enter_or_port">I-lagay ang OR port</string>
+  <string name="relay_nickname">Relay nickname</string>
+  <string name="the_nickname_for_your_tor_relay">Ang nickname para sa iyong Tor relay</string>
+  <string name="enter_a_custom_relay_nickname">I-lagay ang pasadyang relay nickname</string>
+  <string name="reachable_addresses">Reachable Addresses</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Patakbuhin bilang kliente sa likod ng firewall na may istriktong polisiya</string>
+  <string name="reachable_ports">Reachable Ports</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable sa likod ng istriktong firewall</string>
+  <string name="enter_ports">I-lagay ang ports</string>
+  <string name="enable_hidden_services">Nakatagong Service Hosting</string>
+  <string name="run_servers_accessible_via_the_tor_network">pahintulutan sa on-device server na maging malalapitan sa pamamagitan ng Tor network</string>
+  <string name="enter_localhost_ports_for_hidden_services">I-lagay ang localhost ports para sa nakatagong serbisyo</string>
+  <string name="hidden_service_ports">Tagong Service Ports</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">ang addressable na pangalan sa iyong tagong serbisyo (awtomatikong nabuo)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">paganahiin ang debug log para sa output (kailangang gamitin ang adb o aLogCat para makita)</string>
+  <string name="project_home">Project Home(s):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/
+</string>
+  <string name="the_tor_license">Ang Tor License</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3rd-Party-Software:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">May app na gustong buksan ang nakatagong server port %S sa Tor network. Ito ay ligtas kung pinagkakatiwalaan ang app.</string>
+  <string name="found_existing_tor_process"> nakakita ng umiiral na Tor process...</string>
+  <string name="something_bad_happened">May nangyaring masama. Tingnan ang log</string>
+  <string name="hidden_service_on">nakatagong serbisyo sa:</string>
+  <string name="unable_to_read_hidden_service_name">hindi mabasa ang pangalan ng tagong serbisyo</string>
+  <string name="unable_to_start_tor">Hindi masimulan ang Tor:</string>
+  <string name="unable_to_reset_tor">I-reboot ang iyong device, hindi ma-reset ang Tor!</string>
+  <string name="pref_use_sys_iptables_title">Gumamit ng Default na Iptables</string>
+  <string name="pref_use_sys_iptables_summary">gamitin ang built-in iptables binary kaysa sa isang nabigkis kasama ng Orbot</string>
+  <string name="error_installing_binares">Ang Tor binaries ay hindi ma-install o ma-upgrade.</string>
+  <string name="pref_use_persistent_notifications">Palaging panatilihin ang icon sa toolbar kapag ang Orbot ay naka-connect</string>
+  <string name="pref_use_persistent_notifications_title">Palaging i-On ang Notifications</string>
+  <string name="pref_use_expanded_notifications">Ipakita ang pinalaking notification kasama ng Tor exit country at IP</string>
+  <string name="pref_use_expanded_notifications_title">Pinalawak na Notifications</string>
+  <string name="notification_using_bridges">Bridges enabled!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Wika</string>
+  <string name="set_locale_summary">Pumili ng locale at wika para sa Orbot</string>
+  <string name="wizard_locale_title">Pumili ng Wika</string>
+  <string name="wizard_locale_msg">Iwanang default o palitan ang kasalukuyang wika</string>
+  <string name="powered_by">powered by Tor</string>
+  <string name="btn_save_settings">I-Save ang Settings</string>
+  <string name="no_internet_connection_tor">Walang connection sa internet; Ang Tor ay naka-standby mode...</string>
+  <string name="bandwidth_">Bandwidth:</string>
+  <string name="down">baba</string>
+  <string name="up">taas</string>
+  <string name="pref_disable_network_title">Walang Auto-Sleep sa Network</string>
+  <string name="pref_disable_network_summary">Ilagay ang Tor sa sleep kapag walang internet na pwede</string>
+  <string name="newnym">Ikaw ay nagpalit ng bagong pagkakakilanlan sa Tor!</string>
+  <string name="menu_verify_browser">Browser</string>
+  <string name="menu_use_chatsecure">Gamitin ang ChatSecure</string>
+  <string name="permission_manage_tor_label">Manage Tor</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Activate</string>
+  <string name="apps_mode">Apps VPN Mode</string>
+  <string name="send_email">Send Email</string>
+  <string name="install_orweb">I-install ang Orfox</string>
+  <string name="standard_browser">Standard Browser</string>
+  <string name="vpn_default_world">Mundo</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-tr/strings.xml b/orbotservice/src/main/res/values-tr/strings.xml
new file mode 100644
index 0000000..ac75025
--- /dev/null
+++ b/orbotservice/src/main/res/values-tr/strings.xml
@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot başka uygulamaların interneti daha güvenli olarak kullanmasını sağlayan ücretsiz bir proxy uygulamasıdır. Orbot Tor\'u kullanarak internet trafiğinizi şifreler ve dünya üzerindeki pek çok farklı bilgisayardan geçirerek gizler. Tor sizin kişisel özgürlüğünüzü ve mahremiyetinizi, gizli ticari aktivitelerinizi ve bağlantılarınızı koruma altına alan bir yazılım ve açık ağdır.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">https://check.torproject.org/?lang=tr</string>
+  <string name="secure_default_web_url">https://check.torproject.org/?lang=tr</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">Tor\'u başlat ve durdur</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot başlatılıyor...</string>
+  <string name="status_activated">Tor ağına bağlandı</string>
+  <string name="status_disabled">Orbot devre dışı bırakıldı</string>
+  <string name="status_shutting_down">Tor hizmeti kapatılıyor</string>
+  <string name="tor_process_starting">Tor kullanımı başlatılıyor...</string>
+  <string name="tor_process_complete">tamamlandı.</string>
+  <string name="tor_process_waiting">bekliyor.</string>
+  <string name="not_anonymous_yet">UYARI: Bağlantınız henüz anonim değildir! Lütfen uygulamalarınızı HTTP 127.0.0.1:8118  veya SOCKS4A / SOCKS5 127.0.0.1:9050 vekil sunucusu kullanacak şekilde yapılandırınız.</string>
+  <string name="menu_home">Başlangıç</string>
+  <string name="menu_browse">Göz At</string>
+  <string name="menu_settings">Ayarlar</string>
+  <string name="menu_log">Günlük</string>
+  <string name="menu_info">Yardım</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Başlat</string>
+  <string name="menu_stop">Durdur</string>
+  <string name="menu_about">Hakkında</string>
+  <string name="menu_promo_apps">Uygulamaları alın... </string>
+  <string name="main_layout_download">İndir</string>
+  <string name="main_layout_upload">Yükle</string>
+  <string name="button_help">Yardım</string>
+  <string name="button_close">Kapat</string>
+  <string name="button_about">Hakkında</string>
+  <string name="button_clear_log">Günlüğü Temizle</string>
+  <string name="menu_verify">Kontrol Et</string>
+  <string name="menu_exit">Çıkış</string>
+  <string name="menu_scan">QR kodu tarama</string>
+  <string name="menu_share_bridge">QR kodu paylaş</string>
+  <string name="press_to_start">- başlatmak için uzun basın -</string>
+  <string name="pref_trans_proxy_group">Şeffaf Vekillendirme (Yeniden Başlatma Gerektirir)</string>
+  <string name="pref_trans_proxy_title">Şeffaf Vekillendirme</string>
+  <string name="pref_trans_proxy_summary">Uygulamalar için Otomatik Tor Uyarlaması</string>
+  <string name="pref_transparent_all_title">Herşeyi Tor ile Uyarla</string>
+  <string name="pref_transparent_all_summary">Tor\'a uyarlanmış uygulamaların vekil sunucu bağlantıları</string>
+  <string name="pref_transparent_port_fallback_title">Vekil Sunucu Yanıtsız Kalma Bildirim Portu</string>
+  <string name="pref_transparent_port_fallback_summary">UYARI: Genel portlardan (80,443, v.b.) kaçınınız. SADECE \'Hepsi\' veya \'Uygulama\' modu çalışmadığında kullanınız.</string>
+  <string name="pref_transparent_port_title">Port Listesi</string>
+  <string name="pref_transparent_port_summary">Vekil sunucu port listesi. *SADECE* \'Hepsi\' veya \'Uygulama\' modu çalışmadığında kullanınız.</string>
+  <string name="pref_transparent_port_dialog">Vekil sunucu portlarını giriniz</string>
+  <string name="pref_has_root">Yönetici Erişimi Talebi</string>
+  <string name="pref_has_root_summary">Şeffaf Vekillendirme için Yönetici Erişimi Talebi</string>
+  <string name="status_install_success">Tor binarileri başarıyla yüklendi!</string>
+  <string name="status_install_fail">Tor binary dosyaları yüklenemedi. Lütfen günlüğü kontrol ediniz ve tor-assistants at torproject.org adresini kullanarak bilgilendirme yapınız.</string>
+  <string name="title_error">Uygulama Hatası</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Orbot Hakkında</string>
+  <string name="btn_next">İleri</string>
+  <string name="btn_back">Geri</string>
+  <string name="btn_finish">Bitir</string>
+  <string name="btn_okay">Tamam</string>
+  <string name="btn_cancel">İptal
+            </string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Bazı Orbot detayları</string>
+  <string name="wizard_details_msg">Orbot; Tor, Libevent ve Polipo içeren bir açık kaynak uygulamadır. Yerel bir HTTP proxy (8118) ve Tor ağı içine SOCKS proxy (9050) sağlamaktadır. Orbot ayrıca rootlu cihazlar için tüm internet trafiğini Tor üzerinden gönderme yeteneğine sahiptir. </string>
+  <string name="wizard_permissions_root">İzin Verildi</string>
+  <string name="wizard_permissions_stock">Orbot İzinleri</string>
+  <string name="wizard_premissions_msg_root">Mükemmel! Root izinlerinizin Orbot için aktif olduğunu saptadık. Bu gücü akıllıca kullanacağız.</string>
+  <string name="wizard_permissions_msg_stock">Gerekli olmamakla birlikte, eğer cihazınızın root erişimi varsa Orbot daha güçlü bir araç olabilir. Orbot\'a süper güçlerini vermek için aşağıdaki butonu kullanın!</string>
+  <string name="wizard_permissions_no_root">Root(superuser) erişiminiz ya da neden bahsettiğimiz hakkında bir fikriniz yoksa sadece eklentilerin Orbot\'la birlikte çalışabilmeleri için yapıldığından emin olun.</string>
+  <string name="wizard_permissions_consent">Anlıyorum ve Superuser olmadan devam etmek istiyorum</string>
+  <string name="wizard_permission_enable_root">Orbot\'a root erişimi ver</string>
+  <string name="wizard_configure">Tor Bildirimlerini Ayarla</string>
+  <string name="wizard_configure_msg">Orbot, tüm uygulamaların veya seçtiğiniz uygulamaların trafiğini Tor üzerinden yönlendirme seçeneği sunar.</string>
+  <string name="wizard_configure_all">Tüm Uygulamaları Tor Üzerinden Vekillendir</string>
+  <string name="wizard_configure_select_apps">Tor için ayrı ayrı uygulamalar seç.</string>
+  <string name="wizard_tips_tricks">Orbot\'un Etkin Olduğu Eklentiler</string>
+  <string name="wizard_tips_msg">Aşağıdaki uygulamalar Orbot ile birlikte çalışmak üzere geliştirilmiştir. Uygulamaları hemen kurmak için ilgili düğmelere tıklayabilir veya uygulamalara daha sonra Google Play, GuardianProject.info web adresi veya F-Droid.org üzerinden erişebilirsiniz.</string>
+  <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="wizard_tips_twitter">Twitter proxy sunucusunu \"localhost\" ve bağlantı noktası 8118 olarak ayarlayın</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Bir öykü yarat ve güvenliği tor\'a bırak!</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>
+  <string name="wizard_exit_at_first_screen_toast">Lütfen kullanmadan önce Orbot\'u yapılandırın!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Bu, Orbot\'un ayarlanıp ayarlanmadığını ve Tor\'a bağlanıp bağlanmadığınızı anlamanız amacıyla tarayıcınızda https://check.torproject.org adresini açacak.</string>
+  <string name="pref_hs_group">Gizlenmiş servis sunucusu</string>
+  <string name="pref_general_group">Genel</string>
+  <string name="pref_start_boot_title">Orbot\'u Telefonla Birlikte Başlat</string>
+  <string name="pref_start_boot_summary">Android cihaz açıldığında otomatik olarak Orbot\'u başlat ve Tor\'a bağlan.</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Uyarı</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">İzinler</string>
+  <string name="wizard_permissions_root_msg1">İsterseniz Orbot\'a \'Superuser\' erişimi vererek saydam proxy gibi gelişmiş ayarları aktif hale getirebilirsiniz.</string>
+  <string name="wizard_permissions_root_msg2">Bunu yapmak istemiyorsanız, lütfen Orbot ile çalışmak üzere yapılmış uygulamalar kullandığınızdan emin olun</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox: Gizliliği geliştirilmiş bir tarayıcı Tor üzerinden çalışır</string>
+  <string name="wizard_tips_play">Google Play\'deki tüm Guardian Projesi uygulamalarına bakın</string>
+  <string name="wizard_tips_fdroid">Tüm Guardian Project uygulamalarını F-Droid vasıtasıyla bulun</string>
+  <string name="wizard_tips_fdroid_org">Tüm Guardian Project uygulamalarına bu adresten erişin https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Şeffaf Vekillendirme</string>
+  <string name="wizard_transproxy_msg">Bu, uygulamalarınızı Tor üzerinden, herhangi bir ayar yapmadan çalıştırmanıza olanak sağlar.</string>
+  <string name="wizard_transproxy_hint">(Neden bahsettiğimiz hakkında bir fikriniz yoksa bu kutucuğu işaretleyin)</string>
+  <string name="wizard_transproxy_none">Hiçbiri</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Kablosuz ağlar için Tor açık proxy ve USB Tethering\'e izin ver (yeniden başlatmayı gerektirir)</string>
+  <string name="button_grant_superuser">Superuser Erişimi Talebi</string>
+  <string name="pref_select_apps">Uygulamaları Seç</string>
+  <string name="pref_select_apps_summary">Tor Üzerinden Yönlendirilecek Uygulamaları Seç</string>
+  <string name="pref_node_configuration">Düğüm Ayarları</string>
+  <string name="pref_node_configuration_summary">Bu ayarlar bağlantınızın anonimliğini azaltabilecek gelişmiş ayarlardır.</string>
+  <string name="pref_entrance_node">Giriş Noktaları</string>
+  <string name="pref_entrance_node_summary">İlk düğüm için parmak izleri, rumuzlar, ülkeler, adresler</string>
+  <string name="pref_entrance_node_dialog">Giriş Düğümlerini Girin</string>
+  <string name="pref_allow_background_starts_title">Arka planda çalışmaya izin ver</string>
+  <string name="pref_allow_background_starts_summary">Herhangi bir uygulamanın Orbot aracılığıyla Tor ve ilgili hizmetleri başlatması için izin ver</string>
+  <string name="button_proxy_all">Tüm bağlantılar için Vekil Sunucu kullan</string>
+  <string name="button_proxy_none">Vekil Sunucu kullanma</string>
+  <string name="button_invert_selection">Ters seçim</string>
+  <string name="pref_proxy_title">Giden Ağ Sunucusu (tercihe bağlı)</string>
+  <string name="pref_proxy_type_title">Giden proxy tipi</string>
+  <string name="pref_proxy_type_summary">Proxy sunucusunu kullanmak için protokoller: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Proxy tipini girin</string>
+  <string name="pref_proxy_host_title">Giden proxy sunucusu</string>
+  <string name="pref_proxy_host_summary">Vekil Sunucusu adı</string>
+  <string name="pref_proxy_host_dialog">Vekil Host\'u girin</string>
+  <string name="pref_proxy_port_title">Giden vekil bağlantı noktası</string>
+  <string name="pref_proxy_port_summary">Vekil Sunucusu bağlantı noktası</string>
+  <string name="pref_proxy_port_dialog">Vekil bağlantı noktasını girin</string>
+  <string name="pref_proxy_username_title">Giden Vekil Kullanıcı Adı</string>
+  <string name="pref_proxy_username_summary">Vekil Kullanıcı Adı (tercihe bağlı)</string>
+  <string name="pref_proxy_username_dialog">Vekil Kullanıcı Adı girin</string>
+  <string name="pref_proxy_password_title">Giden Vekil Parolası</string>
+  <string name="pref_proxy_password_summary">Vekil parolası (tercihe bağlı)</string>
+  <string name="pref_proxy_password_dialog">Vekil Parolası girin</string>
+  <string name="status">Durum</string>
+  <string name="setting_up_full_transparent_proxying_">Tamamen saydam vekil kuruluyor...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Uygulamaya özel saydam proxy kuruluyor...</string>
+  <string name="transparent_proxying_enabled">Saydam vekil AKTİF</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy Tethering\'e açıldı!</string>
+  <string name="warning_error_starting_transparent_proxying_">UYARI: şeffaf proxy başlatılırken hata oluştu</string>
+  <string name="transproxy_rules_cleared">TransProxy kuralları temizlendi</string>
+  <string name="couldn_t_start_tor_process_">Tor işlemi başlatılamadı</string>
+  <string name="privoxy_is_running_on_port_">Polipo bu port üzerinde çalışıyor:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Port tabanlı şeffaf vekillendirme ayarlanıyor...</string>
+  <string name="bridge_error">Köprü hatası</string>
+  <string name="bridge_requires_ip">Köprü özelliğini kullanmak adına, en az bir tane köprü IP adresi girmelisiniz.</string>
+  <string name="send_email_for_bridges">Gmail hesabınızdan bridges at torproject.org adresine içinde sadece \"get bridges\" yazılı bir eposta gönderin.</string>
+  <string name="error">Hata</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">ErişilebilirAdresleriniz ayarlarınız bir istisnaya yol açtı!</string>
+  <string name="your_relay_settings_caused_an_exception_">Tor aktarıcı ayarlarınız bir istisnaya yol açtı!</string>
+  <string name="exit_nodes">Çıkış Düğümleri</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Son düğüm için parmak izleri, rumuzlar, ülkeler, adresler</string>
+  <string name="enter_exit_nodes">Çıkış bağlantılarını girin</string>
+  <string name="exclude_nodes">Şu bağlantıları dahil etmeyin</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Dahil edilmeyecek parmak izleri, takma adlar, ülkeler ve adresler</string>
+  <string name="enter_exclude_nodes">Giriş bağlantılarını girin</string>
+  <string name="strict_nodes">Değişmeyen bağlantılar</string>
+  <string name="use_only_these_specified_nodes">*Sadece* bu bağlantıları kullan</string>
+  <string name="bridges">Köprüler</string>
+  <string name="use_bridges">Köprü kullan</string>
+  <string name="bridges_obfuscated">Gizlenmiş köprüler</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Tor ağına başka giriş bağlantılarına izin ver</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Yapılandırılan köprüler gizlenmiş ise izin ver</string>
+  <string name="ip_address_and_port_of_bridges">Köprülerin IP adresleri ve bağlantı noktaları</string>
+  <string name="enter_bridge_addresses">Köprü Adresleri Gir</string>
+  <string name="relays">Aktarıcılar</string>
+  <string name="relaying">Aktarmak</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Cihazınızı çıkış yapmayan aktarıcı olması için aktif edin</string>
+  <string name="relay_port">Aktarıcı Portu</string>
+  <string name="listening_port_for_your_tor_relay">Tor aktarıcınız için dinleme port\'u</string>
+  <string name="enter_or_port">OR port\'u gir</string>
+  <string name="relay_nickname">Aktarıcı rumuzu</string>
+  <string name="the_nickname_for_your_tor_relay">Tor aktarıcınız için rumuz</string>
+  <string name="enter_a_custom_relay_nickname">Özel aktarıcı rumuzu girin</string>
+  <string name="reachable_addresses">Ulaşılabilir adresler</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Bir güvenlik duvarı arkasındaki sınırlı kullanıcı olarak bağlan</string>
+  <string name="reachable_ports">Ulaşılabilir bağlantı noktaları</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Sınırlayıcı güvenlik duvarı ardındaki ulaşılabilir bağlantı noktaları</string>
+  <string name="enter_ports">Bağlantı noktaları gir</string>
+  <string name="enable_hidden_services">Gizlenmiş Servis Sunucusu</string>
+  <string name="run_servers_accessible_via_the_tor_network">cihazdaki sunucunun Tor ağından ulaşılmasına izin ver</string>
+  <string name="enter_localhost_ports_for_hidden_services">gizlenmiş servis sunucuları için localhost bağlantı noktası gir</string>
+  <string name="hidden_service_ports">Gizlenmiş Servis Bağlantı Noktaları</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Gizlenmiş servisiniz için adreslenebilir ad (otomatik olarak verilmiştir)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">hata giderme kaydını tut (görüntülemek için adb veya aLogCat gerekir)</string>
+  <string name="project_home">Proje adres(ler)i:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor Lisansı</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Üçüncü Parti Yazılım:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Bir uygulama Tor ağında gizlenmiş sunucu bağlantı noktası %S açmak istiyor. Eğer uygulamaya güveniyorsanız bu güvenlidir.</string>
+  <string name="found_existing_tor_process">varolan bir Tor işlemi bulundu...</string>
+  <string name="something_bad_happened">Kötü bir şey oldu. Kayıtlara bakınız</string>
+  <string name="hidden_service_on">gizlenmiş servis:</string>
+  <string name="unable_to_read_hidden_service_name">gizli hizmet adı okunamıyor</string>
+  <string name="unable_to_start_tor">Tor başlatılamadı:</string>
+  <string name="unable_to_reset_tor">Cihazınızı yeniden başlatın, Tor\'u sıfırlamak mümkün değil! </string>
+  <string name="pref_use_sys_iptables_title">Varsayılan Ip tablolarını kullan</string>
+  <string name="pref_use_sys_iptables_summary">Orbot ile birlikte gelenler yerine kurulu iptables binary kullan</string>
+  <string name="error_installing_binares">Tor binary kurulumu veya yükseltilmesi mümkün değil.</string>
+  <string name="pref_use_persistent_notifications">Orbot bağlı olduğu sürece simgeyi araç çubuğunda tut</string>
+  <string name="pref_use_persistent_notifications_title">Bildirimler her zaman açık</string>
+  <string name="pref_use_expanded_notifications">Tor çıkış ülkesi ve IP için genişletilmiş bildirim göster</string>
+  <string name="pref_use_expanded_notifications_title">Genişletilmiş Bildirimler</string>
+  <string name="notification_using_bridges">Köprüler etkinleştirildi!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Dil</string>
+  <string name="set_locale_summary">Orbot için yerel ayarları ve dili seç</string>
+  <string name="wizard_locale_title">Dili seçin</string>
+  <string name="wizard_locale_msg">Varsayılanda bırak veya geçerli dile geç</string>
+  <string name="powered_by">Tor tarafından desteklenmektedir</string>
+  <string name="btn_save_settings">Ayarları kaydet</string>
+  <string name="no_internet_connection_tor">İnternet bağlantısı yok; Tor bekleme modunda...</string>
+  <string name="bandwidth_">Bant genişliği:</string>
+  <string name="down">aşağı</string>
+  <string name="up">yukarı</string>
+  <string name="pref_disable_network_title">Bağlantı yokken Otomatik Uykuya Geç</string>
+  <string name="pref_disable_network_summary">İnternet olmadığında Tor\'u uykuya al</string>
+  <string name="newnym">Yeni bir Tor kimliğine geçiş yaptınız!</string>
+  <string name="menu_verify_browser">Tarayıcı</string>
+  <string name="menu_use_chatsecure">ChatSecure Kullan</string>
+  <string name="permission_manage_tor_label">Tor\'u Yönet</string>
+  <string name="permission_manage_tor_description">Tor servisini kontrol etmek için bu uygulamayı etkinleştir</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orfox yüklü gibi görünmüyor. Bu konuyla alakalı yardım istiyor musun, ya da sadece tarayıcı mı açılsın?</string>
+  <string name="install_apps_">Uygulamalar kurulsun mu?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Hiçbir ağ bağlantısı yok. Tor uyku moduna alınıyor...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Ağ bağlantısı iyi. Tor uyandırılıyor... </string>
+  <string name="updating_settings_in_tor_service">Tor hizmet ayarları güncellemesi</string>
+  <string name="pref_socks_title">SOCKS için Tor kullan</string>
+  <string name="pref_socks_dialog">SOCKS Port Yapılandırma</string>
+  <string name="pref_transport_title">Tor TransProxy Port</string>
+  <string name="pref_transport_summary">Tor Şeffaf Vekil Proxy Port\'u için (varsayılan olarak: 9040 veya devre dışı bırakmak için 0) değerlerini öneriyor</string>
+  <string name="pref_transport_dialog">TransProxy Port Yapılandırma</string>
+  <string name="pref_dnsport_title">Tor DNS Port</string>
+  <string name="pref_dnsport_dialog">DNS Port Yapılandırma</string>
+  <string name="pref_torrc_title">Torrc Özel Yapılandırma</string>
+  <string name="pref_torrc_summary">SADECE UZMANLAR: Doğrudan torrc yapılandırma satırları girin</string>
+  <string name="pref_torrc_dialog">Torrc yapılandırma</string>
+  <string name="wizard_tips_martus">Mobil Martus - Benetech İnsan Hakları Belgeleri Uygulaması</string>
+  <string name="your_tor_public_ips_">Umumi Tor IP adresiniz:</string>
+  <string name="app_conflict">Uygulama çatışması</string>
+  <string name="pref_transproxy_refresh_title">TransProxy Otomatik Yenileme</string>
+  <string name="pref_transproxy_refresh_summary">Ağ durumu değiştiğinde TransProxy kurallarını yeniden uygula</string>
+  <string name="pref_transproxy_flush_title">TransProxy Kurallarını KALDIR</string>
+  <string name="pref_transproxy_flush_summary">Tüm TransProxy ağ kurallarını temizlemek için buraya dokunun</string>
+  <string name="transparent_proxy_rules_flushed_">Şeffaf vekil kuralları silindi!</string>
+  <string name="you_do_not_have_root_access_enabled">ROOT erişim izniniz yok</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Ayarların etkin olması için Orbot\'u durdurup yeniden başlatmak gerekebilir.</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Köprüler Güncellendi</string>
+  <string name="restart_orbot_to_use_this_bridge_">Değişiklikleri etkinleştirmek için lütfen Orbot\'u yeniden başlatın</string>
+  <string name="menu_qr">QR Kodları</string>
+  <string name="bridge_mode">Köprü Modu</string>
+  <string name="get_bridges_email">Eposta</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Etkinleştirin</string>
+  <string name="apps_mode">Uygulamalar için VPN Modu</string>
+  <string name="send_email">Eposta Gönder</string>
+  <string name="install_orweb">Orfox yükle</string>
+  <string name="standard_browser">Standart Tarayıcı</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOT: Sadece standart Tor köprüleri Intel X86/ATOM cihazlarda çalışır</string>
+  <string name="vpn_default_world">Dünya</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-uk/strings.xml b/orbotservice/src/main/res/values-uk/strings.xml
new file mode 100644
index 0000000..9672e2c
--- /dev/null
+++ b/orbotservice/src/main/res/values-uk/strings.xml
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot — це вільна програма для проксі-з\'єднань, яка дозволяє іншим додаткам безпечніше використовувати інтернет-з\'єднання. Orbot використовує Tor для шифрування інтернет-трафіку, який далі приховується під час пересилання через кілька комп\'ютерів у різних частинах планети. Tor є вільним програмним забезпеченням, а також відкритою мережею, що допомагає захиститися від мережевого стеження, яке загрожує особистій свободі та приватному життю, конфіденційній бізнес-діяльності і контактам, а також державної програми безпеки, що в
 ідома як аналіз трафіку.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">запуск і зупинка Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Запуск Orbot...</string>
+  <string name="status_activated">Під\'єднаний до мережі Tor</string>
+  <string name="status_disabled">«Orbot» від\'єднаний</string>
+  <string name="tor_process_starting">Запускається клієнт Tor...</string>
+  <string name="tor_process_complete">завершено.</string>
+  <string name="tor_process_waiting">очікування...</string>
+  <string name="not_anonymous_yet">Попередження: Ваш трафік ще не анонімний! Будь ласка, налаштуйте свої додатки для використання HTTP проксі 127.0.0.1:8118 або ж SOCKS4A або SOCKS5 проксі 127.0.0.1:9050</string>
+  <string name="menu_home">Домівка</string>
+  <string name="menu_browse">Перегляд</string>
+  <string name="menu_settings">Налаштування</string>
+  <string name="menu_log">Журнал</string>
+  <string name="menu_info">Довідка</string>
+  <string name="menu_start">Запустити</string>
+  <string name="menu_stop">Зупинити</string>
+  <string name="menu_about">Про програму</string>
+  <string name="main_layout_download">Завантажити</string>
+  <string name="main_layout_upload">Завантажити</string>
+  <string name="button_help">Довідка</string>
+  <string name="button_close">Закрити</string>
+  <string name="button_about">Про програму</string>
+  <string name="button_clear_log">Очистити журнал</string>
+  <string name="menu_verify">Перевірка</string>
+  <string name="menu_exit">Вихід</string>
+  <string name="menu_scan">Сканувати BridgeQR</string>
+  <string name="menu_share_bridge">Поділитися BridgeQR</string>
+  <string name="press_to_start">- довге натиснення для запуску -</string>
+  <string name="pref_trans_proxy_group">Прозорий проксі (Потрібен root)</string>
+  <string name="pref_trans_proxy_title">Прозорий проксі</string>
+  <string name="pref_trans_proxy_summary">Автоматична торифікація додатків</string>
+  <string name="pref_transparent_all_title">Направляти все через Tor</string>
+  <string name="pref_transparent_all_summary">Направляти трафік всіх додатків через Tor</string>
+  <string name="pref_transparent_port_fallback_title">Резервний проксі порт</string>
+  <string name="pref_transparent_port_fallback_summary">ПОПЕРЕДЖЕННЯ: Обходить загальні порти (80, 443, і т.д.). *ВИКОРИСТУВУВАТИ ТІЛЬКИ* якщо режими «Все» або «Додатки» не працюють.</string>
+  <string name="pref_transparent_port_title">Список Портів</string>
+  <string name="pref_transparent_port_summary">Список портів для проксифікації. *ВИКОРИСТОВУВАТИ ТІЛЬКИ* якщо режими «Все» або «Додатки» не працюють.</string>
+  <string name="pref_transparent_port_dialog">Введіть порти для проксифікації</string>
+  <string name="pref_has_root">Запитати root доступ</string>
+  <string name="pref_has_root_summary">Запитати root доступ для прозорої проксифікації</string>
+  <string name="status_install_success">Додаток Tor успішно встановленей!</string>
+  <string name="status_install_fail">Не вдалося встановити додаток Tor. Будь ласка, перевірте системний журнал і повідомте нам: tor-assistants at torproject.org</string>
+  <string name="title_error">Помилка додатку</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Про Orbot</string>
+  <string name="btn_next">Вперед</string>
+  <string name="btn_back">Назад</string>
+  <string name="btn_finish">Завершити</string>
+  <string name="btn_okay">OK</string>
+  <string name="btn_cancel">Відміна</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Деякі відомості про програму Orbot</string>
+  <string name="wizard_details_msg">Orbot — це програма з відкритим кодом, яка містить Tor, LibEvent та Polipo. Він надає локальний HTTP-проксі (8118) і SOCKS-проксі (9050) у мережу Tor. Orbot також дозволяє на пристроях з правами root пересилати весь інтернет-трафік через Tor.</string>
+  <string name="wizard_permissions_root">Дозвіл отримано</string>
+  <string name="wizard_permissions_stock">Дозволи Orbot</string>
+  <string name="wizard_premissions_msg_root">Чудово! Ми визначили, що ви надалили root права для Orbot. Ми будемо використовувати цю можливість з розумом.</string>
+  <string name="wizard_permissions_msg_stock"> Хоча це й не вимагається, Orbot може бути потужнішим інструментом, якщо ваш пристрій має права root. Натисніть на кнопку нижче і надайте Orbot суперсилу! </string>
+  <string name="wizard_permissions_no_root">Якщо у вас немає root прав або ви не розумієте про що говоримо, просто впевніться, що використовуєте додатки, розроблені для Orbot.</string>
+  <string name="wizard_permissions_consent">Я розумію і хочу продовжити без прав суперкористувача</string>
+  <string name="wizard_permission_enable_root">Надати root права Orbot</string>
+  <string name="wizard_configure">Налаштувати Tor-ифікацію</string>
+  <string name="wizard_configure_msg">Програма Orbot дає вам можливість маршрутизувати трафік всіх додатків через Tor АБО вибрати додатки для маршрутизації самостійно.</string>
+  <string name="wizard_configure_all">Маршрутизувати всі додатки через Tor</string>
+  <string name="wizard_configure_select_apps">Виберіть додатки для маршрутизації через Tor</string>
+  <string name="wizard_tips_tricks">Orbot-задіяні додатки</string>
+  <string name="wizard_tips_msg">Ми радимо вам завантажити і використовувати додатки, які вміють працювати напряму через Orbot. Натисніть на кнопки нижче, щоб запустити процес встановлення.</string>
+  <string name="wizard_tips_otrchat">ChatSecure - Захищений обмін повідомленнями в Android</string>
+  <string name="wizard_tips_proxy">Налаштування проксі — дізнайтесь як налаштувати додатки для роботи з Orbot</string>
+  <string name="wizard_tips_duckgo">Додаток пошукової системи DuckDuckGo</string>
+  <string name="wizard_tips_twitter">Twitter підтримує http проксі «localhost:8118»</string>
+  <string name="wizard_tips_story_maker">StoryMaker — Запишіть історію і залиште її Tor\'у для безпеки!</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_proxy_help_msg">Якщо програмка для Android, яку Ви використовуєте, підтримує HTTP або SOCKS проксі, то Ви можете налаштувати її на під\'єднання до Orbot і використання Tor.\n\n\n Значення хоста — 127.0.0.1 або «localhost». Для HTTP, номер порту — 8118. Для SOCKS проксі — 9050. По можливості, використовуйте SOCKS4A або SOCKS5.\n \n\n\n Ви можете дізнатись більше про роботу через проксі на Android, прочитавши цей FAQ: http://tinyurl.com/proxyandroid\n</string>
+  <string name="wizard_final">Програма Orbot готова до використання!</string>
+  <string name="wizard_final_msg">Мільйони людей у всьому світі використовують Tor з різних причин.\n\nЖурналісти і блогери, активісти захисту прав людини, судові виконавці, солдати, корпорації, громадяни країн з репресивним режимом, і прості люди… а тепер готові і Ви!</string>
+  <string name="wizard_exit_at_first_screen_toast">Будь ласка, налаштуйте Orbot, перш ніж почнете ним користуватись!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="tor_check">Це призведе до запуску веб-браузера, вибраного на вашому пристрої за замовчуванням, і підключення до сайту https://check.torproject.org, з метою перевірки правильності роботи Orbot і визначення, чи під\'єднані ви до мережі Tor.</string>
+  <string name="pref_hs_group">Приховані сервіси</string>
+  <string name="pref_general_group">Основні</string>
+  <string name="pref_start_boot_title">Запуск Orbot при ввімкненні</string>
+  <string name="pref_start_boot_summary">Автоматичний запуск Orbot та з\'єднання Tor під час запуску вашого пристрою</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot дозволяє використовувати Tor на Android!\n\nTor дозволяє Вам захиститися від фільтрації вмісту, аналізу трафіку і спостереження за мережею, які ставлять під загрозу приватність, конфіденційну інформацію та особисті стосунки.\n\nЦей майстер допоможе Вам налаштувати Orbot і Tor на Вашому пристрої.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Попередження</string>
+  <string name="wizard_warning_msg">Просте встановлення Orbot не зробить автоматично Ваш мобільний трафік анонімним.\n\nВи повинні правильно налаштувати Orbot, Ваш пристрій та інші додатки, щоб успішно використовувати Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Дозволи</string>
+  <string name="wizard_permissions_root_msg1">Ви також можете за бажанням надати Orbot права «Суперкористувача» для доступу до просунутих можливостей, типу \"Прозора Проксифікація\".</string>
+  <string name="wizard_permissions_root_msg2">Якщо ви не хочете робити це, тоді будь ласка, впевніться, що використовуєте додатки створені для роботи з Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Схоже, ваш пристрій не має root-прав або не надає доступу до «Суперкористувача».\n\nБудь ласка, спробуйте натомість режим «Додатки» на головному екрані.</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">Додатки, що працюють з Orbot:</string>
+  <string name="wizard_tips_gibberbot">ChatSecure: додаток для спілкування з підтримкою Off-the-Record шифрування</string>
+  <string name="wizard_tips_play">Знайти всі додатки Guardian Project на Google Play</string>
+  <string name="wizard_tips_fdroid">Знайти всі додатки Guardian Project на F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Знайти всі додатки Guardian Project на https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Прозоре Проксування</string>
+  <string name="wizard_transproxy_msg">Це дозволить вашим додаткам автоматично працювати в мережі Tor без будь-якої конфігурації.</string>
+  <string name="wizard_transproxy_hint">(Позначте даний пункт, якщо ви не знаєте про що йде мова)</string>
+  <string name="wizard_transproxy_none">Ні</string>
+  <string name="pref_transparent_tethering_title">Роздача Tor</string>
+  <string name="pref_transparent_tethering_summary">Ввімкнути Прозору Проксифікацію Tor для пристроїв з роздачею по Wi-Fi і USB (потрібен перезапуск)</string>
+  <string name="button_grant_superuser">Запитати Доступ Суперкористувача</string>
+  <string name="pref_select_apps">Вибрані додатки</string>
+  <string name="pref_select_apps_summary">Вибрати додатки для направлення через Tor</string>
+  <string name="pref_node_configuration">Конфігурація вузла</string>
+  <string name="pref_node_configuration_summary">Це додаткові налаштування, які можуть знизити вашу анонімність</string>
+  <string name="pref_entrance_node">Вхідні вузли</string>
+  <string name="pref_entrance_node_summary">Відбитки, ніки, країни та адреси для першого стрибка</string>
+  <string name="pref_entrance_node_dialog">Введіть вхідні вузли</string>
+  <string name="button_proxy_all">Усі через проксі</string>
+  <string name="button_proxy_none">Жоден через проксі</string>
+  <string name="button_invert_selection">Інвертувати виділення</string>
+  <string name="pref_proxy_title">Вихідна проксі мережа</string>
+  <string name="pref_proxy_type_title">Тип Проксі</string>
+  <string name="pref_proxy_type_summary">Протокол для використання проксі-сервером: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Введіть Тип Проксі</string>
+  <string name="pref_proxy_host_title">Хост Проксі</string>
+  <string name="pref_proxy_host_summary">Ім\'я хоста проксі-сервера</string>
+  <string name="pref_proxy_host_dialog">Введіть Хост Проксі</string>
+  <string name="pref_proxy_port_title">Порт Проксі</string>
+  <string name="pref_proxy_port_summary">Порт проксі-сервера</string>
+  <string name="pref_proxy_port_dialog">Введіть порт Проксі</string>
+  <string name="pref_proxy_username_title">Ім\'я користувача для вихідного проксі-з\'єднання</string>
+  <string name="pref_proxy_username_summary">Ім\'я користувача для проксі-з\'єднання (вказувати не обов\'язково)</string>
+  <string name="pref_proxy_username_dialog">Введіть Ім\'я користувача проксі-з\'єднання</string>
+  <string name="pref_proxy_password_title">Пароль вихідного проксі-з\'єднання</string>
+  <string name="pref_proxy_password_summary">Пароль проксі-з\'єднання (вказувати не обов\'язково)</string>
+  <string name="pref_proxy_password_dialog">Введіть пароль проксі-з\'єднання</string>
+  <string name="status">Статус</string>
+  <string name="setting_up_full_transparent_proxying_">Встановлення загальної прозорої проксифікації...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Встановлення заснованої на додатках прозорої проксифікації...</string>
+  <string name="transparent_proxying_enabled">Прозора проксифікація ВВІМКНЕНА</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy підтримує Роздачу!</string>
+  <string name="warning_error_starting_transparent_proxying_">УВАГА: помилка запуску прозорої проксифікації!</string>
+  <string name="transproxy_rules_cleared">Правила TransProxy видалені</string>
+  <string name="couldn_t_start_tor_process_">Неможливо запустити Tor: </string>
+  <string name="privoxy_is_running_on_port_">Polipo працює на порті: </string>
+  <string name="setting_up_port_based_transparent_proxying_">Встановлення засноване на портах прозорої проксифікації...</string>
+  <string name="bridge_error">Помилка Мосту</string>
+  <string name="bridge_requires_ip">Для використання мосту, необхідно задати IP адресу як мінімум одного мосту.</string>
+  <string name="send_email_for_bridges">Відправте email на адресу bridges at torproject.org з рядком «get bridges» в тілі повідомлення із облікового запису gmail.</string>
+  <string name="error">Помилка</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Ваші налаштування Доступних Адрес викликали виключення!</string>
+  <string name="your_relay_settings_caused_an_exception_">Налаштування вашого ретранслятора викликали виключення!</string>
+  <string name="exit_nodes">Вихідні Вузли</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Відбитки, ніки, країни та адреси для останнього стрибка</string>
+  <string name="enter_exit_nodes">Введіть Вихідні Вузли</string>
+  <string name="exclude_nodes">Виключені Вузли</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Відбитки, ніки, країни та адреси на виключення</string>
+  <string name="enter_exclude_nodes">Введіть Виключені Вузли</string>
+  <string name="strict_nodes">Точні Вузли</string>
+  <string name="use_only_these_specified_nodes">Використовувати *тільки* ці задані вузли</string>
+  <string name="bridges">Мости</string>
+  <string name="use_bridges">Використрвувати Мости</string>
+  <string name="bridges_obfuscated">Обфусковані Мости</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Включити альтернативні вхідні вузли в мережу Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Задані мости обфусковані</string>
+  <string name="ip_address_and_port_of_bridges">IP адреси і порти мостів</string>
+  <string name="enter_bridge_addresses">Введіть Адреси Мостів</string>
+  <string name="relays">Ретранслятори</string>
+  <string name="relaying">Ретрансляція</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Дозволити вашому пристрою бути невихідним ретранслятором</string>
+  <string name="relay_port">Порт ретранслятора</string>
+  <string name="listening_port_for_your_tor_relay">Слухаючий порт для вашого ретранслятора Tor</string>
+  <string name="enter_or_port">Введіть порт OR</string>
+  <string name="relay_nickname">Ім\'я ретранслятора</string>
+  <string name="the_nickname_for_your_tor_relay">Ім\'я для вашого ретранслятора Tor</string>
+  <string name="enter_a_custom_relay_nickname">Введіть користувацьке ім\'я ретранслятора</string>
+  <string name="reachable_addresses">Доступні Адреси</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Запускати як клієнт за брандмауером з обмежуючими політиками</string>
+  <string name="reachable_ports">Доступні порти</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Порти доступні із обмежуваного брандмауера</string>
+  <string name="enter_ports">Введіть порти</string>
+  <string name="enable_hidden_services">Ввімкнути Приховані Служби</string>
+  <string name="run_servers_accessible_via_the_tor_network">запустити сервери доступні через мережу Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">введіть локальні порти для прихованих служб</string>
+  <string name="hidden_service_ports">Порти Прихованої Служби</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">адресоване ім\'я для вашої прихованої служби (сгенеровано автоматично)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ввімкнути вивід логу налогодження (потрібно використовувати adb або aLogCat для перегляду)</string>
+  <string name="project_home">Домашня сторінка(и) проекту: </string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Ліцензія Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Програми сторонніх розробників: </string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="hidden_service_request">Додаток хоче відкрити прихований порт сервера %S мережі Tor. Це безпечно, якщо ви довіряєте цьому додатку.</string>
+  <string name="found_existing_tor_process">знайдено існуючий процес Tor...</string>
+  <string name="something_bad_happened">Виникла якась помилка. Перевірте лог</string>
+  <string name="hidden_service_on">прихована служба на:</string>
+  <string name="unable_to_read_hidden_service_name">неможливо прочитати ім\'я прихованої служби</string>
+  <string name="unable_to_start_tor">Неможливо запустити Tor:</string>
+  <string name="unable_to_reset_tor">Перезавантажте свій пристрій, не вдається перезапустити Tor!</string>
+  <string name="pref_use_sys_iptables_title">Використовувати Iptables за замовчуванням</string>
+  <string name="pref_use_sys_iptables_summary">використовувати вбудований бінарник iptables замість того що надається з Orbot</string>
+  <string name="error_installing_binares">Бінарні файли Tor не змогли встановитися або оновитися.</string>
+  <string name="pref_use_persistent_notifications">Завжди показувати іконку в панелі завдань коли Orbot підключений</string>
+  <string name="pref_use_persistent_notifications_title">Сповіщення про постійну роботу</string>
+  <string name="pref_use_expanded_notifications">Показати розширене сповіщення з країною виходу Tor та IP</string>
+  <string name="pref_use_expanded_notifications_title">Розширені сповіщення</string>
+  <string name="notification_using_bridges">Мости ввімкнуті!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Мова</string>
+  <string name="set_locale_summary">Вибрати локаль і мову для Orbot</string>
+  <string name="wizard_locale_title">Вибрати Мову</string>
+  <string name="wizard_locale_msg">Залишити за замовчуванням або переключити поточну мову</string>
+  <string name="powered_by">від Tor</string>
+  <string name="btn_save_settings">Зберегти Налаштування</string>
+  <string name="no_internet_connection_tor">Немає інтернет-з\'єднання; Tor в режимі очікування…</string>
+  <string name="bandwidth_">Канал:</string>
+  <string name="down">вх</string>
+  <string name="up">вих</string>
+  <string name="pref_disable_network_title">Не використовувати режим сну</string>
+  <string name="pref_disable_network_summary">Переводити в режим сну при відсутності інтернет-з\'єднання</string>
+  <string name="newnym">Ви перемкнулись на новий ідентифікатор Tor!</string>
+  <string name="menu_use_chatsecure">Використовувати ChatSecure</string>
+  <string name="permission_manage_tor_label">Керування Tor</string>
+  <string name="permission_manage_tor_description">Дозволити додатку керувати сервісом Tor</string>
+  <string name="install_apps_">Встановити додатки?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Немає доступу до мережі інтернет. Tor переходить в режим сну…</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Доступ до мережі хороший. Tor виходить з режиму сну…</string>
+  <string name="updating_settings_in_tor_service">оновлення налаштувань у сервісі Tor</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Порт, який Tor надає своєму SOCKS-проксі (за замовчуванням: 9050 або 0 для вимкнення)</string>
+  <string name="pref_socks_dialog">Налаштування порту SOCKS</string>
+  <string name="pref_transport_title">Порт Tor TransProxy</string>
+  <string name="pref_transport_summary">Порт, який Tor надає своєму відкритому проксі (за замовчуванням: 9040 або 0 для вимкнення)</string>
+  <string name="pref_transport_dialog">Налаштування порту Tor TransProxy</string>
+  <string name="pref_dnsport_title">Порт Tor DNS</string>
+  <string name="pref_dnsport_summary">Порт, який Tor надає своєму DNS (за замовчуванням: 5400 або 0 для вимкнення)</string>
+  <string name="pref_dnsport_dialog">Налаштування порту DNS</string>
+  <string name="pref_torrc_title">Додаткові налаштування Torrc</string>
+  <string name="pref_torrc_summary">ЛИШЕ ДЛЯ ЕКСПЕРТІВ: введіть безпосередні рядки налаштувань torrc</string>
+  <string name="pref_torrc_dialog">Додаткове у Torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus — програма Benetech Human Rights Documentation </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_">Будь ласка, вимкніть цей додаток у Android->Налаштування->Програми, якщо у Вас виникають проблеми з Orbot: </string>
+  <string name="app_conflict">Конфлікт програм</string>
+  <string name="pref_transproxy_refresh_title">Автоперезапуск Transproxy</string>
+  <string name="pref_transproxy_refresh_summary">Повторно застосувати правила Transproxy, коли зміниться стан мережі</string>
+  <string name="pref_transproxy_flush_title">ПРИМУСОВЕ ВИЛУЧЕННЯ Transproxy</string>
+  <string name="pref_transproxy_flush_summary">Натисніть тут, щоб зрівняти усі правила мережі transproxy ЗАРАЗ</string>
+  <string name="transparent_proxy_rules_flushed_">Правила прозорого проксі зрівняно!</string>
+  <string name="you_do_not_have_root_access_enabled">У Вас не ввімкнено ROOT-доступ</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Вам може бути потрібно зупинити і запустити Orbot, щоб зміни налаштувань вступили в дію.</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Мости оновлено</string>
+  <string name="restart_orbot_to_use_this_bridge_">Будь ласка, перезапустіть Orbot, щоб зміни ввійшли в силу</string>
+  <string name="menu_qr">QR-коди</string>
+  <string name="bridge_mode">Режим мосту</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Веб</string>
+  <string name="activate">Активувати</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Ви можете увімкнути пропускання трафіку усіх програм на Вашому прострої через мережу Tor, скориставшись функцією VPN в Android.\n\n*УВАГА* Це нова, експериментальна функція і в деяких випадках може не запуститися автоматично або зупинитись. Її НЕ варто використовувати для анонімності і ЛИШЕ для обходу фаєрволів та фільтрів.</string>
+  <string name="send_email">Надіслати листа</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Ви можете отримати адресу мосту через електронну пошту, веб або відсканувавши QR-код мосту. Оберіть «Email» чи «Веб» унизу, щоб подати запит на адресу мосту.\n\nКоли у Вас буде адреса, скопіюйте і вставте її у розділі «Мости» налаштувань Orbot і перезапустіть його.</string>
+  <string name="standard_browser">Стандартний браузер</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">ПРИМІТКА: Лише стандартні мости Tor працюють на пристроях з Intel X86/Atom</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-ur/strings.xml b/orbotservice/src/main/res/values-ur/strings.xml
new file mode 100644
index 0000000..21abd16
--- /dev/null
+++ b/orbotservice/src/main/res/values-ur/strings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="menu_browse">براؤز کیجیے</string>
+  <string name="menu_info">مدد</string>
+  <string name="button_help">مدد</string>
+  <string name="button_close">بند کیجیے</string>
+  <string name="btn_back">پیچھے</string>
+  <string name="btn_cancel">تنسیخ کیجیے</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="default_bridges"></string>
+</resources>
diff --git a/orbotservice/src/main/res/values-uz/strings.xml b/orbotservice/src/main/res/values-uz/strings.xml
new file mode 100644
index 0000000..785d967
--- /dev/null
+++ b/orbotservice/src/main/res/values-uz/strings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="status_starting_up">Orbot ishga tushirilmoqda…</string>
+  <string name="status_activated">Tor tarmog\'iga ulangan</string>
+  <string name="menu_home">Uy</string>
+  <string name="menu_settings">Moslamalar</string>
+  <string name="menu_info">Yordam</string>
+  <string name="menu_about">Dastur haqida</string>
+  <string name="main_layout_download">Yuklab olish</string>
+  <string name="main_layout_upload">Yuklash</string>
+  <string name="button_help">Yordam</string>
+  <string name="button_close">Yopish</string>
+  <string name="button_about">Dasur haqida</string>
+  <string name="menu_verify">Tekshirish</string>
+  <string name="menu_exit">Chiqish</string>
+  <string name="title_error">Dastur xatosi</string>
+  <string name="wizard_title">Orbot</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <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>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Umumiy</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="pref_proxy_type_dialog">Proksi turini kiriting</string>
+  <string name="pref_proxy_password_summary">Proksi maxfiy so\'zi (Qo\'shimcha)</string>
+  <string name="pref_proxy_password_dialog">Proksi maxfiy so\'zini kiriting</string>
+  <string name="status">Holati</string>
+  <string name="error">Xato</string>
+  <string name="the_tor_license">Tor litsenziyasi</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="found_existing_tor_process">Mavjud bo\'lgan Tor jarayoni topildi...</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_summary">Orbot uchun lokal va tilni tanlash</string>
+  <string name="wizard_locale_title">Tilni tanlansh</string>
+  <string name="btn_save_settings">Moslamalarni saqlash</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-vi/strings.xml b/orbotservice/src/main/res/values-vi/strings.xml
new file mode 100644
index 0000000..6562b4e
--- /dev/null
+++ b/orbotservice/src/main/res/values-vi/strings.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot là một ứng dụng proxy miễn phí, được thiết kế để làm cho các ứng dụng khác kết nối với Internet một cách an toàn. Orbot sử dụng Tor để mã hóa các kết nối Internet rồi ẩn danh nó thông qua một loạt các nút trong mạng Tor. Tor là phần mềm miễn phí và là một mạng lưới mở giúp bạn chống lại sự giám sát mạng, vốn đe dọa riêng tư trực tuyến, hay các hoạt động bí mật...</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">khởi động và ngừng Tor</string>
+  <string name="tor_proxy_service_process">dịch vụ tor proxy</string>
+  <string name="status_starting_up">Ortbot đang khởi động...</string>
+  <string name="status_activated">Đã kết nối với mạng Tor</string>
+  <string name="status_disabled">Orbot đã được vô hiệu hóa</string>
+  <string name="status_shutting_down">Đang tắt dịch vụ Tor</string>
+  <string name="tor_process_starting">Bắt đầu Tor</string>
+  <string name="tor_process_complete">hoàn thành.</string>
+  <string name="tor_process_waiting">đang chờ.</string>
+  <string name="not_anonymous_yet">Chú ý: Kết nối của bạn chưa phải là ẩn danh! Hãy cài đặt các ứng dụng của bạn để sử dụng HTTP Proxy 127.0.0.1:8118, Proxy SOCKS4A hoặc proxy SOCKS5 127.0.0.1:9050</string>
+  <string name="menu_home">Trang chủ</string>
+  <string name="menu_browse">Trình duyệt</string>
+  <string name="menu_settings">Thiết lập</string>
+  <string name="menu_log">Nhật ký</string>
+  <string name="menu_info">Giúp đỡ</string>
+  <string name="menu_apps">Mạng riêng ảo</string>
+  <string name="menu_start">Bắt đầu</string>
+  <string name="menu_stop">Ngừng</string>
+  <string name="menu_about">Về</string>
+  <string name="menu_promo_apps">Các ứng dụng khác...</string>
+  <string name="main_layout_download">Tải về</string>
+  <string name="main_layout_upload">Tải lên</string>
+  <string name="button_help">Giúp đỡ</string>
+  <string name="button_close">Đóng</string>
+  <string name="button_about">Giới thiệu</string>
+  <string name="button_clear_log">Xóa nhật ký</string>
+  <string name="menu_verify">Kiểm tra</string>
+  <string name="menu_exit">Thoát</string>
+  <string name="menu_scan">Quét mã BridgeQR</string>
+  <string name="menu_share_bridge">Xuất mã BridgeQR</string>
+  <string name="press_to_start">- nhấn giữ để khởi động -</string>
+  <string name="pref_trans_proxy_group">Proxy trong suốt (Yêu cầu root)</string>
+  <string name="pref_trans_proxy_title">Proxy trong suốt</string>
+  <string name="pref_trans_proxy_summary">Tự động áp dụng Tor cho ứng dụng</string>
+  <string name="pref_transparent_all_title">Áp dụng Tor cho tất cả ứng dụng</string>
+  <string name="pref_transparent_all_summary">Chuyển tất cả các kết nối của các ứng dụng qua Tor</string>
+  <string name="pref_transparent_port_fallback_title">Cổng Proxy dự phòng</string>
+  <string name="pref_transparent_port_fallback_summary">CHÚ Ý: Tránh dùng các cổng thông dụng (80, 443, v.v...). *CHỈ* dùng nếu chế độ \"áp dụng Tor cho tất cả\" hoặc \"chọn ứng dụng\" không dùng được.</string>
+  <string name="pref_transparent_port_title">Danh sách cổng</string>
+  <string name="pref_transparent_port_summary">Liệt kê các cổng để áp dụng proxy. *CHỈ* dùng nếu chế độ \"áp dụng Tor cho tất cả\" hoặc \"chọn ứng dụng\" không dùng được.</string>
+  <string name="pref_transparent_port_dialog">Điền số cổng để áp dụng proxy</string>
+  <string name="pref_has_root">Yêu cầu root</string>
+  <string name="pref_has_root_summary">Yêu cầu root để kích hoạt proxy trong suốt</string>
+  <string name="status_install_success">Tập nhị phân của Tor đã được cài đặt!</string>
+  <string name="status_install_fail">Tập nhị phân của Tor bị lỗi khi cài đặt. Xin hãy kiểm tra nhật ký và thông báo cho tor-assistants at torproject.org</string>
+  <string name="title_error">Ứng dụng bị lỗi</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Về Orbot</string>
+  <string name="btn_next">Tiếp</string>
+  <string name="btn_back">Trở về</string>
+  <string name="btn_finish">Kết thúc</string>
+  <string name="btn_okay">Đồng ý</string>
+  <string name="btn_cancel">Hủy</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Vài chi tiết về Orbot</string>
+  <string name="wizard_details_msg">Orbot là một ứng dụng mã nguồn mở có chứa Tor, LibEvent và Polipo. Nó cung cấp một proxy HTTP nội bộ (8118) và một proxy SOCKS (9050) tới mạng Tor. Orbot cũng có khả năng chuyển tất cả các kết nối Internet thông qua Tor trên các thiết bị đã root.</string>
+  <string name="wizard_permissions_root">Đã cho phép quyền</string>
+  <string name="wizard_permissions_stock">Quyền truy cập của Orbot</string>
+  <string name="wizard_premissions_msg_root">Tuyệt! Chúng tôi đã nhận ra máy bạn có root được kích hoạt cho Orbot. Chúng tôi sẽ tận dụng điều này.</string>
+  <string name="wizard_permissions_msg_stock">Mặc dù không cần thiết, nhưng Orbot có thể trở thành một công cụ mạnh mẽ hơn nếu thiết bị của bạn có root. Hãy ấn nút dưới đây để cho phép Orbot có \"siêu năng lực\"!</string>
+  <string name="wizard_permissions_no_root">Nếu bạn không root hoặc không rành về những gì chúng tôi trình bày, xin chỉ dùng những ứng dụng đã được tạo ra để dùng kết hợp với Orbot.</string>
+  <string name="wizard_permissions_consent">Tôi hiểu rõ và sẽ tiếp tục dùng mà không cần root</string>
+  <string name="wizard_permission_enable_root">Cho phép Orbot truy cập root</string>
+  <string name="wizard_configure">Cài đặt thông báo cho Tor</string>
+  <string name="wizard_configure_msg">Orbot cho phép chuyển tất cả các kết nối của các ứng dụng qua Tor HOẶC áp dụng cho từng ứng dụng riêng lẻ.</string>
+  <string name="wizard_configure_all">Áp dụng proxy Tor cho tất cả các ứng dụng</string>
+  <string name="wizard_configure_select_apps">Lựa chọn từng ứng dụng để áp dụng Tor</string>
+  <string name="wizard_tips_tricks">Các ứng dụng đã được áp dụng Tor</string>
+  <string name="wizard_tips_msg">Những ứng dụng sau đây đã được thiết lập để dùng với Orbot. Nhấn ứng dụng bất kỳ để cài đặt ngay bây giờ, hoặc bạn có thể tìm những ứng dụng này trên Google Play, tại trang GuardianProject.info hoặc qua F-Droid.org.</string>
+  <string name="wizard_tips_otrchat">ChatSecure - Ứng dụng IM (tin nhắn tức thời) bảo mật cho Android</string>
+  <string name="wizard_tips_proxy">Cài đặt Proxy - Tìm hiểu cách thiết lập ứ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="wizard_tips_twitter">Cài proxy của Twitter với host là \"localhost\" và cổng là 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Viết một câu chuyện rồi để nó cho Tor để bảo mật!</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
+  <string name="wizard_proxy_help_info">Cài đặt proxy</string>
+  <string name="wizard_proxy_help_msg">Nếu ứng dụng Android mà bạn đang dùng hỗ trợ giao thức proxy HTTP hay SOCKS, thì bạn có thể cấu hình nó kết nối tới Orbot và sử dụng Tor.\n\n\n Cài đặt host mặc định là 127.0.0.1 hoặc \"localhost\". Với HTTP, cổng là 8118, còn SOCKS là 9050. Bạn nên dùng SOCKS4A hoặc SOCKS5 nếu có thể.\n \n\n\n Bạn có thể tìm hiểu thêm về cấu hình proxy trên Android qua mục FAQ tại: http://tinyurl.com/proxyandroid</string>
+  <string name="wizard_final">Orbot đã sẵn sàng!</string>
+  <string name="wizard_final_msg">Hàng trăm ngàn người trên toàn thế giới dùng Tor với nhiều lý do. Những nhà báo, blogger, các nhà hoạt động nhân quyền, an ninh, quân đội, tổ chức, công dân của những nước bị đang bị đàn áp, hoặc chỉ là những người dân bình thường... và bây giờ là bạn cũng đang chuẩn bị là một trong số họ!</string>
+  <string name="wizard_exit_at_first_screen_toast">Vui lòng thiết lập Orbot trước khi bạn sử dụng nó!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">Bạn đã kết nối thành công tới mạng Tor - nhưng điều đó KHÔNG có nghĩa là thiết bị của bạn đã hoàn toàn an toàn. Bạn có thể kiểm tra kết nối của bạn qua nút \"Trình duyệt\". \n\nTruy cập ttps://guardianproject.info/apps/orbot hoặc gửi email tới help at guardianproject.info để biết thêm chi tiết.</string>
+  <string name="tor_check">Sẽ mở trang web https://check.torproject.org để kiểm tra xem Orbot đã được cài đặt đúng chưa và bạn có đang kết nối qua Tor hay không.</string>
+  <string name="pref_hs_group">Dịch vụ web hosting ẩn</string>
+  <string name="pref_general_group">Tổng quát</string>
+  <string name="pref_start_boot_title">Chạy Orbot khi khởi động thiết bị</string>
+  <string name="pref_start_boot_summary">Tự khởi động Orbot và kết nối vào mạng Tor sau khi thiết bị Android của bạn khởi động</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot mang Tor đến Android! \n\nTor giúp bạn chống lại bộ lọc nội dung mạng, các hoạt động phân tích kết nối mạng và theo dõi mạng, vốn đe dọa tới sự riêng tư, các thông tin bí mật và các mối quan hệ cá nhân trên mạng. \n\nHướng dẫn này sẽ giúp bạn thiết lập Orbot và Tor trên thiết bị của bạn.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Cảnh báo</string>
+  <string name="wizard_warning_msg">Chỉ đơn thuần cài đặt Orbot sẽ không tự động ẩn danh các kết nối mạng di động của bạn.\n\nBạn bắt buộc phải thiết lập Orbot đúng cách, để thiết bị của bạn và các ứng dụng khác sử dụng Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Quyền ứng dụng</string>
+  <string name="wizard_permissions_root_msg1">Bạn có thể tuỳ ý cho phép Orbot có truy cập root để kích hoạt những tính năng nâng cao, như dùng proxy trong suốt chẳng hạn.</string>
+  <string name="wizard_permissions_root_msg2">Nếu bạn không muốn làm điều này, xin hãy dùng những ứng dụng được tạo để dùng với Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Thiết bị của bạn hình như chưa root hoặc đã cấp quyền root hoặc truy cập root.\n\nVui lòng chọn chế độ \"VPN\" trên màn hình chính để thay thế.</string>
+  <!--TipsAndTricks screen-->
+  <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 không-theo-dõi</string>
+  <string name="wizard_tips_orweb">Orfox: Trình duyệt với tính năng bảo mật nâng cao, hoạt động thông qua Tor</string>
+  <string name="wizard_tips_play">Tìm những ứng dụng của Guardian Project trên Google Play</string>
+  <string name="wizard_tips_fdroid">Tìm những ứng dụng của Guardian Project trên F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Tìm những ứng dụng của Guardian Project trên https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">Proxy trong suốt</string>
+  <string name="wizard_transproxy_msg">Cài đặt này cho phép các ứng dụng của bạn tự động kết nối qua mạng Tor mà không cần thiết lập.</string>
+  <string name="wizard_transproxy_hint">(Hãy chọn ô này nếu bạn không hiểu những gì chúng tôi đang nói)</string>
+  <string name="wizard_transproxy_none">Không có</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Kích hoạt proxy Tor trong suốt để dùng cho WiFi/USB Tethering (cần khởi động lại)</string>
+  <string name="button_grant_superuser">Yều cầu truy cập root</string>
+  <string name="pref_select_apps">Chọn ứng dụng</string>
+  <string name="pref_select_apps_summary">Chọn những ứng dụng mà bạn muốn kết nối qua Tor</string>
+  <string name="pref_node_configuration">Cấu hình nút</string>
+  <string name="pref_node_configuration_summary">Những cài đặt nâng cao này có thể giảm sự ẩn danh của bạn</string>
+  <string name="pref_entrance_node">Nút vào (Entrace Nodes)</string>
+  <string name="pref_entrance_node_summary">Dấu theo dõi (Fingerprint), biệt hiệu, quốc gia và địa chỉ cho nút đầu tiên</string>
+  <string name="pref_entrance_node_dialog">Nhập thông tin nút vào</string>
+  <string name="pref_allow_background_starts_title">Cho phép khởi động ngầm</string>
+  <string name="pref_allow_background_starts_summary">Cho phép ứng dụng bất kỳ yêu cầu Orbot khởi động Tor và các dịch vụ liên quan</string>
+  <string name="button_proxy_all">Proxy tất cả</string>
+  <string name="button_proxy_none">Không dùng proxy</string>
+  <string name="button_invert_selection">Đảo ngược lựa chọn</string>
+  <string name="pref_proxy_title">Proxy mạng ngõ ra (Outbound Network) (Tùy chọn)</string>
+  <string name="pref_proxy_type_title">Loại proxy ngõ ra</string>
+  <string name="pref_proxy_type_summary">Giao thức dùng cho proxy: HTTP, HTTPS, SOCKS4, SOCKS5</string>
+  <string name="pref_proxy_type_dialog">Nhập loại proxy</string>
+  <string name="pref_proxy_host_title">Host proxy ngõ ra</string>
+  <string name="pref_proxy_host_summary">Hostname của proxy</string>
+  <string name="pref_proxy_host_dialog">Nhập host của proxy</string>
+  <string name="pref_proxy_port_title">Cổng Proxy ngõ ra</string>
+  <string name="pref_proxy_port_summary">Cổng của proxy</string>
+  <string name="pref_proxy_port_dialog">Nhập cổng Proxy</string>
+  <string name="pref_proxy_username_title">Tên tài khoản proxy ngõ ra</string>
+  <string name="pref_proxy_username_summary">Tên tài khoản proxy (tùy chọn)</string>
+  <string name="pref_proxy_username_dialog">Nhập tên tài khoản proxy</string>
+  <string name="pref_proxy_password_title">Mật khẩu Proxy ngõ ra</string>
+  <string name="pref_proxy_password_summary">Mật khẩu proxy (tùy chọn)</string>
+  <string name="pref_proxy_password_dialog">Nhập mật khẩu proxy</string>
+  <string name="status">Tình trạng</string>
+  <string name="setting_up_full_transparent_proxying_">Đang cấu hình proxy trong suốt cho tất cả...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Đang cấu hình proxy trong suốt cho các ứng dụng được chọn...</string>
+  <string name="transparent_proxying_enabled">Proxy trong suốt ĐƯỢC KÍCH HOẠT</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy đã được kích hoạt để dùng cho tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">CHÚ Ý: có lỗi khi khởi động proxy trong suốt!</string>
+  <string name="transproxy_rules_cleared">Quy tắc TransProxy đã được xóa</string>
+  <string name="couldn_t_start_tor_process_">Không thể khởi động tiến trình Tor:</string>
+  <string name="privoxy_is_running_on_port_">Polipo đang chạy ở cổng:</string>
+  <string name="setting_up_port_based_transparent_proxying_">Đang cài đặt proxy trong suốt theo cổng</string>
+  <string name="bridge_error">Lỗi bridge</string>
+  <string name="bridge_requires_ip">Để dùng chức năng bridge, bạn phải nhập ít nhất một địa chỉ IP dùng cho bridge.</string>
+  <string name="send_email_for_bridges">Gửi một email đến bridges at torproject.org với dòng chữ \"get bridges\" trong thư từ một tài khoản gmail.</string>
+  <string name="error">Lỗi</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Thiết lập ReachableAddresses đã gây ra một vấn đề! </string>
+  <string name="your_relay_settings_caused_an_exception_">Thiết lập relay của bạn đã gây ra một vấn đề!</string>
+  <string name="exit_nodes">Nút cuối (Exit Nodes)</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Dấu theo dõi, biệt hiệu, quốc gia và địa chỉ cho nút cuối cùng</string>
+  <string name="enter_exit_nodes">Nhập thông tin nút cuối</string>
+  <string name="exclude_nodes">Loại trừ nút</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Dấu theo dõi, biệt hiệu, quốc gia và địa chỉ để loại trừ</string>
+  <string name="enter_exclude_nodes">Nhập vào những nút để loại trừ</string>
+  <string name="strict_nodes">Nút chỉ định</string>
+  <string name="use_only_these_specified_nodes">*Chỉ* dùng những nút được liệt kê</string>
+  <string name="bridges">Bridge</string>
+  <string name="use_bridges">Dùng bridge</string>
+  <string name="bridges_obfuscated">Các bridge được che giấu</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Kích hoạt các nút vào khác để vào mạng Tor</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Kích hoạt nếu như các bridge đã được cấu hình là bridge đã được che giấu</string>
+  <string name="ip_address_and_port_of_bridges">Địa chỉ IP và cổng của bridge</string>
+  <string name="enter_bridge_addresses">Nhập địa chỉ bridge</string>
+  <string name="relays">Relay</string>
+  <string name="relaying">Chức năng relay</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Cho phép thiết bị bạn trở thành một nút relay (không phải nút cuối)</string>
+  <string name="relay_port">Cổng cho relay</string>
+  <string name="listening_port_for_your_tor_relay">Cổng tiếp nhận cho việc relay</string>
+  <string name="enter_or_port">Nhập cổng OR</string>
+  <string name="relay_nickname">Biệt hiệu nút relay</string>
+  <string name="the_nickname_for_your_tor_relay">Biệt hiệu cho nút Tor-relay của bạn</string>
+  <string name="enter_a_custom_relay_nickname">Nhập biệt hiệu tuỳ ý</string>
+  <string name="reachable_addresses">Địa chỉ truy cập được (Reachable Addresses)</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Chạy như một máy con (client) đằng sau tường lửa với các thiết lập thu hẹp</string>
+  <string name="reachable_ports">Cổng truy cập được</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Cổng truy cập được đằng sau tường lửa</string>
+  <string name="enter_ports">Nhập số cổng</string>
+  <string name="enable_hidden_services">Host web ẩn</string>
+  <string name="run_servers_accessible_via_the_tor_network">Cho phép máy chủ được thiết lập trong thiết bị của bạn có thể truy cập được qua mạng Tor.</string>
+  <string name="enter_localhost_ports_for_hidden_services">Nhập cổng localhost cho web ẩn</string>
+  <string name="hidden_service_ports">Cổng web ẩn</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Địa chỉ hợp lệ cho web ẩn của bạn (được tự động tạo ra)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Kích hoạt nhật ký gỡ lỗi ở đầu ra (phải dùng adb hoặc aLogCat để xem)</string>
+  <string name="project_home">Các trang chủ dự án:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Giấy phép của Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Phần mềm bên thứ 3:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">Một ứng dụng muốn mở cổng ẩn %S đến mạng Tor. Đây là điều an toàn nếu như bạn tin tưởng vào ứng dụng này.</string>
+  <string name="found_existing_tor_process">tìm ra tiến trình hiện hành của Tor...</string>
+  <string name="something_bad_happened">Có gì đó không ổn. Xin xem lại nhật ký</string>
+  <string name="hidden_service_on">web ẩn trong:</string>
+  <string name="unable_to_read_hidden_service_name">không thể đọc được tên dịch vụ ẩn</string>
+  <string name="unable_to_start_tor">Không thể khởi động Tor được: </string>
+  <string name="unable_to_reset_tor">Khởi động lại thiết bị của bạn, không thể thiết đặt lại Tor!</string>
+  <string name="pref_use_sys_iptables_title">Dùng Iptables mặc định</string>
+  <string name="pref_use_sys_iptables_summary">dùng tập nhị phân iptables của hệ thống thay vì dùng tập nhị phân được  đi kèm với Orbot</string>
+  <string name="error_installing_binares">Tập nhị phân của Tor không thể cài hoặc nâng cấp được.</string>
+  <string name="pref_use_persistent_notifications">Luôn giữ thông báo trong thanh trạng thái khi Orbot được kết nối</string>
+  <string name="pref_use_persistent_notifications_title">Thông báo thường trực</string>
+  <string name="pref_use_expanded_notifications">Hiển thị thông báo mở rộng với IP và quốc gia của nút cuối (Tor exit-node)</string>
+  <string name="pref_use_expanded_notifications_title">Thông báo mở rộng</string>
+  <string name="notification_using_bridges">Bridge đã được kích hoạt!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">Ngôn ngữ</string>
+  <string name="set_locale_summary">Chọn ngôn ngữ cho Orbot</string>
+  <string name="wizard_locale_title">Chọn ngôn ngữ</string>
+  <string name="wizard_locale_msg">Giữ cài đặt mặc định hoặc chuyển qua ngôn ngữ khác</string>
+  <string name="powered_by">được hỗ trợ bởi Tor</string>
+  <string name="btn_save_settings">Lưu thiết lập</string>
+  <string name="no_internet_connection_tor">Không có kết nối Internet; Tor đang ở chế độ chờ...</string>
+  <string name="bandwidth_">Băng thông:</string>
+  <string name="down">tải xuống</string>
+  <string name="up">tải lên</string>
+  <string name="pref_disable_network_title">Tự động \"ngủ\" khi không có mạng</string>
+  <string name="pref_disable_network_summary">Chuyển Tor sang chế độ ngủ nếu không có Internet</string>
+  <string name="newnym">Bạn đã chuyển sang một mạch Tor mới!</string>
+  <string name="menu_verify_browser">Trình duyệt</string>
+  <string name="menu_use_chatsecure">Dùng ChatSecure</string>
+  <string name="permission_manage_tor_label">Quản lý Tor</string>
+  <string name="permission_manage_tor_description">Cho phép ứng dụng này điều khiển dịch vụ Tor</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Có vẻ như bạn chưa cài Orfox. Bạn có cần giúp không, hay chỉ cần mở trình duyệt thường thôi?</string>
+  <string name="install_apps_">Cài đặt ứng dụng?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Không có mạng. Đang chuyển Tor sang chế độ ngủ...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Kết nối mạng tốt. Đang \"đánh thức\" Tor...</string>
+  <string name="updating_settings_in_tor_service">đang cập nhật cài đặt dịch vụ Tor</string>
+  <string name="pref_socks_title">Cổng SOCKS</string>
+  <string name="pref_socks_summary">Cổng để Tor đặt proxy SOCKS lên (mặc định: 9050 hoặc 0 để vô hiệu hóa)</string>
+  <string name="pref_socks_dialog">Cấu hình cổng SOCKS</string>
+  <string name="pref_transport_title">Cổng proxy trong suốt của Tor</string>
+  <string name="pref_transport_summary">Cổng để Tor đặt proxy trong suốt lên (mặc định: 9040 hoặc 0 để vô hiệu hóa)</string>
+  <string name="pref_transport_dialog">Cấu hình cổng proxy trong suốt</string>
+  <string name="pref_dnsport_title">Cổng DNS Tor</string>
+  <string name="pref_dnsport_summary">Cổng để Tor đặt DNS của nó lên (mặc định: 5400 hoặc 0 để vô hiệu hóa)</string>
+  <string name="pref_dnsport_dialog">Cấu hình cổng DNS</string>
+  <string name="pref_torrc_title">Cấu hình tùy chỉnh cho Torrc</string>
+  <string name="pref_torrc_summary">CHỈ NGƯỜI DÙNG CHUYÊN MÔN: nhập các thiết lập trực tiếp cho torrc</string>
+  <string name="pref_torrc_dialog">Torrc tùy chỉnh</string>
+  <string name="wizard_tips_martus">Mobile Martus - Ứng dụng cung cấp các tài liệu về nhân quyền của Benetech</string>
+  <string name="your_tor_public_ips_">Các IP Tor công cộng của bạn là:</string>
+  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Vui lòng vô hiệu hóa ứng dụng này trong Android->Settings->Apps nếu bạn đang gặp vấn đề với Orbot:</string>
+  <string name="app_conflict">Xung đột ứng dụng</string>
+  <string name="pref_transproxy_refresh_title">Tự động làm mới proxy trong suốt</string>
+  <string name="pref_transproxy_refresh_summary">Áp dụng lại các quy tắc proxy trong suốt khi trạng thái mạng thay đổi</string>
+  <string name="pref_transproxy_flush_title">ÉP BUỘC XÓA các quy tắc proxy trong suốt</string>
+  <string name="pref_transproxy_flush_summary">Chạm vào đây để xóa sạch các quy tắc proxy trong suốt NGAY BÂY GIỜ</string>
+  <string name="transparent_proxy_rules_flushed_">Quy tắc proxy trong suốt đã được xóa!</string>
+  <string name="you_do_not_have_root_access_enabled">Bạn không có quyền truy cập ROOT</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Bạn có thể cần kết nối lại Orbot để các thay đổi được áp dụng</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">Bridge được cập nhật</string>
+  <string name="restart_orbot_to_use_this_bridge_">Vui lòng khởi động lại Orbot để áp dụng thay đổi</string>
+  <string name="menu_qr">Mã QR</string>
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Nếu như mạng di động của bạn chặn Tor, bạn có thể dùng bridge (cầu nối) để truy cập mạng Tor. CHỌN một trong những bridge ở trên để kích hoạt bridge.</string>
+  <string name="bridge_mode">Chế độ bridge</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Kích hoạt</string>
+  <string name="apps_mode">Chế độ ứng dụng VPN</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Bạn có thể làm cho tất cả ứng dụng của bạn kết nối qua mạng Tor bằng cách sử dụng tính năng VPN (Mạng riêng ảo) của Android.\n\n*CHÚ Ý* Đây là một tính năng mới, đang thử nghiệm và nó có thể không tự động chạy, hoặc có thể dừng lại đột ngột. Nó KHÔNG nên được dùng cho ẩn danh, và chỉ nên dùng để vượt qua các tường lửa và bộ lọc.</string>
+  <string name="send_email">Gửi email</string>
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Bạn có thể lấy một địa chỉ bridge qua email, web hoặc quét mã QR. Chọn \"Email\" hoặc \"Web\" bên dưới để yêu cầu một địa chỉ bridge.\n\nMột khi đã có địa chỉ, hãy sao chép nó vào thiết đặt \"Bridge\" trong cài đặt Orbot rồi khởi động lại phần mềm.</string>
+  <string name="install_orweb">Cài đặt Orfox</string>
+  <string name="standard_browser">Trình duyệt thường</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">LƯU Ý: Chỉ có bridge Tor chuẩn mới hoạt động trên các thiết bị Intel x86/Atom</string>
+  <string name="vpn_default_world">Toàn cầu</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-zh-rCN/strings.xml b/orbotservice/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..e050c23
--- /dev/null
+++ b/orbotservice/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot 是一款免费的代理应用,能够让其他应用更安全地使用互联网。通过在位于世界各地的一系列计算机之间进行跳转,Orbot 可利用 Tor 对网络通信进行加密并隐藏。Tor 是一款免费的软件,并且是一个开放的网络。它可以保护用户免受流量分析的危害,这种网络监控可对个人自由与隐私、商业机密活动和关系以及国家安全造成威胁。</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">启动和停止 Tor</string>
+  <string name="tor_proxy_service_process">Tor 代理服务</string>
+  <string name="status_starting_up">Orbot 正在启动...</string>
+  <string name="status_activated">已连接到 Tor 网络</string>
+  <string name="status_disabled">Orbot 已停用</string>
+  <string name="status_shutting_down">Tor服务 正在关闭</string>
+  <string name="tor_process_starting">正在启动 Tor 客户端...</string>
+  <string name="tor_process_complete">完成。</string>
+  <string name="tor_process_waiting">等待。</string>
+  <string name="not_anonymous_yet">警告:你的网络通讯并非匿名!请设置应用程序,使用 HTTP 代理 127.0.0.1:8118 或者 SOCKS4A、SOCKS5 代理 127.0.0.1:9050</string>
+  <string name="menu_home">首页</string>
+  <string name="menu_browse">浏览</string>
+  <string name="menu_settings">设置</string>
+  <string name="menu_log">日志</string>
+  <string name="menu_info">帮助</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">启动</string>
+  <string name="menu_stop">停止</string>
+  <string name="menu_about">关于</string>
+  <string name="menu_promo_apps">获取应用…</string>
+  <string name="main_layout_download">下载</string>
+  <string name="main_layout_upload">上传</string>
+  <string name="button_help">帮助</string>
+  <string name="button_close">关闭</string>
+  <string name="button_about">关于</string>
+  <string name="button_clear_log">清除日志</string>
+  <string name="menu_verify">检查</string>
+  <string name="menu_exit">退出</string>
+  <string name="menu_scan">扫描网桥QR码</string>
+  <string name="menu_share_bridge">分享网桥QR码</string>
+  <string name="press_to_start">- 长按启动 -</string>
+  <string name="pref_trans_proxy_group">透明代理(需要 Root 权限)</string>
+  <string name="pref_trans_proxy_title">透明代理</string>
+  <string name="pref_trans_proxy_summary">应用程序自动使用 Tor</string>
+  <string name="pref_transparent_all_title">所有应用程序使用 Tor</string>
+  <string name="pref_transparent_all_summary">所有应用程序都通过 Tor 连接网络</string>
+  <string name="pref_transparent_port_fallback_title">备用代理端口</string>
+  <string name="pref_transparent_port_fallback_summary">警告:避免使用常用端口(80、443 等)。仅在“应用程序”或“应用程序”模式无法工作时使用。</string>
+  <string name="pref_transparent_port_title">端口列表</string>
+  <string name="pref_transparent_port_summary">代理端口列表。仅在“应用程序”或“应用程序”模式无法工作时使用。</string>
+  <string name="pref_transparent_port_dialog">输入代理端口</string>
+  <string name="pref_has_root">请求 Root 访问权限</string>
+  <string name="pref_has_root_summary">为透明代理请求获取 Root 访问权限</string>
+  <string name="status_install_success">Tor 程序安装成功!</string>
+  <string name="status_install_fail">Tor 程序无法安装。请查看日志并将其发送到 tor-assistants at torproject.org</string>
+  <string name="title_error">应用程序错误</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">关于 Orbot</string>
+  <string name="btn_next">下一步</string>
+  <string name="btn_back">上一步</string>
+  <string name="btn_finish">完成</string>
+  <string name="btn_okay">确定</string>
+  <string name="btn_cancel">取消</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">更多 Orbot 信息</string>
+  <string name="wizard_details_msg">Orbot 是一个包含 Tor、LibEvent 和 Polipo 的开源应用程序。它提供了一个本地 HTTP 代理 (8118) 和一个 SOCKS 代理 (9050) 前往 Tor 网络。Orbot 也有能力在 root 过的设备上将所有互联网流量通过 Tor 发送。</string>
+  <string name="wizard_permissions_root">已获取权限</string>
+  <string name="wizard_permissions_stock">Orbot 权限</string>
+  <string name="wizard_premissions_msg_root">好极了!我们检测到 Orbot 已获取 Root 权限 。我们会谨慎地使用这一权限。</string>
+  <string name="wizard_permissions_msg_stock">虽非必须,但是具有 Root 访问权限的设备可以让 Orbot 变得更强大。请使用下面的按钮授予 Orbot 这一强大的能力!</string>
+  <string name="wizard_permissions_no_root">如果没有 Root 访问权限或不明白此处所说的内容,只需确保 Orbot 支持所用的应用即可。</string>
+  <string name="wizard_permissions_consent">我明白并愿意在未获取 Root 权限的情况下继续操作</string>
+  <string name="wizard_permission_enable_root">为 Orbot 获取 Root 权限</string>
+  <string name="wizard_configure">配置 Tor 网络</string>
+  <string name="wizard_configure_msg">Orbot 提供了选项,可指定所有应用程序使用 Tor 网络或指定某些应用通过 Tor 网络进行通讯。</string>
+  <string name="wizard_configure_all">所有应用程序都使用 Tor</string>
+  <string name="wizard_configure_select_apps">选择使用 Tor 的应用程序</string>
+  <string name="wizard_tips_tricks">Orbot 支持的应用</string>
+  <string name="wizard_tips_msg">以下应用可与 Orbot 一起使用。点击下面的按钮安装,也可以通过 Google Play 商店、GuardianProject.info 网站或 F-Droid.org 查找。</string>
+  <string name="wizard_tips_otrchat">ChatSecure - Android 上的安全即时通讯客户端</string>
+  <string name="wizard_tips_proxy">代理设置 - 学习如何配置应用程序使用 Orbot</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo 搜索引擎应用程序</string>
+  <string name="wizard_tips_twitter">将 Twitter 代理的主机设置 localhost 并将端口设置为 8118</string>
+  <string name="wizard_tips_story_maker">故事制造者--乱说些什么,并用Tor保证您的安全!</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_proxy_help_msg">如果 Android 应用程序支持 HTTP 或 SOCKS 代理,那么您可对它进行配置来连接到 Orbot 并使用 Tor 网络。 主机设置为 127.0.0.1 或 localhost。对于 HTTP,端口设置为 8118;对于 SOCKS,端口设置为 9050。如果可以,请尽量使用 SOCKS4A 或 SOCKS5 代理。 更多有关 Android 代理信息,请参阅 http://tinyurl.com/proxyandroid 中的常见问题</string>
+  <string name="wizard_final">Orbot 已就绪!</string>
+  <string name="wizard_final_msg">全球数以万计的人正在使用Tor,他们中有媒体记者,博客家,人权主义者,改革宣扬者,军官,公司职工,以及同您一样的普通市民!现在,您也准备好了!</string>
+  <string name="wizard_exit_at_first_screen_toast">请在您开始使用它前配置 Orbot!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">您已经成功连接到Tor网络,但不代表您的设备是安全的。您可以使用“浏览器”按钮测试您的连接。
+
+访问https://guardianproject.info/apps/orbot 或发送邮件至help at guardianproject.info 来了解更多。</string>
+  <string name="tor_check">浏览器将启动并访问:https://check.torproject.org,以便检查 Orbot 配置是否正确以及是否可连接 Tor 网络。</string>
+  <string name="pref_hs_group">隐藏服务主机</string>
+  <string name="pref_general_group">常规</string>
+  <string name="pref_start_boot_title">开机时启动 Orbot</string>
+  <string name="pref_start_boot_summary">Android 设备开机时自动启动 Orbot 并连接 Tor 网络</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot使Android支持Tor网络!
+Tor帮助你避开那些威胁到你的隐私,重要信息和社交关系的内容过滤,流量分析以及网络审查。
+这个向导将帮助你配置Orbot在你设备商以便访问Tor。</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">警告</string>
+  <string name="wizard_warning_msg">简单的安装完Orbot并不能自动的匿名你的移动流量。
+你必须适当的配置Orbot,以及你的设备及应用以成功匿名使用Tor。</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">权限</string>
+  <string name="wizard_permissions_root_msg1">可选择授予 Orbot “Superuser”访问权限,以便启用高级功能,例如透明代理。</string>
+  <string name="wizard_permissions_root_msg2">如果不愿授予 Orbot 该权限,请确保应用程序可使用 Orbot。</string>
+  <string name="wizard_permissions_no_root_msg">您的设备似乎尚未 root,或者未提供 root 或“超级用户”的访问权限。\n\n请改为尝试主屏幕的“应用”模式。</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_title">使用 Orbot 的应用程序</string>
+  <string name="wizard_tips_gibberbot">ChatSecure:具有 OTF 加密共的安全通讯应用</string>
+  <string name="wizard_tips_orweb">Orfox:隐私增强浏览器采用 Tor 工作</string>
+  <string name="wizard_tips_play">在 Google Play 商店查找所有 Guardian Project 的应用程序</string>
+  <string name="wizard_tips_fdroid">在 F-Droid 查找所有 Guardian Project 的应用程序</string>
+  <string name="wizard_tips_fdroid_org">在 https://f-droid.org 查找所有 Guardian Project 的应用程序</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">透明代理</string>
+  <string name="wizard_transproxy_msg">可使应用程序无需配置即可自动通过 Tor 连接网络。</string>
+  <string name="wizard_transproxy_hint">(如果不明白这里所说的问题,请选择该选项)</string>
+  <string name="wizard_transproxy_none">无</string>
+  <string name="pref_transparent_tethering_title">Tor 网络共享</string>
+  <string name="pref_transparent_tethering_summary">对 Wifi 和 USB 网络共享设备启用透明代理(需重新启动)</string>
+  <string name="button_grant_superuser">请求 Superuser 访问权限</string>
+  <string name="pref_select_apps">选择应用程序</string>
+  <string name="pref_select_apps_summary">选择通过 Tor 连接网络的应用程序</string>
+  <string name="pref_node_configuration">节点配置</string>
+  <string name="pref_node_configuration_summary">这些高级设置可降低你的匿名度</string>
+  <string name="pref_entrance_node">入口节点</string>
+  <string name="pref_entrance_node_summary">用于首次跳转的密钥指纹、昵称、国家与地址</string>
+  <string name="pref_entrance_node_dialog">输入入口节点</string>
+  <string name="pref_allow_background_starts_title">允许后台启动</string>
+  <string name="pref_allow_background_starts_summary">允许任何应用告知 Orbot 启动 Tor 及相关服务</string>
+  <string name="button_proxy_all">全部代理</string>
+  <string name="button_proxy_none">全不代理</string>
+  <string name="button_invert_selection">反选</string>
+  <string name="pref_proxy_title">出站网络代理(可选)</string>
+  <string name="pref_proxy_type_title">出站代理类型</string>
+  <string name="pref_proxy_type_summary">代理服务器使用的协议:HTTP、HTTPS、Socks4、Socks5</string>
+  <string name="pref_proxy_type_dialog">输入代理类型</string>
+  <string name="pref_proxy_host_title">出站代理主机</string>
+  <string name="pref_proxy_host_summary">代理服务器主机名</string>
+  <string name="pref_proxy_host_dialog">输入代理主机</string>
+  <string name="pref_proxy_port_title">出站代理端口</string>
+  <string name="pref_proxy_port_summary">代理服务器端口</string>
+  <string name="pref_proxy_port_dialog">输入代理端口</string>
+  <string name="pref_proxy_username_title">出站代理用户名</string>
+  <string name="pref_proxy_username_summary">代理用户名(可选)</string>
+  <string name="pref_proxy_username_dialog">请输入代理用户名</string>
+  <string name="pref_proxy_password_title">出站代理密码</string>
+  <string name="pref_proxy_password_summary">代理密码(可选)</string>
+  <string name="pref_proxy_password_dialog">请输入代理密码</string>
+  <string name="status">状态</string>
+  <string name="setting_up_full_transparent_proxying_">正在对所有应用程序进行透明代理设置...</string>
+  <string name="setting_up_app_based_transparent_proxying_">正在对所选应用程序进行透明代理设置...</string>
+  <string name="transparent_proxying_enabled">透明代理已启用</string>
+  <string name="transproxy_enabled_for_tethering_">已为网络共享激活 TransProxy !</string>
+  <string name="warning_error_starting_transparent_proxying_">警告:启动透明代理时发生错误!</string>
+  <string name="transproxy_rules_cleared">已清除 TransProxy 规则</string>
+  <string name="couldn_t_start_tor_process_">无法启动 Tor 进程:</string>
+  <string name="privoxy_is_running_on_port_">Polipo 正运行在端口:</string>
+  <string name="setting_up_port_based_transparent_proxying_">正在对基于端口的透明代理进行设置...</string>
+  <string name="bridge_error">网桥错误</string>
+  <string name="bridge_requires_ip">为了需使用网桥,必须至少输入一个网桥 IP 地址。</string>
+  <string name="send_email_for_bridges">如需获取网桥地址,请使用 gmail 发送电子邮件至 bridges at torproject.org 并在正文内填上“ get bridges”。</string>
+  <string name="error">错误</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">可访问地址设置导致异常!</string>
+  <string name="your_relay_settings_caused_an_exception_">中继设置导致异常!</string>
+  <string name="exit_nodes">出口节点</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">最后跳转的密钥指纹、昵称、国家与地址</string>
+  <string name="enter_exit_nodes">输入出口节点</string>
+  <string name="exclude_nodes">排除节点</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">排除的密钥指纹、昵称、国家与地址</string>
+  <string name="enter_exclude_nodes">输入排除节点</string>
+  <string name="strict_nodes">限制节点</string>
+  <string name="use_only_these_specified_nodes">仅使用这些指定节点</string>
+  <string name="bridges">网桥</string>
+  <string name="use_bridges">使用网桥</string>
+  <string name="bridges_obfuscated">混淆网桥</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">使用其他入口节点连接到 Tor 网络</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">已配置的网桥为混淆网桥时启用</string>
+  <string name="ip_address_and_port_of_bridges">网桥的 IP 地址和端口</string>
+  <string name="enter_bridge_addresses">输入网桥地址</string>
+  <string name="relays">中继</string>
+  <string name="relaying">中继转发</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">仅设置被设置为非出口中继</string>
+  <string name="relay_port">中继端口</string>
+  <string name="listening_port_for_your_tor_relay">Tor 中继的侦听端口</string>
+  <string name="enter_or_port">输入 OR 端口</string>
+  <string name="relay_nickname">中继昵称</string>
+  <string name="the_nickname_for_your_tor_relay">Tor 中继昵称</string>
+  <string name="enter_a_custom_relay_nickname">输入自定义中继昵称</string>
+  <string name="reachable_addresses">可访问地址</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">在具有限制策略防火墙内,作为客户端运行</string>
+  <string name="reachable_ports">可访问端口</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">防火墙限定的可访问端口</string>
+  <string name="enter_ports">输入端口</string>
+  <string name="enable_hidden_services">隐藏服务主机</string>
+  <string name="run_servers_accessible_via_the_tor_network">允许设备上的服务器可通过 Tor 网络访问</string>
+  <string name="enter_localhost_ports_for_hidden_services">输入隐藏服务的本地主机端口</string>
+  <string name="hidden_service_ports">隐藏服务端口</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">隐藏服务的地址(自动生成)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">启用调试日志输出(必须使用 adb 或 aLongCat 查看)</string>
+  <string name="project_home">项目主页(s):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">Tor 许可证</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">第三方软件:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">应用程序试图打开隐藏服务主机端口 %S 连接 Tor 网络。对于可信应用这是安全的。</string>
+  <string name="found_existing_tor_process">发现当前已存在 Tor 进程...</string>
+  <string name="something_bad_happened">发生错误,请检查日志</string>
+  <string name="hidden_service_on">隐藏服务位于:</string>
+  <string name="unable_to_read_hidden_service_name">无法读取隐藏服务名称</string>
+  <string name="unable_to_start_tor">无法启动 Tor:</string>
+  <string name="unable_to_reset_tor">重新启动您的设备,无法重置 Tor!</string>
+  <string name="pref_use_sys_iptables_title">使用默认 iptables </string>
+  <string name="pref_use_sys_iptables_summary">使用内置的 iptables 程序替代 Orbot 绑定的 iptables </string>
+  <string name="error_installing_binares">无法安装或更新 Tor 程序。</string>
+  <string name="pref_use_persistent_notifications">Orbot 连接后始终在通知栏显示图标</string>
+  <string name="pref_use_persistent_notifications_title">始终显示通知</string>
+  <string name="pref_use_expanded_notifications">显示扩展的通知,有关 Tor 出口的国家和 IP</string>
+  <string name="pref_use_expanded_notifications_title">扩展的通知</string>
+  <string name="notification_using_bridges">已启用网桥!</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">语言</string>
+  <string name="set_locale_summary">选择 Orbot 的区域设置与语言</string>
+  <string name="wizard_locale_title">选择语言</string>
+  <string name="wizard_locale_msg">保持默认或切换为当前所用语言</string>
+  <string name="powered_by">由 Tor 提供</string>
+  <string name="btn_save_settings">保存设置</string>
+  <string name="no_internet_connection_tor">没有互联网连接;Tor 处于待机状态…</string>
+  <string name="bandwidth_">宽带速度:</string>
+  <string name="down">下行</string>
+  <string name="up">上行</string>
+  <string name="pref_disable_network_title">无网络自动休眠</string>
+  <string name="pref_disable_network_summary">没有网络连接时,暂时停用 Tor</string>
+  <string name="newnym">已切换为新的 Tor 标识!</string>
+  <string name="menu_verify_browser">浏览器</string>
+  <string name="menu_use_chatsecure">使用 ChatSecure</string>
+  <string name="permission_manage_tor_label">管理 Tor</string>
+  <string name="permission_manage_tor_description">启用该应用可对 Tor 服务进行控制</string>
+  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">似乎您还没有安装 Orfox。是否需要帮助,或者我们应该打开浏览器?</string>
+  <string name="install_apps_">安装应用?</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">没有网络连接;让 Tor 进入睡眠…</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">网络连接良好。正在唤醒 Tor...</string>
+  <string name="updating_settings_in_tor_service">正在更新 Tor 服务中的设置</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Tor 提供其 SOCKS 代理的端口 (默认: 9050, 0 禁用)</string>
+  <string name="pref_socks_dialog">SOCKS 端口配置</string>
+  <string name="pref_transport_title">Tor 透明代理端口</string>
+  <string name="pref_transport_summary">Tor 提供透明代理的端口 (默认: 9040, 0 禁用)</string>
+  <string name="pref_transport_dialog">透明代理配置</string>
+  <string name="pref_dnsport_title">Tor DNS 端口</string>
+  <string name="pref_dnsport_summary">Tor 提供 DNS 的端口 (默认: 5400, 0 禁用)</string>
+  <string name="pref_dnsport_dialog">DNS 端口配置</string>
+  <string name="pref_torrc_title">Torrc 自定义配置</string>
+  <string name="pref_torrc_summary">仅供专家:直接输入 torrc 配置行</string>
+  <string name="pref_torrc_dialog">自定义 Torrc</string>
+  <string name="wizard_tips_martus">Mobile Martus - 美国人权文件 App</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>
+  <string name="pref_transproxy_refresh_title">透明代理自动刷新</string>
+  <string name="pref_transproxy_refresh_summary">在网络状态改变时重新应用透明代理规则</string>
+  <string name="pref_transproxy_flush_title">透明代理强制移除</string>
+  <string name="pref_transproxy_flush_summary">点按这里立即刷新所有透明代理的网络规则</string>
+  <string name="transparent_proxy_rules_flushed_">透明代理规则已刷新!</string>
+  <string name="you_do_not_have_root_access_enabled">您还没有 ROOT 访问权限</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">您可能需要停止并重新启动 Orbot 才能使设置更改生效。</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="bridges_updated">网桥已更新</string>
+  <string name="restart_orbot_to_use_this_bridge_">请重启 Orbot 以使变更生效</string>
+  <string name="menu_qr">QR码</string>
+  <string name="bridge_mode">网桥模式</string>
+  <string name="get_bridges_email">电子邮件</string>
+  <string name="get_bridges_web">网页</string>
+  <string name="activate">激活</string>
+  <string name="apps_mode">应用 VPN 模式</string>
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">通过开启VPN功能,您可以让您设备上全部的应用程序使用Tor网络。
+警告!!!
+这是一项实验性的功能。在某些情况下,它可能停止或不能自动启动。它不应用于保持匿名,仅用于穿透防火墙和连接过滤系统。</string>
+  <string name="send_email">发送电子邮件</string>
+  <string name="install_orweb">安装 Orfox</string>
+  <string name="standard_browser">标准版浏览器</string>
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">注意:只有标准的 Tor 网桥可以在 Intel X86/ATOM 设备上工作</string>
+  <string name="vpn_default_world">世界</string>
+</resources>
diff --git a/orbotservice/src/main/res/values-zh-rTW/strings.xml b/orbotservice/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..b255c75
--- /dev/null
+++ b/orbotservice/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot是一款免費的網絡代理應用程式,用來保護其他應用程式的上網安全。
+Orbot使用Tor在全球一系列的電腦間跳躍,以便隱藏網路流量並加密。Tor是個免費軟體也是個開放網路,能幫您抵禦流量分析。它是某一種網路監控,牽涉到個人的自由與隱私、商業部分的機密關係和活動、甚至國家安全。</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">開始和停止 Tor</string>
+  <string name="tor_proxy_service_process">tor 代理服務</string>
+  <string name="status_starting_up">Orbot 正在啟動中...</string>
+  <string name="status_activated">已連線至 Tor 網路</string>
+  <string name="status_disabled">Orbot 已停用</string>
+  <string name="status_shutting_down">Tor服務 正在關閉</string>
+  <string name="tor_process_starting">啟動Tor 用戶端...</string>
+  <string name="tor_process_complete">完成。</string>
+  <string name="tor_process_waiting">等待。</string>
+  <string name="not_anonymous_yet">警告:您的網路尚未匿名!請設定您的應用程式使用HTTP 代理伺服器 127.0.0.1:8118 或 SOCKS4A 或 SOCKS5 代理伺服器 127.0.0.1:9050</string>
+  <string name="menu_home">首頁</string>
+  <string name="menu_browse">瀏覽</string>
+  <string name="menu_settings">設定</string>
+  <string name="menu_log">記錄檔</string>
+  <string name="menu_info">說明</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">開始</string>
+  <string name="menu_stop">停止</string>
+  <string name="menu_about">關於</string>
+  <string name="menu_promo_apps">取得應用程式…</string>
+  <string name="main_layout_download">下載</string>
+  <string name="main_layout_upload">上傳</string>
+  <string name="button_help">說明</string>
+  <string name="button_close">關閉</string>
+  <string name="button_about">關於</string>
+  <string name="button_clear_log">清除記錄檔</string>
+  <string name="menu_verify">檢查</string>
+  <string name="menu_exit">離開</string>
+  <string name="menu_scan">掃描連接橋QR</string>
+  <string name="menu_share_bridge">分享連接橋QR</string>
+  <string name="press_to_start">- 請長按以開始 - </string>
+  <string name="pref_trans_proxy_group">通透式代理伺服器(需要 Root)</string>
+  <string name="pref_trans_proxy_title">通透式代理伺服器</string>
+  <string name="pref_trans_proxy_summary">自動啟動 Tor於應用程式</string>
+  <string name="pref_transparent_all_title">Tor Everything</string>
+  <string name="pref_transparent_all_summary">所有應用程式皆透過Tor 代理伺服器</string>
+  <string name="pref_transparent_port_fallback_title">備用連接埠代理</string>
+  <string name="pref_transparent_port_fallback_summary">警告: 避免常用的埠口(80、443等等)。在「所有」或是「App」模式都失效的時候*才使用*。</string>
+  <string name="pref_transparent_port_title">埠清單</string>
+  <string name="pref_transparent_port_dialog">輸入代理埠</string>
+  <string name="pref_has_root">請求 Root 存取權</string>
+  <string name="pref_has_root_summary">爲通透式代理請求 Root 存取權</string>
+  <string name="status_install_success">Tor 二進制檔案安裝成功!</string>
+  <string name="title_error">應用程式錯誤</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">關於 Orbot</string>
+  <string name="btn_next">前進</string>
+  <string name="btn_back">返回</string>
+  <string name="btn_finish">結束</string>
+  <string name="btn_okay">確定</string>
+  <string name="btn_cancel">取消</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Orbot 的一些詳細資料</string>
+  <string name="wizard_details_msg">Orbot是個開源的應用程式,包含了Tor,LibEvent和Polipo。它提供了本地HTTP代理 (8118)和SOCKS代理 (9050)以進入Tor網路。Orbot也能夠在已Root的裝置上,以Tor傳送所有的網路流量。</string>
+  <string name="wizard_permissions_root">已取得權限</string>
+  <string name="wizard_permissions_stock">Orbot 權限</string>
+  <string name="wizard_configure">組態 Tor 網路</string>
+  <string name="wizard_configure_all">所有應用程式都透過 Tor 代理</string>
+  <string name="wizard_tips_duckgo">DuckDuckGo 搜尋引擎應用程式</string>
+  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
+  <string name="wizard_proxy_help_info">代理伺服器設定</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">一般</string>
+  <string name="pref_start_boot_summary">當你的 Android  裝置啟動時自動開啟 Orbot 並連接 Tor 網路</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <string name="wizard_warning_title">警告</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">權限</string>
+  <!--TipsAndTricks screen-->
+  <string name="wizard_tips_play">在 Google Play 尋找所有的 Guardian Project 應用程式</string>
+  <!--Transparent Proxy screen-->
+  <string name="wizard_transproxy_title">通透式代理</string>
+  <string name="wizard_transproxy_none">無</string>
+  <string name="pref_select_apps">選擇應用程式</string>
+  <string name="button_invert_selection">反向選擇</string>
+  <string name="status">狀態</string>
+  <string name="error">錯誤</string>
+  <string name="enter_ports">輸入埠</string>
+  <string name="project_home">專案首頁:</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">第三方軟體:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="default_bridges"></string>
+  <string name="set_locale_title">語言</string>
+  <string name="wizard_locale_title">選擇語言</string>
+  <string name="btn_save_settings">儲存設定</string>
+  <string name="menu_verify_browser">瀏覽器</string>
+  <string name="permission_manage_tor_label">管理 Tor</string>
+  <string name="install_apps_">安裝應用程式?</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_dnsport_title">Tor DNS 埠</string>
+  <string name="menu_vpn">VPN</string>
+  <string name="kbps">kbps</string>
+  <string name="mbps">mbps</string>
+  <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="menu_qr">QR 碼</string>
+  <string name="send_email">寄送電子信件</string>
+  <string name="standard_browser">標準版瀏覽器</string>
+  <string name="vpn_default_world">世界</string>
+</resources>
diff --git a/orbotservice/src/main/res/values/arrays.xml b/orbotservice/src/main/res/values/arrays.xml
new file mode 100644
index 0000000..30d20c1
--- /dev/null
+++ b/orbotservice/src/main/res/values/arrays.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+
+	<string-array name="bridge_options">
+	    <item>Obfs4 (Best)</item>
+	    <item>Obfs3</item>
+	    <item>ScrambleSuit</item>
+	    <item>Tunnel through Azure</item>
+	    <item>Tunnel through Amazon</item>
+	    <item>Tunnel through Google</item>
+	    <item>Get New Bridges</item>
+	    <item></item>
+	</string-array>
+    
+</resources>
diff --git a/orbotservice/src/main/res/values/colors.xml b/orbotservice/src/main/res/values/colors.xml
new file mode 100644
index 0000000..19e06e7
--- /dev/null
+++ b/orbotservice/src/main/res/values/colors.xml
@@ -0,0 +1,8 @@
+
+    <resources>
+        <color name="panel_background">#ffffff</color>
+        <color name="panel_background_dark">#efefef</color>
+        <color name="panel_background_main">#efefef</color>
+        <color name="bright_green">#ccff2a</color>
+        <color name="dark_green">#669901</color>
+    </resources>
diff --git a/orbotservice/src/main/res/values/dimens.xml b/orbotservice/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..f96195c
--- /dev/null
+++ b/orbotservice/src/main/res/values/dimens.xml
@@ -0,0 +1,361 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/assets/res/any/dimens.xml
+**
+** Copyright 2006, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+    <!-- The width that is used when creating thumbnails of applications. -->
+    <dimen name="thumbnail_width">164dp</dimen>
+    <!-- The height that is used when creating thumbnails of applications. -->
+    <dimen name="thumbnail_height">145dp</dimen>
+    <!-- The standard size (both width and height) of an application icon that
+         will be displayed in the app launcher and elsewhere. -->
+    <dimen name="app_icon_size">48dip</dimen>
+    <!-- The maximum number of action buttons that should be permitted within
+         an action bar/action mode. This will be used to determine how many
+         showAsAction="ifRoom" items can fit. "always" items can override this. -->
+    <integer name="max_action_buttons">2</integer>
+    <dimen name="toast_y_offset">64dip</dimen>
+    <!-- Height of the status bar -->
+    <dimen name="status_bar_height">25dip</dimen>
+    <!-- Height of the bottom navigation / system bar. -->
+    <dimen name="navigation_bar_height">48dp</dimen>
+    <!-- Height of the bottom navigation bar in portrait; often the same as @dimen/navigation_bar_height -->
+    <dimen name="navigation_bar_height_landscape">48dp</dimen>
+    <!-- Width of the navigation bar when it is placed vertically on the screen -->
+    <dimen name="navigation_bar_width">42dp</dimen>
+    <!-- Height of notification icons in the status bar -->
+    <dimen name="status_bar_icon_size">24dip</dimen>
+    <!-- Size of the giant number (unread count) in the notifications -->
+    <dimen name="status_bar_content_number_size">48sp</dimen>
+    <!-- Height of the system bar (combined status & navigation); used by
+         SystemUI internally, not respected by the window manager. -->
+    <dimen name="system_bar_height">@dimen/navigation_bar_height</dimen>
+    <!-- Height of notification icons in the system bar -->
+    <dimen name="system_bar_icon_size">32dip</dimen>
+    <!-- Margin at the edge of the screen to ignore touch events for in the windowshade. -->
+    <dimen name="status_bar_edge_ignore">5dp</dimen>
+
+    <!-- Minimum size of the fastscroll overlay -->
+    <dimen name="fastscroll_overlay_size">104dp</dimen>
+    <!-- Text size of the fastscroll overlay -->
+    <dimen name="fastscroll_overlay_text_size">52sp</dimen>
+    <!-- Padding of the fastscroll overlay -->
+    <dimen name="fastscroll_overlay_padding">16dp</dimen>
+    <!-- Width of the fastscroll thumb -->
+    <dimen name="fastscroll_thumb_width">64dp</dimen>
+    <!-- Height of the fastscroll thumb -->
+    <dimen name="fastscroll_thumb_height">52dp</dimen>
+    <!-- Min width for a tablet device -->
+    <dimen name="min_xlarge_screen_width">800dp</dimen>
+
+    <!-- Default height of a key in the password keyboard for alpha (used by keyguard) -->
+    <dimen name="password_keyboard_key_height_alpha">56dip</dimen>
+    <!-- Default height of a key in the password keyboard for numeric (used by keyguard) -->
+    <dimen name="password_keyboard_key_height_numeric">56dip</dimen>
+    <!-- Default correction for the space key in the password keyboard  (used by keyguard) -->
+    <dimen name="password_keyboard_spacebar_vertical_correction">4dip</dimen>
+    <!-- Default horizontal gap between keys in the password keyboard (used by keyguard) -->
+    <dimen name="password_keyboard_horizontalGap">3dip</dimen>
+    <!-- Default vertical gap between keys in the password keyboard (used by keyguard) -->
+    <dimen name="password_keyboard_verticalGap">9dip</dimen>
+
+    <!-- Size of lockscreen outerring on unsecure unlock LockScreen -->
+    <dimen name="keyguard_lockscreen_outerring_diameter">270dp</dimen>
+
+    <!-- Default target placement radius for GlowPadView. Should be 1/2 of outerring diameter. -->
+    <dimen name="glowpadview_target_placement_radius">135dip</dimen>
+
+    <!-- Default glow radius for GlowPadView -->
+    <dimen name="glowpadview_glow_radius">75dip</dimen>
+
+    <!-- Default distance beyond which GlowPadView snaps to the matching target -->
+    <dimen name="glowpadview_snap_margin">40dip</dimen>
+
+    <!-- Default distance from each snap target that GlowPadView considers a "hit" -->
+    <dimen name="glowpadview_inner_radius">15dip</dimen>
+
+    <!-- Preference activity side margins -->
+    <dimen name="preference_screen_side_margin">0dp</dimen>
+    <!-- Preference activity side margins negative-->
+    <dimen name="preference_screen_side_margin_negative">0dp</dimen>
+    <!-- Preference activity top margin -->
+    <dimen name="preference_screen_top_margin">0dp</dimen>
+    <!-- Preference activity bottom margin -->
+    <dimen name="preference_screen_bottom_margin">0dp</dimen>
+    <!-- Preference widget area width (to the left of the text) -->
+    <dimen name="preference_widget_width">48dp</dimen>
+    <!-- Preference fragment padding, bottom -->
+    <dimen name="preference_fragment_padding_bottom">0dp</dimen>
+    <!-- Preference fragment padding, sides -->
+    <dimen name="preference_fragment_padding_side">16dp</dimen>
+    <!-- Weight of the left pane in a multi-pane preference layout. -->
+    <integer name="preferences_left_pane_weight">4</integer>
+    <!-- Weight of the right pane in a multi-pane preference layout. So the split is 40:60 -->
+    <integer name="preferences_right_pane_weight">6</integer>
+    <!-- Padding to the left of the preference panel breadcrumb -->
+    <dimen name="preference_breadcrumb_paddingLeft">0dp</dimen>
+    <!-- Padding to the right of the preference panel breadcrumb -->
+    <dimen name="preference_breadcrumb_paddingRight">0dp</dimen>
+    <!-- Minimum space to allocate to the left of a preference item for an icon.
+        This helps in aligning titles when some items have icons and some don't. When space is
+        at a premium, we don't pre-allocate any space. -->
+    <dimen name="preference_icon_minWidth">0dp</dimen>
+    <!-- The platform's desired minimum size for a dialog's width when it
+         is along the major axis (that is the screen is landscape).  This may
+         be either a fraction or a dimension. -->
+    <item type="dimen" name="dialog_min_width_major">65%</item>
+
+    <!-- The platform's desired fixed width for a dialog along the major axis
+         (the screen is in landscape). This may be either a fraction or a dimension.-->
+    <item type="dimen" name="dialog_fixed_width_major">320dp</item>
+    <!-- The platform's desired fixed width for a dialog along the minor axis
+         (the screen is in portrait). This may be either a fraction or a dimension.-->
+    <item type="dimen" name="dialog_fixed_width_minor">320dp</item>
+    <!-- The platform's desired fixed height for a dialog along the major axis
+         (the screen is in portrait). This may be either a fraction or a dimension.-->
+    <item type="dimen" name="dialog_fixed_height_major">80%</item>
+    <!-- The platform's desired fixed height for a dialog along the minor axis
+         (the screen is in landscape). This may be either a fraction or a dimension.-->
+    <item type="dimen" name="dialog_fixed_height_minor">100%</item>
+
+    <!-- Preference activity, vertical padding for the header list -->
+    <dimen name="preference_screen_header_vertical_padding">0dp</dimen>
+
+    <dimen name="preference_screen_header_padding_side">16dip</dimen>
+    <integer name="preference_screen_header_scrollbarStyle">0x02000000</integer> <!-- outsideOverlay -->
+
+    <integer name="preference_fragment_scrollbarStyle">0x02000000</integer> <!-- outsideOverlay -->
+
+    <dimen name="preference_item_padding_side">8dip</dimen>
+    <dimen name="preference_item_padding_inner">8dip</dimen>
+    <dimen name="preference_child_padding_side">16dip</dimen>
+
+    <!-- The platform's desired minimum size for a dialog's width when it
+         is along the minor axis (that is the screen is portrait).  This may
+         be either a fraction or a dimension. -->
+    <item type="dimen" name="dialog_min_width_minor">95%</item>
+
+    <!-- The width of the big icons in notifications. -->
+    <dimen name="notification_large_icon_width">64dp</dimen>
+    <!-- The width of the big icons in notifications. -->
+    <dimen name="notification_large_icon_height">64dp</dimen>
+
+    <!-- Minimum width of the search view text entry area. -->
+    <dimen name="search_view_text_min_width">160dip</dimen>
+
+    <!-- Preferred width of the search view. -->
+    <dimen name="search_view_preferred_width">320dip</dimen>
+
+    <!-- Dialog title height -->
+    <dimen name="alert_dialog_title_height">64dip</dimen>
+    <!-- Dialog button bar height -->
+    <dimen name="alert_dialog_button_bar_height">48dip</dimen>
+
+    <!-- Default height of an action bar. -->
+    <dimen name="action_bar_default_height">48dip</dimen>
+    <!-- Vertical padding around action bar icons. -->
+    <dimen name="action_bar_icon_vertical_padding">8dip</dimen>
+    <!-- Text size for action bar titles -->
+    <dimen name="action_bar_title_text_size">18dp</dimen>
+    <!-- Text size for action bar subtitles -->
+    <dimen name="action_bar_subtitle_text_size">14dp</dimen>
+    <!-- Top margin for action bar subtitles -->
+    <dimen name="action_bar_subtitle_top_margin">-3dp</dimen>
+    <!-- Bottom margin for action bar subtitles -->
+    <dimen name="action_bar_subtitle_bottom_margin">5dip</dimen>
+
+    <!-- Size of clock font in LockScreen on Unsecure unlock screen. -->
+    <dimen name="keyguard_lockscreen_clock_font_size">80dip</dimen>
+
+    <!-- Size of status line font on Unsecure unlock LockScreen. -->
+    <dimen name="keyguard_lockscreen_status_line_font_size">14dip</dimen>
+
+    <!-- Size of right margin on Unsecure unlock LockScreen -->
+    <dimen name="keyguard_lockscreen_status_line_font_right_margin">42dip</dimen>
+
+    <!-- Size of top margin on Clock font to edge on unlock LockScreen -->
+    <dimen name="keyguard_lockscreen_status_line_clockfont_top_margin">22dip</dimen>
+
+    <!-- Size of top margin on Clock font to edge on unlock LockScreen -->
+    <dimen name="keyguard_lockscreen_status_line_clockfont_bottom_margin">12dip</dimen>
+
+    <!-- Padding on left margin of PIN text entry field to center it when del button is showing -->
+    <dimen name="keyguard_lockscreen_pin_margin_left">40dip</dimen>
+
+    <!-- Height of FaceUnlock view in keyguard -->
+    <dimen name="face_unlock_height">330dip</dimen>
+
+    <!-- Minimum popup width for selecting an activity in ActivityChooserDialog/ActivityChooserView. -->
+    <dimen name="activity_chooser_popup_min_width">200dip</dimen>
+
+    <!-- The default gap between components in a layout. -->
+    <dimen name="default_gap">8dip</dimen>
+
+    <!-- Text padding for dropdown items -->
+    <dimen name="dropdownitem_text_padding_left">8dip</dimen>
+
+    <!-- Text padding for dropdown items -->
+    <dimen name="dropdownitem_text_padding_right">8dip</dimen>
+
+    <!-- Width of the icon in a dropdown list -->
+    <dimen name="dropdownitem_icon_width">32dip</dimen>
+
+    <!-- Default width for a textview error popup -->
+    <dimen name="textview_error_popup_default_width">240dip</dimen>
+
+    <!-- Volume panel y offset -->
+    <dimen name="volume_panel_top">80dp</dimen>
+
+    <!-- Default padding to apply to AppWidgetHostViews containing widgets targeting API level 14 and up. -->
+    <dimen name="default_app_widget_padding_left">8dp</dimen>
+    <dimen name="default_app_widget_padding_top">8dp</dimen>
+    <dimen name="default_app_widget_padding_right">8dp</dimen>
+    <dimen name="default_app_widget_padding_bottom">8dp</dimen>
+
+    <!-- Minimum width for an action button in the menu area of an action bar -->
+    <dimen name="action_button_min_width">56dip</dimen>
+
+    <!-- Maximum height for a stacked tab bar as part of an action bar -->
+    <dimen name="action_bar_stacked_max_height">48dp</dimen>
+
+    <!-- Maximum width for a stacked action bar tab. This prevents
+         action bar tabs from becoming too wide on a wide screen when only
+         a few are present. -->
+    <dimen name="action_bar_stacked_tab_max_width">180dp</dimen>
+
+    <!-- Size of notification text (see TextAppearance.StatusBar.EventContent) -->
+    <dimen name="notification_text_size">14dp</dimen>
+    <!-- Size of notification text titles (see TextAppearance.StatusBar.EventContent.Title) -->
+    <dimen name="notification_title_text_size">18dp</dimen>
+    <!-- Size of smaller notification text (see TextAppearance.StatusBar.EventContent.Line2, Info, Time) -->
+    <dimen name="notification_subtext_size">12dp</dimen>
+
+    <!-- Keyguard dimensions -->
+    <!-- TEMP -->
+    <dimen name="kg_security_panel_height">600dp</dimen>
+
+    <!-- Height of security view in keyguard. -->
+    <dimen name="kg_security_view_height">480dp</dimen>
+
+    <!-- Width of widget view in keyguard. -->
+    <dimen name="kg_widget_view_width">0dp</dimen>
+
+    <!-- Height of widget view in keyguard. -->
+    <dimen name="kg_widget_view_height">0dp</dimen>
+
+    <!-- Size of the clock font in keyguard's status view -->
+    <dimen name="kg_status_clock_font_size">75dp</dimen>
+
+    <!-- Size of the date font in keyguard's status view  -->
+    <dimen name="kg_status_date_font_size">15dp</dimen>
+
+    <!-- Size of the generic status lines keyguard's status view  -->
+    <dimen name="kg_status_line_font_size">13dp</dimen>
+
+    <!-- Size of margin on the right of keyguard's status view -->
+    <dimen name="kg_status_line_font_right_margin">16dp</dimen>
+
+    <!-- Top margin for the clock view -->
+    <dimen name="kg_clock_top_margin">-16dp</dimen>
+
+    <!-- Horizontal gap between keys in PIN and SIM PIN numeric keyboards in keyguard -->
+    <dimen name="kg_key_horizontal_gap">0dp</dimen>
+
+    <!-- Horizontal gap between keys in PIN and SIM PIN numeric keyboards in keyguard -->
+    <dimen name="kg_key_vertical_gap">0dp</dimen>
+
+    <!-- Horizontal gap between keys in PIN and SIM PIN numeric keyboards in keyguard -->
+    <dimen name="kg_pin_key_height">60dp</dimen>
+
+    <!-- Space reserved at the bottom of secure views (pin/pattern/password/SIM pin/SIM puk) -->
+    <dimen name="kg_secure_padding_height">46dp</dimen>
+
+    <!-- The height of the runway lights strip -->
+    <dimen name="kg_runway_lights_height">7dp</dimen>
+
+    <!-- The height of the runway lights strip -->
+    <dimen name="kg_runway_lights_vertical_padding">2dp</dimen>
+
+    <!-- Horizontal padding for the widget pager -->
+    <dimen name="kg_widget_pager_horizontal_padding">16dp</dimen>
+
+    <!-- Top padding for the widget pager -->
+    <dimen name="kg_widget_pager_top_padding">0dp</dimen>
+
+    <!-- Bottom padding for the widget pager -->
+    <dimen name="kg_widget_pager_bottom_padding">64dp</dimen>
+
+    <!-- Top margin for the runway lights. We add a negative margin in large
+        devices to account for the widget pager padding -->
+    <dimen name="kg_runway_lights_top_margin">0dp</dimen>
+
+    <!-- Touch slop for the global toggle accessibility gesture -->
+    <dimen name="accessibility_touch_slop">80dip</dimen>
+
+    <!-- Width of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
+    <dimen name="keyguard_security_width">320dp</dimen>
+
+    <!-- Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
+    <dimen name="keyguard_security_height">400dp</dimen>
+
+    <!-- Margin around the various security views -->
+    <dimen name="keyguard_security_view_margin">8dp</dimen>
+
+    <!-- Margin around the various security views -->
+    <dimen name="keyguard_muliuser_selector_margin">8dp</dimen>
+
+    <!-- Stroke width of the frame for the circular avatars. -->
+    <dimen name="keyguard_avatar_frame_stroke_width">2dp</dimen>
+
+    <!-- Shadow radius under the frame for the circular avatars. -->
+    <dimen name="keyguard_avatar_frame_shadow_radius">1dp</dimen>
+
+    <!-- Size of the avator on hte multiuser lockscreen. -->
+    <dimen name="keyguard_avatar_size">66dp</dimen>
+
+    <!-- Size of the text under the avator on the multiuser lockscreen. -->
+    <dimen name="keyguard_avatar_name_size">10sp</dimen>
+
+    <!-- Size of the region along the edge of the screen that will accept
+         swipes to scroll the widget area. -->
+    <dimen name="kg_edge_swipe_region_size">24dp</dimen>
+
+    <!-- If the height if keyguard drops below this threshold (most likely
+    due to the appearance of the IME), then drop the multiuser selector. -->
+    <dimen name="kg_squashed_layout_threshold">600dp</dimen>
+
+    <!-- The height of widgets which do not support vertical resizing. This is only
+    used on tablets; on phones, this size is determined by the space left by the
+    security mode. -->
+    <dimen name="kg_small_widget_height">160dp</dimen>
+
+    <!-- Rounded corner radius for video subtitles. -->
+    <dimen name="subtitle_corner_radius">2dp</dimen>
+
+    <!-- Shadow radius for video subtitles. -->
+    <dimen name="subtitle_shadow_radius">2dp</dimen>
+
+    <!-- Shadow offset for video subtitles. -->
+    <dimen name="subtitle_shadow_offset">2dp</dimen>
+
+    <!-- Outline width for video subtitles. -->
+    <dimen name="subtitle_outline_width">2dp</dimen>
+
+    <!-- width of ImmersiveModeConfirmation (-1 for match_parent) -->
+    <dimen name="immersive_mode_cling_width">-1px</dimen>
+</resources>
diff --git a/orbotservice/src/main/res/values/pdnsd.xml b/orbotservice/src/main/res/values/pdnsd.xml
new file mode 100644
index 0000000..522f765
--- /dev/null
+++ b/orbotservice/src/main/res/values/pdnsd.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="pdnsd_conf" formatted="false">
+global {
+	perm_cache=0;
+	cache_dir="/data/data/org.torproject.android/app_bin";
+	server_port = 8091;
+	server_ip = 0.0.0.0;
+	query_method=udp_only;
+	min_ttl=15m;
+	max_ttl=1w;
+	timeout=10;
+	daemon=on;
+	pid_file="/data/data/org.torproject.android/app_bin/pdnsd.pid";
+
+}
+
+server {
+	label= "upstream";
+	ip = %s;
+	port = %d;
+	uptest = none;
+}
+
+rr {
+	name=localhost;
+	reverse=on;
+	a=127.0.0.1;
+	owner=localhost;
+	soa=localhost,root.localhost,42,86400,900,86400,86400;
+}
+	</string>
+</resources>
diff --git a/orbotservice/src/main/res/values/strings.xml b/orbotservice/src/main/res/values/strings.xml
new file mode 100644
index 0000000..59fcb77
--- /dev/null
+++ b/orbotservice/src/main/res/values/strings.xml
@@ -0,0 +1,339 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">start and stop Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot is starting…</string>
+  <string name="status_activated">Connected to the Tor network</string>
+  <string name="status_disabled">Orbot is deactivated</string>
+  <string name="status_shutting_down">TorService is shutting down</string>
+  <string name="tor_process_starting">Starting Tor client…</string>
+  <string name="tor_process_complete">complete.</string>
+  <string name="tor_process_waiting">waiting.</string>
+  <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string>
+  <string name="menu_home">Home</string>
+  <string name="menu_browse">Browse</string>
+  <string name="menu_settings">Settings</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Help</string>
+  <string name="menu_apps">VPN</string>
+  <string name="menu_start">Start</string>
+  <string name="menu_stop">Stop</string>
+  <string name="menu_about">About</string>
+  <string name="menu_promo_apps">Get apps…</string>
+  <string name="main_layout_download">Download</string>
+  <string name="main_layout_upload">Upload</string>
+  <string name="button_help">Help</string>
+  <string name="button_close">Close</string>
+  <string name="button_about">About</string>
+  <string name="button_clear_log">Clear Log</string>
+  <string name="menu_verify">Check</string>
+  <string name="menu_exit">Exit</string>
+  <string name="menu_scan">Scan BridgeQR</string>
+  <string name="menu_share_bridge">Share BridgeQR</string>
+  <string name="press_to_start">- long press to start -</string>
+  <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string>
+  <string name="pref_trans_proxy_title">Transparent Proxying</string>
+  <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string>
+  <string name="pref_transparent_all_title">Tor Everything</string>
+  <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string>
+  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
+  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
+  <string name="pref_transparent_port_title">Port List</string>
+  <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
+  <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
+  <string name="pref_has_root">Request Root Access</string>
+  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
+  <string name="status_install_success">Tor binaries successfully installed!</string>
+  <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants at torproject.org</string>
+  <string name="title_error">Application Error</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">About Orbot</string>
+  <string name="btn_next">Next</string>
+  <string name="btn_back">Back</string>
+  <string name="btn_finish">Finish</string>
+  <string name="btn_okay">Okay</string>
+  <string name="btn_cancel">Cancel</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Some Orbot Details</string>
+  <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Polipo. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string>
+  <string name="wizard_permissions_root">Permission Granted</string>
+  <string name="wizard_permissions_stock">Orbot Permissions</string>
+  <string name="wizard_premissions_msg_root">Excellent! We\'ve detected that you have root permissions enabled for Orbot. We will use this power wisely.</string>
+  <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string>
+  <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string>
+  <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string>
+  <string name="wizard_permission_enable_root">Grant Root for Orbot</string>
+  <string name="wizard_configure">Configure Torification</string>
+  <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string>
+  <string name="wizard_configure_all">Proxy All Apps Through Tor</string>
+  <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string>
+  <string name="wizard_tips_tricks">Orbot-enabled Apps</string>
+  <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later on Google Play, at GuardianProject.info website or via F-Droid.org.</string>
+  <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="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="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>
+  <string name="wizard_final">Orbot is ready!</string>
+  <string name="wizard_final_msg">Millions of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens… and now you are ready to, as well!</string>
+  <string name="wizard_exit_at_first_screen_toast">Please configure Orbot before you can start using it!</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Browser\' button to test your connection. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help at guardianproject.info to learn more.</string>
+  <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
+  <string name="pref_hs_group">Hidden Service Hosting</string>
+  <string name="pref_general_group">General</string>
+  <string name="pref_start_boot_title">Start Orbot on Boot</string>
+  <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
+  <!--Warning screen-->
+  <string name="wizard_warning_title">Warning</string>
+  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
+  <!--Permissions screen-->
+  <string name="wizard_permissions_title">Permissions</string>
+  <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
+  <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
+  <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide root or \'Superuser\' access.\n\nPlease try the \'Apps\' mode on the main screen instead.</string>
+  <!--TipsAndTricks screen-->
+  <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="wizard_tips_orweb">Orfox: Privacy-enhanced browser that works through Tor</string>
+  <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string>
+  <string name="wizard_tips_fdroid">Find all Guardian Project apps on F-Droid</string>
+  <string name="wizard_tips_fdroid_org">Find all Guardian Project apps on https://f-droid.org</string>
+  <!--Transparent Proxy screen-->
+  <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>
+  <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
+  <string name="wizard_transproxy_none">None</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string>
+  <string name="button_grant_superuser">Request Superuser Access</string>
+  <string name="pref_select_apps">Select Apps</string>
+  <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
+  <string name="pref_node_configuration">Node Configuration</string>
+  <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string>
+  <string name="pref_entrance_node">Entrance Nodes</string>
+  <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
+  <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
+  <string name="pref_allow_background_starts_title">Allow Background Starts</string>
+  <string name="pref_allow_background_starts_summary">Let any app tell Orbot to start Tor and related services</string>
+  
+  <string name="button_proxy_all">Proxy All</string>
+  <string name="button_proxy_none">Proxy None</string>
+  <string name="button_invert_selection">Invert Selection</string>
+
+  <string name="pref_proxy_title">Outbound Network Proxy (Optional)</string>
+  
+  <string name="pref_proxy_type_title">Outbound Proxy Type</string>
+  <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Enter Proxy Type</string>
+  
+  <string name="pref_proxy_host_title">Outbound Proxy Host</string>
+  <string name="pref_proxy_host_summary">Proxy Server hostname</string>
+  <string name="pref_proxy_host_dialog">Enter Proxy Host</string>
+  
+  <string name="pref_proxy_port_title">Outbound Proxy Port</string>
+  <string name="pref_proxy_port_summary">Proxy Server port</string>
+  <string name="pref_proxy_port_dialog">Enter Proxy port</string>
+
+  <string name="pref_proxy_username_title">Outbound Proxy Username</string>
+  <string name="pref_proxy_username_summary">Proxy Username (Optional)</string>
+  <string name="pref_proxy_username_dialog">Enter Proxy Username</string>
+  
+  <string name="pref_proxy_password_title">Outbound Proxy Password</string>
+  <string name="pref_proxy_password_summary">Proxy Password (Optional)</string>
+  <string name="pref_proxy_password_dialog">Enter Proxy Password</string>
+  
+  
+  
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying…</string>
+  <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying…</string>
+  <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
+  <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
+  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
+  <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
+  <string name="privoxy_is_running_on_port_">Polipo is running on port: </string>
+  <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying…</string>
+  <string name="bridge_error">Bridge Error</string>
+  <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
+  <string name="send_email_for_bridges">Send an email to bridges at torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
+  <string name="error">Error</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
+  <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
+  <string name="exit_nodes">Exit Nodes</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
+  <string name="enter_exit_nodes">Enter Exit Nodes</string>
+  <string name="exclude_nodes">Exclude Nodes</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
+  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
+  <string name="strict_nodes">Strict Nodes</string>
+  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
+  <string name="bridges">Bridges</string>
+  <string name="use_bridges">Use Bridges</string>
+  <string name="bridges_obfuscated">Obfuscated Bridges</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string>
+  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string>
+  <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string>
+  <string name="enter_bridge_addresses">Enter Bridge Addresses</string>
+  <string name="relays">Relays</string>
+  <string name="relaying">Relaying</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string>
+  <string name="relay_port">Relay Port</string>
+  <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string>
+  <string name="enter_or_port">Enter OR port</string>
+  <string name="relay_nickname">Relay nickname</string>
+  <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string>
+  <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string>
+  <string name="reachable_addresses">Reachable Addresses</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string>
+  <string name="reachable_ports">Reachable ports</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string>
+  <string name="enter_ports">Enter ports</string>
+  <string name="enable_hidden_services">Hidden Service Hosting</string>
+  <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string>
+  <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string>
+  <string name="hidden_service_ports">Hidden Service Ports</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string>
+  <string name="project_home">Project Home(s): </string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">The Tor License</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">3rd-Party-Software: </string>
+  <string name="tor_version">Tor: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
+  <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string>
+  <string name="found_existing_tor_process">found existing Tor process…</string>
+  <string name="something_bad_happened">Something bad happened. Check the log</string>
+  <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>
+  
+  <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string>
+  
+  <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string>
+  <string name="pref_use_persistent_notifications_title">Always-On Notifications</string>
+  
+  <string name="pref_use_expanded_notifications">Show expanded notification with Tor exit country and IP</string>
+  <string name="pref_use_expanded_notifications_title">Expanded Notifications</string>
+  
+  <string name="notification_using_bridges">Bridges enabled!</string>
+  <string name="default_bridges"/>
+  <string name="set_locale_title">Language</string>
+  <string name="set_locale_summary">Choose the locale and language for Orbot</string>
+  <string name="wizard_locale_title">Choose Language</string>
+  <string name="wizard_locale_msg">Leave default or switch the current language</string>
+  <string name="powered_by">powered by Tor</string>
+  <string name="btn_save_settings">Save Settings</string>
+  <string name="no_internet_connection_tor">No internet connection; Tor is on standby…</string>
+  <string name="bandwidth_">Bandwidth:</string>
+  <string name="down">down</string>
+  <string name="up">up</string>
+  <string name="pref_disable_network_title">No Network Auto-Sleep</string>
+  <string name="pref_disable_network_summary">Put Tor to sleep when there is no internet available</string>
+  <string name="newnym">You\'ve switched to a new Tor identity!</string>
+  
+    <string name="menu_verify_browser">Browser</string>
+    <string name="menu_use_chatsecure">Use ChatSecure</string>
+
+    <string name="permission_manage_tor_label">Manage Tor</string>
+    <string name="permission_manage_tor_description">Enable this app to control the Tor service</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">It doesn\'t seem like you have Orfox installed. Want help with that, or should we just open the browser?</string>
+    <string name="install_apps_">Install apps?</string>
+    <string name="no_network_connectivity_putting_tor_to_sleep_">No network connectivity. Putting Tor to sleep…</string>
+    <string name="network_connectivity_is_good_waking_tor_up_">Network connectivity is good. Waking Tor up…</string>
+    <string name="updating_settings_in_tor_service">updating settings in Tor service</string>
+  
+    <string name="pref_socks_title">Tor SOCKS</string>
+    <string name="pref_socks_summary">Port that Tor offers its SOCKS proxy on (default: 9050 or 0 to disable)</string>
+    <string name="pref_socks_dialog">SOCKS Port Config</string>
+    
+    <string name="pref_transport_title">Tor TransProxy Port</string>
+    <string name="pref_transport_summary">Port that Tor offers its Transparent Proxy on (default: 9040 or 0 to disable)</string>
+    <string name="pref_transport_dialog">TransProxy Port Config</string>
+    
+    
+    <string name="pref_dnsport_title">Tor DNS Port</string>
+    <string name="pref_dnsport_summary">Port that Tor offers its DNS on (default: 5400 or 0 to disable)</string>
+    <string name="pref_dnsport_dialog">DNS Port Config</string>
+    
+    
+    <string name="pref_torrc_title">Torrc Custom Config</string>
+    <string name="pref_torrc_summary">EXPERTS ONLY: enter direct torrc config lines</string>
+    <string name="pref_torrc_dialog">Custom Torrc</string>
+    
+    <string name="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</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>
+  
+
+  <string name="pref_transproxy_refresh_title">Transproxy Auto-Refresh</string>
+  <string name="pref_transproxy_refresh_summary">Re-apply Transproxy rules when the network state changes</string>
+  
+  <string name="pref_transproxy_flush_title">Transproxy FORCE REMOVE</string>
+  <string name="pref_transproxy_flush_summary">Tap here to flush all transproxy network rules NOW</string>
+  <string name="transparent_proxy_rules_flushed_">Transparent proxy rules flushed!</string>
+  <string name="you_do_not_have_root_access_enabled">You do not have ROOT access enabled</string>
+  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">You may need to stop and start Orbot for settings change to be enabled.</string>
+  
+  <string name="menu_vpn">VPN</string>
+  
+  <string name="kbps">kbps</string>
+  
+  <string name="mbps">mbps</string>
+  
+  <string name="kb">KB</string>
+  
+  <string name="mb">MB</string>
+  
+  <string name="bridges_updated">Bridges Updated</string>
+  
+  <string name="restart_orbot_to_use_this_bridge_">Please restart Orbot to enable the changes</string>
+  
+  <string name="menu_qr">QR Codes</string>
+  
+  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">If your mobile network actively blocks Tor, you can use a Bridge to access the network. SELECT one of the bridge types above to enable bridges.</string>
+  
+  <string name="bridge_mode">Bridge Mode</string>
+  
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  
+  <string name="activate">Activate</string>
+  
+  <string name="apps_mode">Apps VPN Mode</string>
+  
+  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">You can enable all apps on your device to run through the Tor network using the VPN feature of Android.\n\n*WARNING* This is a new, experimental feature and in some cases may not start automatically, or may stop. It should NOT be used for anonymity, and ONLY used for getting through firewalls and filters.</string>
+  
+  <string name="send_email">Send Email</string>
+  
+  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">You can get a bridge address through email, the web or by scanning a bridge QR code. Select \'Email\' or \'Web\' below to request a bridge address.\n\nOnce you have an address, copy & paste it into the \"Bridges\" preference in Orbot\'s setting and restart.</string>
+  
+  <string name="install_orweb">Install Orfox</string>
+  
+  <string name="standard_browser">Standard Browser</string>
+  
+  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTE: Only standard Tor bridges work on Intel X86/ATOM devices</string>
+
+	<string name="vpn_default_world">World</string>
+</resources>
diff --git a/orbotservice/src/main/res/values/styles.xml b/orbotservice/src/main/res/values/styles.xml
new file mode 100644
index 0000000..b3fe8af
--- /dev/null
+++ b/orbotservice/src/main/res/values/styles.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="NotificationText" parent="android:TextAppearance.StatusBar.EventContent" />
+    <style name="NotificationTitle" parent="android:TextAppearance.StatusBar.EventContent.Title" />
+</resources>
diff --git a/orbotservice/src/main/res/values/theme.xml b/orbotservice/src/main/res/values/theme.xml
new file mode 100644
index 0000000..e51e533
--- /dev/null
+++ b/orbotservice/src/main/res/values/theme.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+    <style name="DefaultTheme" parent="Theme.AppCompat.NoActionBar">
+    </style>
+    
+</resources>
+
diff --git a/orbotservice/src/test/java/org/torproject/android/control/.cvsignore b/orbotservice/src/test/java/org/torproject/android/control/.cvsignore
new file mode 100644
index 0000000..6b468b6
--- /dev/null
+++ b/orbotservice/src/test/java/org/torproject/android/control/.cvsignore
@@ -0,0 +1 @@
+*.class
diff --git a/orbotservice/src/test/java/org/torproject/android/control/Bytes.java b/orbotservice/src/test/java/org/torproject/android/control/Bytes.java
new file mode 100644
index 0000000..e754d90
--- /dev/null
+++ b/orbotservice/src/test/java/org/torproject/android/control/Bytes.java
@@ -0,0 +1,114 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Static class to do bytewise structure manipulation in Java.
+ */
+/* XXXX There must be a better way to do most of this.
+ * XXXX The string logic here uses default encoding, which is stupid.
+ */
+final class Bytes {
+
+    /** Write the two-byte value in 's' into the byte array 'ba', starting at
+     * the index 'pos'. */
+    public static void setU16(byte[] ba, int pos, short s) {
+        ba[pos]   = (byte)((s >> 8) & 0xff);
+        ba[pos+1] = (byte)((s     ) & 0xff);
+    }
+
+    /** Write the four-byte value in 'i' into the byte array 'ba', starting at
+     * the index 'pos'. */
+    public static void setU32(byte[] ba, int pos, int i) {
+        ba[pos]   = (byte)((i >> 24) & 0xff);
+        ba[pos+1] = (byte)((i >> 16) & 0xff);
+        ba[pos+2] = (byte)((i >>  8) & 0xff);
+        ba[pos+3] = (byte)((i      ) & 0xff);
+    }
+
+    /** Return the four-byte value starting at index 'pos' within 'ba' */
+    public static int getU32(byte[] ba, int pos) {
+        return
+            ((ba[pos  ]&0xff)<<24) |
+            ((ba[pos+1]&0xff)<<16) |
+            ((ba[pos+2]&0xff)<< 8)  |
+            ((ba[pos+3]&0xff));
+    }
+
+    public static String getU32S(byte[] ba, int pos) {
+        return String.valueOf( (getU32(ba,pos))&0xffffffffL );
+    }
+
+    /** Return the two-byte value starting at index 'pos' within 'ba' */
+    public static int getU16(byte[] ba, int pos) {
+        return
+            ((ba[pos  ]&0xff)<<8) |
+            ((ba[pos+1]&0xff));
+    }
+
+    /** Return the string starting at position 'pos' of ba and extending
+     * until a zero byte or the end of the string. */
+    public static String getNulTerminatedStr(byte[] ba, int pos) {
+        int len, maxlen = ba.length-pos;
+        for (len=0; len<maxlen; ++len) {
+            if (ba[pos+len] == 0)
+                break;
+        }
+        return new String(ba, pos, len);
+    }
+
+    /**
+     * Read bytes from 'ba' starting at 'pos', dividing them into strings
+     * along the character in 'split' and writing them into 'lst'
+     */
+    public static void splitStr(List<String> lst, byte[] ba, int pos, byte split) {
+        while (pos < ba.length && ba[pos] != 0) {
+            int len;
+            for (len=0; pos+len < ba.length; ++len) {
+                if (ba[pos+len] == 0 || ba[pos+len] == split)
+                    break;
+            }
+            if (len>0)
+                lst.add(new String(ba, pos, len));
+            pos += len;
+            if (ba[pos] == split)
+                ++pos;
+        }
+    }
+
+    /**
+     * Read bytes from 'ba' starting at 'pos', dividing them into strings
+     * along the character in 'split' and writing them into 'lst'
+     */
+    public static List<String> splitStr(List<String> lst, String str) {
+        // split string on spaces, include trailing/leading
+        String[] tokenArray = str.split(" ", -1);
+        if (lst == null) {
+            lst = Arrays.asList( tokenArray );
+        } else {
+            lst.addAll( Arrays.asList( tokenArray ) );
+        }
+        return lst;
+    }
+
+    private static final char[] NYBBLES = {
+        '0', '1', '2', '3', '4', '5', '6', '7',
+        '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
+    };
+
+    public static final String hex(byte[] ba) {
+        StringBuffer buf = new StringBuffer();
+        for (int i = 0; i < ba.length; ++i) {
+            int b = (ba[i]) & 0xff;
+            buf.append(NYBBLES[b >> 4]);
+            buf.append(NYBBLES[b&0x0f]);
+        }
+        return buf.toString();
+    }
+
+    private Bytes() {};
+}
+
diff --git a/orbotservice/src/test/java/org/torproject/android/control/ConfigEntry.java b/orbotservice/src/test/java/org/torproject/android/control/ConfigEntry.java
new file mode 100644
index 0000000..31eb4b8
--- /dev/null
+++ b/orbotservice/src/test/java/org/torproject/android/control/ConfigEntry.java
@@ -0,0 +1,20 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control;
+
+/** A single key-value pair from Tor's configuration. */
+public class ConfigEntry {
+    public ConfigEntry(String k, String v) {
+        key = k;
+        value = v;
+        is_default = false;
+    }
+    public ConfigEntry(String k) {
+        key = k;
+        value = "";
+        is_default = true;
+    }
+    public final String key;
+    public final String value;
+    public final boolean is_default;
+}
diff --git a/orbotservice/src/test/java/org/torproject/android/control/EventHandler.java b/orbotservice/src/test/java/org/torproject/android/control/EventHandler.java
new file mode 100644
index 0000000..5a4e2b5
--- /dev/null
+++ b/orbotservice/src/test/java/org/torproject/android/control/EventHandler.java
@@ -0,0 +1,75 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control;
+
+/**
+ * Abstract interface whose methods are invoked when Tor sends us an event.
+ *
+ * @see TorControlConnection#setEventHandler
+ * @see TorControlConnection#setEvents
+ */
+public interface EventHandler {
+    /**
+     * Invoked when a circuit's status has changed.
+     * Possible values for <b>status</b> are:
+     * <ul>
+     *   <li>"LAUNCHED" :  circuit ID assigned to new circuit</li>
+     *   <li>"BUILT"    :  all hops finished, can now accept streams</li>
+     *   <li>"EXTENDED" :  one more hop has been completed</li>
+     *   <li>"FAILED"   :  circuit closed (was not built)</li>
+     *   <li>"CLOSED"   :  circuit closed (was built)</li>
+     *	</ul>
+     * 
+     * <b>circID</b> is the alphanumeric identifier of the affected circuit,
+     * and <b>path</b> is a comma-separated list of alphanumeric ServerIDs.
+     */
+    public void circuitStatus(String status, String circID, String path);
+    /**
+     * Invoked when a stream's status has changed.
+     * Possible values for <b>status</b> are:
+     * <ul>
+     *   <li>"NEW"         :  New request to connect</li>
+     *   <li>"NEWRESOLVE"  :  New request to resolve an address</li>
+     *   <li>"SENTCONNECT" :  Sent a connect cell along a circuit</li>
+     *   <li>"SENTRESOLVE" :  Sent a resolve cell along a circuit</li>
+     *   <li>"SUCCEEDED"   :  Received a reply; stream established</li>
+     *   <li>"FAILED"      :  Stream failed and not retriable.</li>
+     *   <li>"CLOSED"      :  Stream closed</li>
+     *   <li>"DETACHED"    :  Detached from circuit; still retriable.</li>
+     *	</ul>
+     *
+     * <b>streamID</b> is the alphanumeric identifier of the affected stream,
+     * and its <b>target</b> is specified as address:port.
+     */
+    public void streamStatus(String status, String streamID, String target);
+    /**
+     * Invoked when the status of a connection to an OR has changed.
+     * Possible values for <b>status</b> are ["LAUNCHED" | "CONNECTED" | "FAILED" | "CLOSED"].
+     * <b>orName</b> is the alphanumeric identifier of the OR affected.
+     */
+    public void orConnStatus(String status, String orName);
+    /**
+     * Invoked once per second. <b>read</b> and <b>written</b> are
+     * the number of bytes read and written, respectively, in
+     * the last second.
+     */
+    public void bandwidthUsed(long read, long written);
+    /**
+     * Invoked whenever Tor learns about new ORs.  The <b>orList</b> object
+     * contains the alphanumeric ServerIDs associated with the new ORs.
+     */
+    public void newDescriptors(java.util.List<String> orList);
+    /**
+     * Invoked when Tor logs a message.
+     * <b>severity</b> is one of ["DEBUG" | "INFO" | "NOTICE" | "WARN" | "ERR"],
+     * and <b>msg</b> is the message string.
+     */
+    public void message(String severity, String msg);
+    /**
+     * Invoked when an unspecified message is received.
+     * <type> is the message type, and <msg> is the message string.
+     */
+    public void unrecognized(String type, String msg);
+
+}
+
diff --git a/orbotservice/src/test/java/org/torproject/android/control/NullEventHandler.java b/orbotservice/src/test/java/org/torproject/android/control/NullEventHandler.java
new file mode 100644
index 0000000..a2390e6
--- /dev/null
+++ b/orbotservice/src/test/java/org/torproject/android/control/NullEventHandler.java
@@ -0,0 +1,18 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control;
+
+/**
+ * Implementation of EventHandler that ignores all events.  Useful
+ * when you only want to override one method.
+ */
+public class NullEventHandler implements EventHandler {
+    public void circuitStatus(String status, String circID, String path) {}
+    public void streamStatus(String status, String streamID, String target) {}
+    public void orConnStatus(String status, String orName) {}
+    public void bandwidthUsed(long read, long written) {}
+    public void newDescriptors(java.util.List<String> orList) {}
+    public void message(String severity, String msg) {}
+    public void unrecognized(String type, String msg) {}
+}
+
diff --git a/orbotservice/src/test/java/org/torproject/android/control/PasswordDigest.java b/orbotservice/src/test/java/org/torproject/android/control/PasswordDigest.java
new file mode 100644
index 0000000..03d0a98
--- /dev/null
+++ b/orbotservice/src/test/java/org/torproject/android/control/PasswordDigest.java
@@ -0,0 +1,98 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+
+/**
+ * A hashed digest of a secret password (used to set control connection
+ * security.)
+ *
+ * For the actual hashing algorithm, see RFC2440's secret-to-key conversion.
+ */
+public class PasswordDigest {
+
+    private final byte[] secret;
+    private final String hashedKey;
+
+    /** Return a new password digest with a random secret and salt. */
+    public static PasswordDigest generateDigest() {
+        byte[] secret = new byte[20];
+        SecureRandom rng = new SecureRandom();
+        rng.nextBytes(secret);
+        return new PasswordDigest(secret);
+    }
+
+    /** Construct a new password digest with a given secret and random salt */
+    public PasswordDigest(byte[] secret) {
+        this(secret, null);
+    }
+
+    /** Construct a new password digest with a given secret and random salt.
+     * Note that the 9th byte of the specifier determines the number of hash
+     * iterations as in RFC2440.
+     */
+    public PasswordDigest(byte[] secret, byte[] specifier) {
+        this.secret = secret.clone();
+        if (specifier == null) {
+            specifier = new byte[9];
+            SecureRandom rng = new SecureRandom();
+            rng.nextBytes(specifier);
+            specifier[8] = 96;
+        }
+        hashedKey = "16:"+encodeBytes(secretToKey(secret, specifier));
+    }
+
+    /** Return the secret used to generate this password hash.
+     */
+    public byte[] getSecret() {
+        return secret.clone();
+    }
+
+    /** Return the hashed password in the format used by Tor. */
+    public String getHashedPassword() {
+        return hashedKey;
+    }
+
+    /** Parameter used by RFC2440's s2k algorithm. */
+    private static final int EXPBIAS = 6;
+
+    /** Implement rfc2440 s2k */
+    public static byte[] secretToKey(byte[] secret, byte[] specifier) {
+        MessageDigest d;
+        try {
+            d = MessageDigest.getInstance("SHA-1");
+        } catch (NoSuchAlgorithmException ex) {
+            throw new RuntimeException("Can't run without sha-1.");
+        }
+        int c = (specifier[8])&0xff;
+        int count = (16 + (c&15)) << ((c>>4) + EXPBIAS);
+
+        byte[] tmp = new byte[8+secret.length];
+        System.arraycopy(specifier, 0, tmp, 0, 8);
+        System.arraycopy(secret, 0, tmp, 8, secret.length);
+        while (count > 0) {
+            if (count >= tmp.length) {
+                d.update(tmp);
+                count -= tmp.length;
+            } else {
+                d.update(tmp, 0, count);
+                count = 0;
+            }
+        }
+        byte[] key = new byte[20+9];
+        System.arraycopy(d.digest(), 0, key, 9, 20);
+        System.arraycopy(specifier, 0, key, 0, 9);
+        return key;
+    }
+
+    /** Return a hexadecimal encoding of a byte array. */
+    // XXX There must be a better way to do this in Java.
+    private static final String encodeBytes(byte[] ba) {
+        return Bytes.hex(ba);
+    }
+
+}
+
diff --git a/orbotservice/src/test/java/org/torproject/android/control/README b/orbotservice/src/test/java/org/torproject/android/control/README
new file mode 100644
index 0000000..b310c7d
--- /dev/null
+++ b/orbotservice/src/test/java/org/torproject/android/control/README
@@ -0,0 +1,4 @@
+We broke the version detection stuff in Tor 0.1.2.16 / 0.2.0.4-alpha.
+Somebody should rip out the v0 control protocol stuff from here, and
+it should start working again. -RD
+
diff --git a/orbotservice/src/test/java/org/torproject/android/control/TorControlCommands.java b/orbotservice/src/test/java/org/torproject/android/control/TorControlCommands.java
new file mode 100644
index 0000000..c98a1c4
--- /dev/null
+++ b/orbotservice/src/test/java/org/torproject/android/control/TorControlCommands.java
@@ -0,0 +1,148 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control;
+
+/** Interface defining constants used by the Tor controller protocol.
+ */
+// XXXX Take documentation for these from control-spec.txt
+public interface TorControlCommands {
+
+    public static final short CMD_ERROR = 0x0000;
+    public static final short CMD_DONE = 0x0001;
+    public static final short CMD_SETCONF = 0x0002;
+    public static final short CMD_GETCONF = 0x0003;
+    public static final short CMD_CONFVALUE = 0x0004;
+    public static final short CMD_SETEVENTS = 0x0005;
+    public static final short CMD_EVENT = 0x0006;
+    public static final short CMD_AUTH = 0x0007;
+    public static final short CMD_SAVECONF = 0x0008;
+    public static final short CMD_SIGNAL = 0x0009;
+    public static final short CMD_MAPADDRESS = 0x000A;
+    public static final short CMD_GETINFO = 0x000B;
+    public static final short CMD_INFOVALUE = 0x000C;
+    public static final short CMD_EXTENDCIRCUIT = 0x000D;
+    public static final short CMD_ATTACHSTREAM = 0x000E;
+    public static final short CMD_POSTDESCRIPTOR = 0x000F;
+    public static final short CMD_FRAGMENTHEADER = 0x0010;
+    public static final short CMD_FRAGMENT = 0x0011;
+    public static final short CMD_REDIRECTSTREAM = 0x0012;
+    public static final short CMD_CLOSESTREAM = 0x0013;
+    public static final short CMD_CLOSECIRCUIT = 0x0014;
+
+    public static final String[] CMD_NAMES = {
+        "ERROR",
+        "DONE",
+        "SETCONF",
+        "GETCONF",
+        "CONFVALUE",
+        "SETEVENTS",
+        "EVENT",
+        "AUTH",
+        "SAVECONF",
+        "SIGNAL",
+        "MAPADDRESS",
+        "GETINFO",
+        "INFOVALUE",
+        "EXTENDCIRCUIT",
+        "ATTACHSTREAM",
+        "POSTDESCRIPTOR",
+        "FRAGMENTHEADER",
+        "FRAGMENT",
+        "REDIRECTSTREAM",
+        "CLOSESTREAM",
+        "CLOSECIRCUIT",
+    };
+
+    public static final short EVENT_CIRCSTATUS = 0x0001;
+    public static final short EVENT_STREAMSTATUS = 0x0002;
+    public static final short EVENT_ORCONNSTATUS = 0x0003;
+    public static final short EVENT_BANDWIDTH = 0x0004;
+    public static final short EVENT_NEWDESCRIPTOR = 0x0006;
+    public static final short EVENT_MSG_DEBUG = 0x0007;
+    public static final short EVENT_MSG_INFO = 0x0008;
+    public static final short EVENT_MSG_NOTICE = 0x0009;
+    public static final short EVENT_MSG_WARN = 0x000A;
+    public static final short EVENT_MSG_ERROR = 0x000B;
+
+    public static final String[] EVENT_NAMES = {
+        "(0)",
+        "CIRC",
+        "STREAM",
+        "ORCONN",
+        "BW",
+        "OLDLOG",
+        "NEWDESC",
+        "DEBUG",
+        "INFO",
+        "NOTICE",
+        "WARN",
+        "ERR",
+    };
+
+    public static final byte CIRC_STATUS_LAUNCHED = 0x01;
+    public static final byte CIRC_STATUS_BUILT = 0x02;
+    public static final byte CIRC_STATUS_EXTENDED = 0x03;
+    public static final byte CIRC_STATUS_FAILED = 0x04;
+    public static final byte CIRC_STATUS_CLOSED = 0x05;
+
+    public static final String[] CIRC_STATUS_NAMES = {
+        "LAUNCHED",
+        "BUILT",
+        "EXTENDED",
+        "FAILED",
+        "CLOSED",
+    };
+
+    public static final byte STREAM_STATUS_SENT_CONNECT = 0x00;
+    public static final byte STREAM_STATUS_SENT_RESOLVE = 0x01;
+    public static final byte STREAM_STATUS_SUCCEEDED = 0x02;
+    public static final byte STREAM_STATUS_FAILED = 0x03;
+    public static final byte STREAM_STATUS_CLOSED = 0x04;
+    public static final byte STREAM_STATUS_NEW_CONNECT = 0x05;
+    public static final byte STREAM_STATUS_NEW_RESOLVE = 0x06;
+    public static final byte STREAM_STATUS_DETACHED = 0x07;
+
+    public static final String[] STREAM_STATUS_NAMES = {
+        "SENT_CONNECT",
+        "SENT_RESOLVE",
+        "SUCCEEDED",
+        "FAILED",
+        "CLOSED",
+        "NEW_CONNECT",
+        "NEW_RESOLVE",
+        "DETACHED"
+    };
+
+    public static final byte OR_CONN_STATUS_LAUNCHED = 0x00;
+    public static final byte OR_CONN_STATUS_CONNECTED = 0x01;
+    public static final byte OR_CONN_STATUS_FAILED = 0x02;
+    public static final byte OR_CONN_STATUS_CLOSED = 0x03;
+
+    public static final String[] OR_CONN_STATUS_NAMES = {
+        "LAUNCHED","CONNECTED","FAILED","CLOSED"
+    };
+
+    public static final byte SIGNAL_HUP = 0x01;
+    public static final byte SIGNAL_INT = 0x02;
+    public static final byte SIGNAL_USR1 = 0x0A;
+    public static final byte SIGNAL_USR2 = 0x0C;
+    public static final byte SIGNAL_TERM = 0x0F;
+
+    public static final String ERROR_MSGS[] = {
+        "Unspecified error",
+        "Internal error",
+        "Unrecognized message type",
+        "Syntax error",
+        "Unrecognized configuration key",
+        "Invalid configuration value",
+        "Unrecognized byte code",
+        "Unauthorized",
+        "Failed authentication attempt",
+        "Resource exhausted",
+        "No such stream",
+        "No such circuit",
+        "No such OR",
+    };
+
+}
+
diff --git a/orbotservice/src/test/java/org/torproject/android/control/TorControlConnection.java b/orbotservice/src/test/java/org/torproject/android/control/TorControlConnection.java
new file mode 100644
index 0000000..204dbc0
--- /dev/null
+++ b/orbotservice/src/test/java/org/torproject/android/control/TorControlConnection.java
@@ -0,0 +1,730 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.Writer;
+import java.net.Socket;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+/** A connection to a running Tor process as specified in control-spec.txt. */
+public class TorControlConnection implements TorControlCommands {
+
+    private final LinkedList<Waiter> waiters;
+    private final BufferedReader input;
+    private final Writer output;
+
+    private ControlParseThread thread; // Locking: this
+
+    private volatile EventHandler handler;
+    private volatile PrintWriter debugOutput;
+    private volatile IOException parseThreadException;
+    
+    static class Waiter {
+    
+        List<ReplyLine> response; // Locking: this
+    
+        synchronized List<ReplyLine> getResponse() throws InterruptedException {
+                while (response == null) {
+                    wait();
+                }
+            return response;
+        }
+
+        synchronized void setResponse(List<ReplyLine> response) {
+            this.response = response;
+            notifyAll();
+        }
+    }
+
+    static class ReplyLine {
+
+        final String status;
+        final String msg;
+        final String rest;
+
+        ReplyLine(String status, String msg, String rest) {
+            this.status = status; this.msg = msg; this.rest = rest;
+        }
+    }
+    
+    /** Create a new TorControlConnection to communicate with Tor over
+     * a given socket.  After calling this constructor, it is typical to
+     * call launchThread and authenticate. */
+    public TorControlConnection(Socket connection) throws IOException {
+        this(connection.getInputStream(), connection.getOutputStream());
+    }
+
+    /** Create a new TorControlConnection to communicate with Tor over
+     * an arbitrary pair of data streams.
+     */
+    public TorControlConnection(InputStream i, OutputStream o) {
+        this(new InputStreamReader(i), new OutputStreamWriter(o));
+    }
+
+    public TorControlConnection(Reader i, Writer o) {
+        this.output = o;
+        if (i instanceof BufferedReader)
+            this.input = (BufferedReader) i;
+        else
+            this.input = new BufferedReader(i);
+        this.waiters = new LinkedList<Waiter>();
+    }
+
+    protected final void writeEscaped(String s) throws IOException {
+        StringTokenizer st = new StringTokenizer(s, "\n");
+        while (st.hasMoreTokens()) {
+            String line = st.nextToken();
+            if (line.startsWith("."))
+                line = "."+line;
+            if (line.endsWith("\r"))
+                line += "\n";
+            else
+                line += "\r\n";
+            if (debugOutput != null)
+                debugOutput.print(">> "+line);
+            output.write(line);
+        }
+        output.write(".\r\n");
+        if (debugOutput != null)
+            debugOutput.print(">> .\n");
+    }
+
+    protected static final String quote(String s) {
+        StringBuffer sb = new StringBuffer("\"");
+        for (int i = 0; i < s.length(); ++i) {
+            char c = s.charAt(i);
+            switch (c)
+                {
+                case '\r':
+                case '\n':
+                case '\\':
+                case '\"':
+                    sb.append('\\');
+                }
+            sb.append(c);
+        }
+        sb.append('\"');
+        return sb.toString();
+    }
+
+    protected final ArrayList<ReplyLine> readReply() throws IOException {
+        ArrayList<ReplyLine> reply = new ArrayList<ReplyLine>();
+        char c;
+        do {
+            String line = input.readLine();
+            if (line == null) {
+                // if line is null, the end of the stream has been reached, i.e.
+                // the connection to Tor has been closed!
+                if (reply.isEmpty()) {
+                        // nothing received so far, can exit cleanly
+                        return reply;
+                } 
+                // received half of a reply before the connection broke down
+                throw new TorControlSyntaxError("Connection to Tor " +
+                     " broke down while receiving reply!");
+            }
+            if (debugOutput != null)
+                debugOutput.println("<< "+line);
+            if (line.length() < 4)
+                throw new TorControlSyntaxError("Line (\""+line+"\") too short");
+            String status = line.substring(0,3);
+            c = line.charAt(3);
+            String msg = line.substring(4);
+            String rest = null;
+            if (c == '+') {
+                StringBuffer data = new StringBuffer();
+                while (true) {
+                    line = input.readLine();
+                    if (debugOutput != null)
+                        debugOutput.print("<< "+line);
+                    if (line.equals("."))
+                        break;
+                    else if (line.startsWith("."))
+                        line = line.substring(1);
+                    data.append(line).append('\n');
+                }
+                rest = data.toString();
+            }
+            reply.add(new ReplyLine(status, msg, rest));
+        } while (c != ' ');
+
+        return reply;
+    }
+
+    protected synchronized List<ReplyLine> sendAndWaitForResponse(String s,
+        String rest) throws IOException {
+        if(parseThreadException != null) throw parseThreadException;
+        checkThread();
+        Waiter w = new Waiter();
+        if (debugOutput != null)
+            debugOutput.print(">> "+s);
+        synchronized (waiters) {
+            output.write(s);
+            if (rest != null)
+                writeEscaped(rest);
+            output.flush();
+            waiters.addLast(w);
+        }
+        List<ReplyLine> lst;
+        try {
+            lst = w.getResponse();
+        } catch (InterruptedException ex) {
+            throw new IOException("Interrupted");
+        }
+        for (Iterator<ReplyLine> i = lst.iterator(); i.hasNext(); ) {
+            ReplyLine c = i.next();
+            if (! c.status.startsWith("2"))
+                throw new TorControlError("Error reply: "+c.msg);
+        }
+        return lst;
+    }
+
+    /** Helper: decode a CMD_EVENT command and dispatch it to our
+     * EventHandler (if any). */
+    protected void handleEvent(ArrayList<ReplyLine> events) {
+        if (handler == null)
+            return;
+
+        for (Iterator<ReplyLine> i = events.iterator(); i.hasNext(); ) {
+            ReplyLine line = i.next();
+            int idx = line.msg.indexOf(' ');
+            String tp = line.msg.substring(0, idx).toUpperCase();
+            String rest = line.msg.substring(idx+1);
+            if (tp.equals("CIRC")) {
+                List<String> lst = Bytes.splitStr(null, rest);
+                handler.circuitStatus(lst.get(1),
+                                      lst.get(0),
+                                      lst.get(1).equals("LAUNCHED")
+                                          || lst.size() < 3 ? ""
+                                          : lst.get(2));
+            } else if (tp.equals("STREAM")) {
+                List<String> lst = Bytes.splitStr(null, rest);
+                handler.streamStatus(lst.get(1),
+                                     lst.get(0),
+                                     lst.get(3));
+                // XXXX circID.
+            } else if (tp.equals("ORCONN")) {
+                List<String> lst = Bytes.splitStr(null, rest);
+                handler.orConnStatus(lst.get(1), lst.get(0));
+            } else if (tp.equals("BW")) {
+                List<String> lst = Bytes.splitStr(null, rest);
+                handler.bandwidthUsed(Integer.parseInt(lst.get(0)),
+                                      Integer.parseInt(lst.get(1)));
+            } else if (tp.equals("NEWDESC")) {
+                List<String> lst = Bytes.splitStr(null, rest);
+                handler.newDescriptors(lst);
+            } else if (tp.equals("DEBUG") ||
+                       tp.equals("INFO") ||
+                       tp.equals("NOTICE") ||
+                       tp.equals("WARN") ||
+                       tp.equals("ERR")) {
+                handler.message(tp, rest);
+            } else {
+                handler.unrecognized(tp, rest);
+            }
+        }
+    }
+
+
+    /** Sets <b>w</b> as the PrintWriter for debugging output, 
+    * which writes out all messages passed between Tor and the controller.  
+    * Outgoing messages are preceded by "\>\>" and incoming messages are preceded
+    * by "\<\<"
+    */
+    public void setDebugging(PrintWriter w) {
+        debugOutput = w;
+    }
+    
+    /** Sets <b>s</b> as the PrintStream for debugging output, 
+    * which writes out all messages passed between Tor and the controller.  
+    * Outgoing messages are preceded by "\>\>" and incoming messages are preceded
+    * by "\<\<"
+    */
+    public void setDebugging(PrintStream s) {
+        debugOutput = new PrintWriter(s, true);
+    }
+
+    /** Set the EventHandler object that will be notified of any
+     * events Tor delivers to this connection.  To make Tor send us
+     * events, call setEvents(). */
+    public void setEventHandler(EventHandler handler) {
+        this.handler = handler;
+    }
+
+    /**
+     * Start a thread to react to Tor's responses in the background.
+     * This is necessary to handle asynchronous events and synchronous
+     * responses that arrive independantly over the same socket.
+     */
+    public synchronized Thread launchThread(boolean daemon) {
+    	ControlParseThread th = new ControlParseThread();
+        if (daemon)
+            th.setDaemon(true);
+        th.start();
+        this.thread = th;
+        return th;
+    }
+
+    protected class ControlParseThread extends Thread {
+
+        @Override
+    	public void run() {
+            try {
+                react();
+            } catch (IOException ex) {
+                parseThreadException = ex;
+            }
+        }
+    }
+
+    protected synchronized void checkThread() {
+        if (thread == null)
+            launchThread(true);
+    }
+
+    /** helper: implement the main background loop. */
+    protected void react() throws IOException {
+        while (true) {
+            ArrayList<ReplyLine> lst = readReply();
+            if (lst.isEmpty()) {
+                // connection has been closed remotely! end the loop!
+                return;
+            }
+            if ((lst.get(0)).status.startsWith("6"))
+                handleEvent(lst);
+            else {
+                synchronized (waiters) {
+ 		if (!waiters.isEmpty())
+		{
+                    Waiter w;
+                    w = waiters.removeFirst();
+                    w.setResponse(lst);
+		}
+                }		
+
+            }
+        }
+    }
+
+    /** Change the value of the configuration option 'key' to 'val'.
+     */
+    public void setConf(String key, String value) throws IOException {
+        List<String> lst = new ArrayList<String>();
+        lst.add(key+" "+value);
+        setConf(lst);
+    }
+
+    /** Change the values of the configuration options stored in kvMap. */
+    public void setConf(Map<String, String> kvMap) throws IOException {
+        List<String> lst = new ArrayList<String>();
+        for (Iterator<Map.Entry<String,String>> it = kvMap.entrySet().iterator(); it.hasNext(); ) {
+            Map.Entry<String,String> ent = it.next();
+            lst.add(ent.getKey()+" "+ent.getValue()+"\n");
+        }
+        setConf(lst);
+    }
+
+    /** Changes the values of the configuration options stored in
+     * <b>kvList</b>.  Each list element in <b>kvList</b> is expected to be
+     * String of the format "key value".
+     *
+     * Tor behaves as though it had just read each of the key-value pairs
+     * from its configuration file.  Keywords with no corresponding values have
+     * their configuration values reset to their defaults.  setConf is
+     * all-or-nothing: if there is an error in any of the configuration settings,
+     * Tor sets none of them.
+     *
+     * When a configuration option takes multiple values, or when multiple
+     * configuration keys form a context-sensitive group (see getConf below), then
+     * setting any of the options in a setConf command is taken to reset all of
+     * the others.  For example, if two ORBindAddress values are configured, and a
+     * command arrives containing a single ORBindAddress value, the new
+     * command's value replaces the two old values.
+     * 
+     * To remove all settings for a given option entirely (and go back to its
+     * default value), include a String in <b>kvList</b> containing the key and no value.
+     */
+    public void setConf(Collection<String> kvList) throws IOException {
+        if (kvList.size() == 0)
+            return;
+        StringBuffer b = new StringBuffer("SETCONF");
+        for (Iterator<String> it = kvList.iterator(); it.hasNext(); ) {
+            String kv = it.next();
+            int i = kv.indexOf(' ');
+            if (i == -1)
+                b.append(" ").append(kv);
+            b.append(" ").append(kv.substring(0,i)).append("=")
+                .append(quote(kv.substring(i+1)));
+        }
+        b.append("\r\n");
+        sendAndWaitForResponse(b.toString(), null);
+    }
+    
+    /** Try to reset the values listed in the collection 'keys' to their
+     * default values.
+     **/
+    public void resetConf(Collection<String> keys) throws IOException {
+        if (keys.size() == 0)
+            return;
+        StringBuffer b = new StringBuffer("RESETCONF");
+        for (Iterator<String> it = keys.iterator(); it.hasNext(); ) {
+            String key = it.next();
+            b.append(" ").append(key);
+        }
+        b.append("\r\n");
+        sendAndWaitForResponse(b.toString(), null);
+    }
+
+    /** Return the value of the configuration option 'key' */
+    public List<ConfigEntry> getConf(String key) throws IOException {
+        List<String> lst = new ArrayList<String>();
+        lst.add(key);
+        return getConf(lst);
+    }
+
+    /** Requests the values of the configuration variables listed in <b>keys</b>.
+     * Results are returned as a list of ConfigEntry objects.
+     * 
+     * If an option appears multiple times in the configuration, all of its
+     * key-value pairs are returned in order.
+     *
+     * Some options are context-sensitive, and depend on other options with
+     * different keywords.  These cannot be fetched directly.  Currently there
+     * is only one such option: clients should use the "HiddenServiceOptions"
+     * virtual keyword to get all HiddenServiceDir, HiddenServicePort,
+     * HiddenServiceNodes, and HiddenServiceExcludeNodes option settings.
+     */
+    public List<ConfigEntry> getConf(Collection<String> keys) throws IOException {
+        StringBuffer sb = new StringBuffer("GETCONF");
+        for (Iterator<String> it = keys.iterator(); it.hasNext(); ) {
+            String key = it.next();
+            sb.append(" ").append(key);
+        }
+        sb.append("\r\n");
+        List<ReplyLine> lst = sendAndWaitForResponse(sb.toString(), null);
+        List<ConfigEntry> result = new ArrayList<ConfigEntry>();
+        for (Iterator<ReplyLine> it = lst.iterator(); it.hasNext(); ) {
+            String kv = (it.next()).msg;
+            int idx = kv.indexOf('=');
+            if (idx >= 0)
+                result.add(new ConfigEntry(kv.substring(0, idx),
+                                           kv.substring(idx+1)));
+            else
+                result.add(new ConfigEntry(kv));
+        }
+        return result;
+    }
+
+    /** Request that the server inform the client about interesting events.
+     * Each element of <b>events</b> is one of the following Strings: 
+     * ["CIRC" | "STREAM" | "ORCONN" | "BW" | "DEBUG" |
+     *  "INFO" | "NOTICE" | "WARN" | "ERR" | "NEWDESC" | "ADDRMAP"] .
+     * 
+     * Any events not listed in the <b>events</b> are turned off; thus, calling
+     * setEvents with an empty <b>events</b> argument turns off all event reporting.
+     */
+    public void setEvents(List<String> events) throws IOException {
+        StringBuffer sb = new StringBuffer("SETEVENTS");
+        for (Iterator<String> it = events.iterator(); it.hasNext(); ) {
+            sb.append(" ").append(it.next());
+        }
+        sb.append("\r\n");
+        sendAndWaitForResponse(sb.toString(), null);
+    }
+
+    /** Authenticates the controller to the Tor server.
+     *
+     * By default, the current Tor implementation trusts all local users, and 
+     * the controller can authenticate itself by calling authenticate(new byte[0]).
+     *
+     * If the 'CookieAuthentication' option is true, Tor writes a "magic cookie"
+     * file named "control_auth_cookie" into its data directory.  To authenticate,
+     * the controller must send the contents of this file in <b>auth</b>.
+     * 
+     * If the 'HashedControlPassword' option is set, <b>auth</b> must contain the salted
+     * hash of a secret password.  The salted hash is computed according to the
+     * S2K algorithm in RFC 2440 (OpenPGP), and prefixed with the s2k specifier.
+     * This is then encoded in hexadecimal, prefixed by the indicator sequence
+     * "16:".
+     *
+     * You can generate the salt of a password by calling
+     *       'tor --hash-password <password>'
+     * or by using the provided PasswordDigest class.
+     * To authenticate under this scheme, the controller sends Tor the original
+     * secret that was used to generate the password.
+     */
+    public void authenticate(byte[] auth) throws IOException {
+        String cmd = "AUTHENTICATE " + Bytes.hex(auth) + "\r\n";
+        sendAndWaitForResponse(cmd, null);
+    }
+
+    /** Instructs the server to write out its configuration options into its torrc.
+     */
+    public void saveConf() throws IOException {
+        sendAndWaitForResponse("SAVECONF\r\n", null);
+    }
+
+    /** Sends a signal from the controller to the Tor server.
+     * <b>signal</b> is one of the following Strings:
+     * <ul>
+     * <li>"RELOAD" or "HUP" :  Reload config items, refetch directory</li>
+     * <li>"SHUTDOWN" or "INT" : Controlled shutdown: if server is an OP, exit immediately.
+     *     If it's an OR, close listeners and exit after 30 seconds</li>
+     * <li>"DUMP" or "USR1" : Dump stats: log information about open connections and circuits</li>
+     * <li>"DEBUG" or "USR2" : Debug: switch all open logs to loglevel debug</li>
+     * <li>"HALT" or "TERM" : Immediate shutdown: clean up and exit now</li>
+     * </ul>
+     */
+    public void signal(String signal) throws IOException {
+        String cmd = "SIGNAL " + signal + "\r\n";
+        sendAndWaitForResponse(cmd, null);
+    }
+
+    /** Send a signal to the Tor process to shut it down or halt it.
+     * Does not wait for a response. */
+    public void shutdownTor(String signal) throws IOException {
+        String s = "SIGNAL " + signal + "\r\n";
+        Waiter w = new Waiter();
+        if (debugOutput != null)
+            debugOutput.print(">> "+s);
+        synchronized (waiters) {
+            output.write(s);
+            output.flush();
+        }
+    }
+
+    /** Tells the Tor server that future SOCKS requests for connections to a set of original
+     * addresses should be replaced with connections to the specified replacement
+     * addresses.  Each element of <b>kvLines</b> is a String of the form
+     * "old-address new-address".  This function returns the new address mapping.
+     *
+     * The client may decline to provide a body for the original address, and
+     * instead send a special null address ("0.0.0.0" for IPv4, "::0" for IPv6, or
+     * "." for hostname), signifying that the server should choose the original
+     * address itself, and return that address in the reply.  The server
+     * should ensure that it returns an element of address space that is unlikely
+     * to be in actual use.  If there is already an address mapped to the
+     * destination address, the server may reuse that mapping.
+     * 
+     * If the original address is already mapped to a different address, the old
+     * mapping is removed.  If the original address and the destination address
+     * are the same, the server removes any mapping in place for the original
+     * address.
+     *
+     * Mappings set by the controller last until the Tor process exits:
+     * they never expire. If the controller wants the mapping to last only
+     * a certain time, then it must explicitly un-map the address when that
+     * time has elapsed.
+     */
+    public Map<String,String> mapAddresses(Collection<String> kvLines) throws IOException {
+        StringBuffer sb = new StringBuffer("MAPADDRESS");
+        for (Iterator<String> it = kvLines.iterator(); it.hasNext(); ) {
+            String kv = it.next();
+            int i = kv.indexOf(' ');
+            sb.append(" ").append(kv.substring(0,i)).append("=")
+                .append(quote(kv.substring(i+1)));
+        }
+        sb.append("\r\n");
+        List<ReplyLine> lst = sendAndWaitForResponse(sb.toString(), null);
+        Map<String,String> result = new HashMap<String,String>();
+        for (Iterator<ReplyLine> it = lst.iterator(); it.hasNext(); ) {
+            String kv = (it.next()).msg;
+            int idx = kv.indexOf('=');
+            result.put(kv.substring(0, idx),
+                       kv.substring(idx+1));
+        }
+        return result;
+    }
+
+    public Map<String,String> mapAddresses(Map<String,String> addresses) throws IOException {
+        List<String> kvList = new ArrayList<String>();
+        for (Iterator<Map.Entry<String, String>> it = addresses.entrySet().iterator(); it.hasNext(); ) {
+            Map.Entry<String,String> e = it.next();
+            kvList.add(e.getKey()+" "+e.getValue());
+        }
+        return mapAddresses(kvList);
+    }
+
+    public String mapAddress(String fromAddr, String toAddr) throws IOException {
+        List<String> lst = new ArrayList<String>();
+        lst.add(fromAddr+" "+toAddr+"\n");
+        Map<String,String> m = mapAddresses(lst);
+        return m.get(fromAddr);
+    }
+
+    /** Queries the Tor server for keyed values that are not stored in the torrc
+     * configuration file.  Returns a map of keys to values.
+     *
+     * Recognized keys include:
+     * <ul>
+     * <li>"version" : The version of the server's software, including the name
+     *  of the software. (example: "Tor 0.0.9.4")</li>
+     * <li>"desc/id/<OR identity>" or "desc/name/<OR nickname>" : the latest server
+     * descriptor for a given OR, NUL-terminated.  If no such OR is known, the
+     * corresponding value is an empty string.</li>
+     * <li>"network-status" : a space-separated list of all known OR identities.
+     * This is in the same format as the router-status line in directories;
+     * see tor-spec.txt for details.</li>
+     * <li>"addr-mappings/all"</li>
+     * <li>"addr-mappings/config"</li>
+     * <li>"addr-mappings/cache"</li>
+     * <li>"addr-mappings/control" : a space-separated list of address mappings, each
+     * in the form of "from-address=to-address".  The 'config' key
+     * returns those address mappings set in the configuration; the 'cache'
+     * key returns the mappings in the client-side DNS cache; the 'control'
+     * key returns the mappings set via the control interface; the 'all'
+     * target returns the mappings set through any mechanism.</li>
+     * <li>"circuit-status" : A series of lines as for a circuit status event. Each line is of the form:
+     * "CircuitID CircStatus Path"</li>
+     * <li>"stream-status" : A series of lines as for a stream status event.  Each is of the form:
+     * "StreamID StreamStatus CircID Target"</li>
+     * <li>"orconn-status" : A series of lines as for an OR connection status event.  Each is of the
+     * form: "ServerID ORStatus"</li>
+     * </ul>
+     */
+    public Map<String,String> getInfo(Collection<String> keys) throws IOException {
+        StringBuffer sb = new StringBuffer("GETINFO");
+        for (Iterator<String> it = keys.iterator(); it.hasNext(); ) {
+            sb.append(" ").append(it.next());
+        }
+        sb.append("\r\n");
+        List<ReplyLine> lst = sendAndWaitForResponse(sb.toString(), null);
+        Map<String,String> m = new HashMap<String,String>();
+        for (Iterator<ReplyLine> it = lst.iterator(); it.hasNext(); ) {
+            ReplyLine line = it.next();
+            int idx = line.msg.indexOf('=');
+            if (idx<0)
+                break;
+            String k = line.msg.substring(0,idx);
+            String v;
+            if (line.rest != null) {
+                v = line.rest;
+            } else {
+                v = line.msg.substring(idx+1);
+            }
+            m.put(k, v);
+        }
+        return m;
+    }
+    
+    
+    
+    /** Return the value of the information field 'key' */
+    public String getInfo(String key) throws IOException {
+        List<String> lst = new ArrayList<String>();
+        lst.add(key);
+        Map<String,String> m = getInfo(lst);
+        return  m.get(key);
+    }
+
+    /** An extendCircuit request takes one of two forms: either the <b>circID</b> is zero, in
+     * which case it is a request for the server to build a new circuit according
+     * to the specified path, or the <b>circID</b> is nonzero, in which case it is a
+     * request for the server to extend an existing circuit with that ID according
+     * to the specified <b>path</b>.
+     *
+     * If successful, returns the Circuit ID of the (maybe newly created) circuit.
+     */
+    public String extendCircuit(String circID, String path) throws IOException {
+        List<ReplyLine> lst = sendAndWaitForResponse(
+                          "EXTENDCIRCUIT "+circID+" "+path+"\r\n", null);
+        return (lst.get(0)).msg;
+    }
+    
+    /** Informs the Tor server that the stream specified by <b>streamID</b> should be
+     * associated with the circuit specified by <b>circID</b>.  
+     * 
+     * Each stream may be associated with
+     * at most one circuit, and multiple streams may share the same circuit.
+     * Streams can only be attached to completed circuits (that is, circuits that
+     * have sent a circuit status "BUILT" event or are listed as built in a
+     * getInfo circuit-status request).
+     * 
+     * If <b>circID</b> is 0, responsibility for attaching the given stream is
+     * returned to Tor.
+     * 
+     * By default, Tor automatically attaches streams to
+     * circuits itself, unless the configuration variable
+     * "__LeaveStreamsUnattached" is set to "1".  Attempting to attach streams
+     * via TC when "__LeaveStreamsUnattached" is false may cause a race between
+     * Tor and the controller, as both attempt to attach streams to circuits.
+     */
+    public void attachStream(String streamID, String circID)
+        throws IOException {
+        sendAndWaitForResponse("ATTACHSTREAM "+streamID+" "+circID+"\r\n", null);
+    }
+
+    /** Tells Tor about the server descriptor in <b>desc</b>.
+     * 
+     * The descriptor, when parsed, must contain a number of well-specified
+     * fields, including fields for its nickname and identity.
+     */
+    // More documentation here on format of desc?
+    // No need for return value?  control-spec.txt says reply is merely "250 OK" on success...
+    public String postDescriptor(String desc) throws IOException {
+        List<ReplyLine> lst = sendAndWaitForResponse("+POSTDESCRIPTOR\r\n", desc);
+        return (lst.get(0)).msg;
+    }
+
+    /** Tells Tor to change the exit address of the stream identified by <b>streamID</b>
+     * to <b>address</b>. No remapping is performed on the new provided address.
+     * 
+     * To be sure that the modified address will be used, this event must be sent
+     * after a new stream event is received, and before attaching this stream to
+     * a circuit.
+     */
+    public void redirectStream(String streamID, String address) throws IOException {
+        sendAndWaitForResponse("REDIRECTSTREAM "+streamID+" "+address+"\r\n",
+                               null);
+    }
+
+    /** Tells Tor to close the stream identified by <b>streamID</b>.
+     * <b>reason</b> should be one of the Tor RELAY_END reasons given in tor-spec.txt, as a decimal:
+     * <ul>
+     * <li>1 -- REASON_MISC           (catch-all for unlisted reasons)</li>
+     * <li>2 -- REASON_RESOLVEFAILED  (couldn't look up hostname)</li>
+     * <li>3 -- REASON_CONNECTREFUSED (remote host refused connection)</li>
+     * <li>4 -- REASON_EXITPOLICY     (OR refuses to connect to host or port)</li>
+     * <li>5 -- REASON_DESTROY        (Circuit is being destroyed)</li>
+     * <li>6 -- REASON_DONE           (Anonymized TCP connection was closed)</li>
+     * <li>7 -- REASON_TIMEOUT        (Connection timed out, or OR timed out while connecting)</li>
+     * <li>8 -- (unallocated)</li>
+     * <li>9 -- REASON_HIBERNATING    (OR is temporarily hibernating)</li>
+     * <li>10 -- REASON_INTERNAL       (Internal error at the OR)</li>
+     * <li>11 -- REASON_RESOURCELIMIT  (OR has no resources to fulfill request)</li>
+     * <li>12 -- REASON_CONNRESET      (Connection was unexpectedly reset)</li>
+     * <li>13 -- REASON_TORPROTOCOL    (Sent when closing connection because of Tor protocol violations)</li>
+     * </ul>
+     *
+     * Tor may hold the stream open for a while to flush any data that is pending.
+     */
+    public void closeStream(String streamID, byte reason)
+        throws IOException {
+        sendAndWaitForResponse("CLOSESTREAM "+streamID+" "+reason+"\r\n",null);
+    }
+
+    /** Tells Tor to close the circuit identified by <b>circID</b>.
+     * If <b>ifUnused</b> is true, do not close the circuit unless it is unused.
+     */
+    public void closeCircuit(String circID, boolean ifUnused) throws IOException {
+        sendAndWaitForResponse("CLOSECIRCUIT "+circID+
+                               (ifUnused?" IFUNUSED":"")+"\r\n", null);
+    }
+}
+
diff --git a/orbotservice/src/test/java/org/torproject/android/control/TorControlError.java b/orbotservice/src/test/java/org/torproject/android/control/TorControlError.java
new file mode 100644
index 0000000..d07ee51
--- /dev/null
+++ b/orbotservice/src/test/java/org/torproject/android/control/TorControlError.java
@@ -0,0 +1,39 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control;
+
+import java.io.IOException;
+
+/**
+ * An exception raised when Tor tells us about an error.
+ */
+public class TorControlError extends IOException {
+
+    static final long serialVersionUID = 3;
+
+    private final int errorType;
+
+    public TorControlError(int type, String s) {
+        super(s);
+        errorType = type;
+    }
+
+    public TorControlError(String s) {
+        this(-1, s);
+    }
+
+    public int getErrorType() {
+        return errorType;
+    }
+
+    public String getErrorMsg() {
+        try {
+            if (errorType == -1)
+                return null;
+            return TorControlCommands.ERROR_MSGS[errorType];
+        } catch (ArrayIndexOutOfBoundsException ex) {
+            return "Unrecongized error #"+errorType;
+        }
+    }
+}
+
diff --git a/orbotservice/src/test/java/org/torproject/android/control/TorControlSyntaxError.java b/orbotservice/src/test/java/org/torproject/android/control/TorControlSyntaxError.java
new file mode 100644
index 0000000..dba4f44
--- /dev/null
+++ b/orbotservice/src/test/java/org/torproject/android/control/TorControlSyntaxError.java
@@ -0,0 +1,16 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control;
+
+import java.io.IOException;
+
+/**
+ * An exception raised when Tor behaves in an unexpected way.
+ */
+public class TorControlSyntaxError extends IOException {
+
+    static final long serialVersionUID = 3;
+
+    public TorControlSyntaxError(String s) { super(s); }
+}
+
diff --git a/orbotservice/src/test/java/org/torproject/android/control/examples/.cvsignore b/orbotservice/src/test/java/org/torproject/android/control/examples/.cvsignore
new file mode 100644
index 0000000..6b468b6
--- /dev/null
+++ b/orbotservice/src/test/java/org/torproject/android/control/examples/.cvsignore
@@ -0,0 +1 @@
+*.class
diff --git a/orbotservice/src/test/java/org/torproject/android/control/examples/DebuggingEventHandler.java b/orbotservice/src/test/java/org/torproject/android/control/examples/DebuggingEventHandler.java
new file mode 100644
index 0000000..48c49a2
--- /dev/null
+++ b/orbotservice/src/test/java/org/torproject/android/control/examples/DebuggingEventHandler.java
@@ -0,0 +1,44 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control.examples;
+
+import java.io.PrintWriter;
+import java.util.Iterator;
+import org.torproject.android.control.EventHandler;
+
+public class DebuggingEventHandler implements EventHandler {
+
+    private final PrintWriter out;
+
+    public DebuggingEventHandler(PrintWriter p) {
+        out = p;
+    }
+
+    public void circuitStatus(String status, String circID, String path) {
+        out.println("Circuit "+circID+" is now "+status+" (path="+path+")");
+    }
+    public void streamStatus(String status, String streamID, String target) {
+        out.println("Stream "+streamID+" is now "+status+" (target="+target+")");
+    }
+    public void orConnStatus(String status, String orName) {
+        out.println("OR connection to "+orName+" is now "+status);
+    }
+    public void bandwidthUsed(long read, long written) {
+        out.println("Bandwidth usage: "+read+" bytes read; "+
+                    written+" bytes written.");
+    }
+    public void newDescriptors(java.util.List<String> orList) {
+        out.println("New descriptors for routers:");
+        for (Iterator<String> i = orList.iterator(); i.hasNext(); )
+            out.println("   "+i.next());
+    }
+    public void message(String type, String msg) {
+        out.println("["+type+"] "+msg.trim());
+    }
+
+    public void unrecognized(String type, String msg) {
+        out.println("unrecognized event ["+type+"] "+msg.trim());
+    }
+
+}
+
diff --git a/orbotservice/src/test/java/org/torproject/android/control/examples/Main.java b/orbotservice/src/test/java/org/torproject/android/control/examples/Main.java
new file mode 100644
index 0000000..b0e0a3c
--- /dev/null
+++ b/orbotservice/src/test/java/org/torproject/android/control/examples/Main.java
@@ -0,0 +1,146 @@
+// Copyright 2005 Nick Mathewson, Roger Dingledine
+// See LICENSE file for copying information
+package org.torproject.android.control.examples;
+
+import org.torproject.android.control.*;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.Socket;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Iterator;
+
+public class Main implements TorControlCommands {
+
+    public static void main(String args[]) {
+        if (args.length < 1) {
+            System.err.println("No command given.");
+            return;
+        }
+        try {
+            if (args[0].equals("set-config")) {
+                setConfig(args);
+            } else if (args[0].equals("get-config")) {
+                getConfig(args);
+            } else if (args[0].equals("get-info")) {
+                getInfo(args);
+            } else if (args[0].equals("listen")) {
+                listenForEvents(args);
+            } else if (args[0].equals("signal")) {
+                signal(args);
+            } else if (args[0].equals("auth")) {
+                authDemo(args);
+            } else {
+                System.err.println("Unrecognized command: "+args[0]);
+            }
+        } catch (EOFException ex) {
+            System.out.println("Control socket closed by Tor.");
+        } catch (TorControlError ex) {
+            System.err.println("Error from Tor process: "+
+                               ex+" ["+ex.getErrorMsg()+"]");
+        } catch (IOException ex) {
+            System.err.println("IO exception when talking to Tor process: "+
+                               ex);
+            ex.printStackTrace(System.err);
+        }
+    }
+
+    private static TorControlConnection getConnection(String[] args,
+        boolean daemon) throws IOException {
+        Socket s = new Socket("127.0.0.1", 9100);
+        TorControlConnection conn = new TorControlConnection(s);
+        conn.launchThread(daemon);
+        conn.authenticate(new byte[0]);
+        return conn;
+    }
+
+    private static TorControlConnection getConnection(String[] args)
+        throws IOException {
+        return getConnection(args, true);
+    }
+
+    public static void setConfig(String[] args) throws IOException {
+        // Usage: "set-config [-save] key value key value key value"
+        TorControlConnection conn = getConnection(args);
+        ArrayList<String> lst = new ArrayList<String>();
+        int i = 1;
+        boolean save = false;
+        if (args[i].equals("-save")) {
+            save = true;
+            ++i;
+        }
+        for (; i < args.length; i +=2) {
+            lst.add(args[i]+" "+args[i+1]);
+        }
+        conn.setConf(lst);
+        if (save) {
+            conn.saveConf();
+        }
+    }
+
+    public static void getConfig(String[] args) throws IOException {
+        // Usage: get-config key key key
+        TorControlConnection conn = getConnection(args);
+        List<ConfigEntry> lst = conn.getConf(Arrays.asList(args).subList(1,args.length));
+        for (Iterator<ConfigEntry> i = lst.iterator(); i.hasNext(); ) {
+            ConfigEntry e = i.next();
+            System.out.println("KEY: "+e.key);
+            System.out.println("VAL: "+e.value);
+        }
+    }
+
+    public static void getInfo(String[] args) throws IOException {
+        TorControlConnection conn = getConnection(args);
+        Map<String,String> m = conn.getInfo(Arrays.asList(args).subList(1,args.length));
+        for (Iterator<Map.Entry<String, String>> i = m.entrySet().iterator(); i.hasNext(); ) {
+            Map.Entry<String,String> e = i.next();
+            System.out.println("KEY: "+e.getKey());
+            System.out.println("VAL: "+e.getValue());
+        }
+    }
+
+    public static void listenForEvents(String[] args) throws IOException {
+        // Usage: listen [circ|stream|orconn|bw|newdesc|info|notice|warn|error]*
+        TorControlConnection conn = getConnection(args, false);
+        ArrayList<String> lst = new ArrayList<String>();
+        for (int i = 1; i < args.length; ++i) {
+            lst.add(args[i]);
+        }
+        conn.setEventHandler(
+            new DebuggingEventHandler(new PrintWriter(System.out, true)));
+        conn.setEvents(lst);
+    }
+
+    public static void signal(String[] args) throws IOException {
+        // Usage signal [reload|shutdown|dump|debug|halt]
+        TorControlConnection conn = getConnection(args, false);
+        // distinguish shutdown signal from other signals
+        if ("SHUTDOWN".equalsIgnoreCase(args[1])
+        		|| "HALT".equalsIgnoreCase(args[1])) {
+        	conn.shutdownTor(args[1].toUpperCase());
+        } else {
+        	conn.signal(args[1].toUpperCase());
+        }
+    }
+
+    public static void authDemo(String[] args) throws IOException {
+
+        PasswordDigest pwd = PasswordDigest.generateDigest();
+        Socket s = new Socket("127.0.0.1", 9100);
+        TorControlConnection conn = new TorControlConnection(s);
+        conn.launchThread(true);
+        conn.authenticate(new byte[0]);
+
+        conn.setConf("HashedControlPassword", pwd.getHashedPassword());
+
+        s = new Socket("127.0.0.1", 9100);
+        conn = new TorControlConnection(s);
+        conn.launchThread(true);
+        conn.authenticate(pwd.getSecret());
+    }
+
+}
+
diff --git a/orbotservice/src/test/java/org/torproject/android/service/ExampleUnitTest.java b/orbotservice/src/test/java/org/torproject/android/service/ExampleUnitTest.java
new file mode 100644
index 0000000..578fa4b
--- /dev/null
+++ b/orbotservice/src/test/java/org/torproject/android/service/ExampleUnitTest.java
@@ -0,0 +1,15 @@
+package org.torproject.android.service;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * To work on unit tests, switch the Test Artifact in the Build Variants view.
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/project.properties b/project.properties
index 42f3e5e..145c9f2 100644
--- a/project.properties
+++ b/project.properties
@@ -10,6 +10,5 @@
 
 # Project target.
 target=android-23
-android.library.reference.1=external/superuser-commands/RootCommands-Library
-android.library.reference.2=external/jsocks/jsockslib
-android.library.reference.3=external/appcompat
+android.library.reference.1=external/jsocks/jsockslib
+android.library.reference.2=external/appcompat
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..9984a03
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,2 @@
+include ':jsocksAndroid', ':orbotservice'
+include ':app'
diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index b90442b..5ab7bed 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -32,9 +32,9 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.widget.RemoteViews;
 
-import net.freehaven.tor.control.ConfigEntry;
-import net.freehaven.tor.control.EventHandler;
-import net.freehaven.tor.control.TorControlConnection;
+import org.torproject.android.control.ConfigEntry;
+import org.torproject.android.control.EventHandler;
+import org.torproject.android.control.TorControlConnection;
 
 import org.json.JSONArray;
 import org.json.JSONObject;





More information about the tor-commits mailing list