[tor-commits] [orbot/master] adding in new app-mini module for "Orbot Mini" builds

n8fr8 at torproject.org n8fr8 at torproject.org
Tue Apr 28 21:05:00 UTC 2020


commit 6ae0ca1e858e34a5457a0f5fd61384e187ff3193
Author: n8fr8 <nathan at guardianproject.info>
Date:   Mon Sep 2 22:47:10 2019 -0400

    adding in new app-mini module for "Orbot Mini" builds
    - we are developing a light version of Orbot with a new user interface, and we'll be doing it right here in the main Orbot project
---
 .gitmodules                                        |    4 -
 app-mini/build.gradle                              |  121 ++
 app-mini/mini/release/output.json                  |    1 +
 app-mini/proguard-rules.txt                        |   14 +
 .../org.torproject.android/AutomateScreenshotsTest |   16 +
 app-mini/src/debug/AndroidManifest.xml             |  145 +++
 app-mini/src/main/AndroidManifest.xml              |  137 +++
 app-mini/src/main/assets/LICENSE                   |    1 +
 app-mini/src/main/assets/arm/obfs4proxy            |    1 +
 app-mini/src/main/assets/common/geoip              |    0
 app-mini/src/main/assets/common/geoip6             |    0
 app-mini/src/main/ic_launcher-web.png              |  Bin 0 -> 18915 bytes
 .../integration/android/IntentIntegrator.java      |  506 +++++++++
 .../zxing/integration/android/IntentResult.java    |   95 ++
 .../org/torproject/android/mini/MainConstants.java |   15 +
 .../torproject/android/mini/MiniMainActivity.java  | 1167 ++++++++++++++++++++
 .../torproject/android/mini/OnBootReceiver.java    |   57 +
 .../org/torproject/android/mini/OrbotMiniApp.java  |  111 ++
 .../android/mini}/settings/Languages.java          |    2 +-
 .../android/mini}/settings/LocaleHelper.java       |    4 +-
 .../android/mini/settings/SettingsPreferences.java |   73 ++
 .../android/mini/ui/AppManagerActivity.java        |  343 ++++++
 .../mini}/ui/NoPersonalizedLearningEditText.java   |    2 +-
 .../android/mini}/ui/Rotate3dAnimation.java        |    2 +-
 .../mini/ui/onboarding/BridgeWizardActivity.java   |  223 ++++
 .../mini/ui/onboarding/CustomSlideBigText.java     |   82 ++
 .../mini/ui/onboarding/OnboardingActivity.java     |   81 ++
 .../android/mini}/vpn/VPNEnableActivity.java       |    2 +-
 .../res/drawable-hdpi-v11/ic_stat_notifyerr.png    |  Bin 0 -> 480 bytes
 .../main/res/drawable-hdpi-v11/ic_stat_tor_off.png |  Bin 0 -> 744 bytes
 .../res/drawable-hdpi-v9/ic_stat_notifyerr.png     |  Bin 0 -> 616 bytes
 .../main/res/drawable-hdpi/ic_action_settings.png  |  Bin 0 -> 553 bytes
 .../res/drawable-hdpi/ic_settings_white_24dp.png   |  Bin 0 -> 460 bytes
 .../main/res/drawable-hdpi/ic_stat_notifyerr.png   |  Bin 0 -> 1312 bytes
 .../src/main/res/drawable-hdpi/ic_stat_tor.png     |  Bin 0 -> 606 bytes
 .../res/drawable-ldpi-v11/ic_stat_notifyerr.png    |  Bin 0 -> 294 bytes
 .../res/drawable-ldpi-v9/ic_stat_notifyerr.png     |  Bin 0 -> 342 bytes
 .../main/res/drawable-ldpi/ic_action_settings.png  |  Bin 0 -> 319 bytes
 .../main/res/drawable-ldpi/ic_stat_notifyerr.png   |  Bin 0 -> 647 bytes
 .../res/drawable-mdpi-v11/ic_stat_notifyerr.png    |  Bin 0 -> 357 bytes
 .../res/drawable-mdpi-v9/ic_stat_notifyerr.png     |  Bin 0 -> 458 bytes
 .../res/drawable-mdpi/ic_settings_white_24dp.png   |  Bin 0 -> 326 bytes
 .../src/main/res/drawable-mdpi/ic_stat_tor.png     |  Bin 0 -> 389 bytes
 .../res/drawable-xhdpi-v11/ic_stat_notifyerr.png   |  Bin 0 -> 618 bytes
 .../res/drawable-xhdpi-v9/ic_stat_notifyerr.png    |  Bin 0 -> 747 bytes
 .../res/drawable-xhdpi/ic_settings_white_24dp.png  |  Bin 0 -> 562 bytes
 .../src/main/res/drawable-xhdpi/ic_stat_tor.png    |  Bin 0 -> 773 bytes
 .../res/drawable-xxhdpi/ic_settings_white_24dp.png |  Bin 0 -> 843 bytes
 .../src/main/res/drawable-xxhdpi/ic_stat_tor.png   |  Bin 0 -> 1131 bytes
 .../drawable-xxxhdpi/ic_settings_white_24dp.png    |  Bin 0 -> 1074 bytes
 .../src/main/res/drawable-xxxhdpi/ic_stat_tor.png  |  Bin 0 -> 1564 bytes
 app-mini/src/main/res/drawable/ic_menu_about.png   |  Bin 0 -> 1771 bytes
 app-mini/src/main/res/drawable/ic_menu_exit.png    |  Bin 0 -> 2693 bytes
 app-mini/src/main/res/drawable/ic_stat_tor_off.png |  Bin 0 -> 744 bytes
 app-mini/src/main/res/drawable/onion32.png         |  Bin 0 -> 1599 bytes
 app-mini/src/main/res/drawable/round_drawable.xml  |   16 +
 app-mini/src/main/res/drawable/toroff.png          |  Bin 0 -> 19187 bytes
 app-mini/src/main/res/drawable/toron.png           |  Bin 0 -> 19057 bytes
 app-mini/src/main/res/drawable/torstarting.png     |  Bin 0 -> 18052 bytes
 .../src/main/res/layout/activity_bridge_wizard.xml |   27 +
 .../src/main/res/layout/content_bridge_wizard.xml  |   66 ++
 .../src/main/res/layout/custom_slide_big_text.xml  |   43 +
 app-mini/src/main/res/layout/layout_about.xml      |  117 ++
 .../res/layout/layout_activity_client_cookies.xml  |   35 +
 .../res/layout/layout_add_client_cookie_dialog.xml |   62 ++
 app-mini/src/main/res/layout/layout_apps.xml       |   26 +
 app-mini/src/main/res/layout/layout_apps_item.xml  |   33 +
 .../res/layout/layout_client_cookie_list_item.xml  |   24 +
 .../res/layout/layout_content_client_cookies.xml   |   20 +
 .../src/main/res/layout/layout_cookie_actions.xml  |   24 +
 app-mini/src/main/res/layout/layout_main.xml       |  151 +++
 app-mini/src/main/res/menu/app_main.xml            |   33 +
 app-mini/src/main/res/menu/orbot_main.xml          |   73 ++
 .../src/main/res/mipmap-anydpi-v26/ic_launcher.xml |    5 +
 .../res/mipmap-anydpi-v26/ic_launcher_round.xml    |    5 +
 app-mini/src/main/res/mipmap-hdpi/ic_launcher.png  |  Bin 0 -> 2019 bytes
 .../res/mipmap-hdpi/ic_launcher_foreground.png     |  Bin 0 -> 1815 bytes
 .../src/main/res/mipmap-hdpi/ic_launcher_round.png |  Bin 0 -> 4055 bytes
 app-mini/src/main/res/mipmap-mdpi/ic_launcher.png  |  Bin 0 -> 1456 bytes
 .../res/mipmap-mdpi/ic_launcher_foreground.png     |  Bin 0 -> 1174 bytes
 .../src/main/res/mipmap-mdpi/ic_launcher_round.png |  Bin 0 -> 2620 bytes
 app-mini/src/main/res/mipmap-xhdpi/ic_launcher.png |  Bin 0 -> 2761 bytes
 .../res/mipmap-xhdpi/ic_launcher_foreground.png    |  Bin 0 -> 2495 bytes
 .../main/res/mipmap-xhdpi/ic_launcher_round.png    |  Bin 0 -> 5714 bytes
 .../src/main/res/mipmap-xxhdpi/ic_launcher.png     |  Bin 0 -> 4143 bytes
 .../res/mipmap-xxhdpi/ic_launcher_foreground.png   |  Bin 0 -> 3922 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher_round.png   |  Bin 0 -> 8706 bytes
 .../src/main/res/mipmap-xxxhdpi/ic_launcher.png    |  Bin 0 -> 5726 bytes
 .../res/mipmap-xxxhdpi/ic_launcher_foreground.png  |  Bin 0 -> 5467 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher_round.png  |  Bin 0 -> 12555 bytes
 app-mini/src/main/res/values-ach/strings.xml       |   11 +
 app-mini/src/main/res/values-ar/poestrings.xml     |   17 +
 app-mini/src/main/res/values-ar/strings.xml        |  194 ++++
 app-mini/src/main/res/values-ay/poestrings.xml     |   17 +
 app-mini/src/main/res/values-ay/strings.xml        |  205 ++++
 app-mini/src/main/res/values-az/strings.xml        |  143 +++
 app-mini/src/main/res/values-be/poestrings.xml     |   17 +
 app-mini/src/main/res/values-be/strings.xml        |  205 ++++
 app-mini/src/main/res/values-bg/poestrings.xml     |   17 +
 app-mini/src/main/res/values-bg/strings.xml        |  145 +++
 app-mini/src/main/res/values-bn-rBD/strings.xml    |   39 +
 app-mini/src/main/res/values-bn-rIN/strings.xml    |   13 +
 app-mini/src/main/res/values-bn/strings.xml        |   28 +
 app-mini/src/main/res/values-brx/strings.xml       |   15 +
 app-mini/src/main/res/values-bs/strings.xml        |   18 +
 app-mini/src/main/res/values-ca/poestrings.xml     |   17 +
 app-mini/src/main/res/values-ca/strings.xml        |  206 ++++
 app-mini/src/main/res/values-cs-rCZ/strings.xml    |  139 +++
 app-mini/src/main/res/values-cs/strings.xml        |   48 +
 app-mini/src/main/res/values-cy/strings.xml        |   46 +
 app-mini/src/main/res/values-da/strings.xml        |  111 ++
 app-mini/src/main/res/values-de-rAT/strings.xml    |   11 +
 app-mini/src/main/res/values-de/poestrings.xml     |   17 +
 app-mini/src/main/res/values-de/strings.xml        |  206 ++++
 app-mini/src/main/res/values-el/poestrings.xml     |   17 +
 app-mini/src/main/res/values-el/strings.xml        |  206 ++++
 app-mini/src/main/res/values-en-rGB/poestrings.xml |   17 +
 app-mini/src/main/res/values-en-rGB/strings.xml    |   41 +
 app-mini/src/main/res/values-eo/strings.xml        |   80 ++
 app-mini/src/main/res/values-es-rAR/poestrings.xml |   17 +
 app-mini/src/main/res/values-es-rAR/strings.xml    |  118 ++
 app-mini/src/main/res/values-es/arrays.xml         |    9 +
 app-mini/src/main/res/values-es/poestrings.xml     |   17 +
 app-mini/src/main/res/values-es/strings.xml        |  207 ++++
 app-mini/src/main/res/values-et/strings.xml        |  103 ++
 app-mini/src/main/res/values-eu/poestrings.xml     |   17 +
 app-mini/src/main/res/values-eu/strings.xml        |  206 ++++
 app-mini/src/main/res/values-fa/poestrings.xml     |   17 +
 app-mini/src/main/res/values-fa/strings.xml        |  206 ++++
 app-mini/src/main/res/values-fi/strings.xml        |  146 +++
 app-mini/src/main/res/values-fr-rFR/strings.xml    |  140 +++
 app-mini/src/main/res/values-fr/poestrings.xml     |   17 +
 app-mini/src/main/res/values-fr/strings.xml        |  206 ++++
 app-mini/src/main/res/values-gl/poestrings.xml     |   17 +
 app-mini/src/main/res/values-gl/strings.xml        |  206 ++++
 app-mini/src/main/res/values-gu-rIN/strings.xml    |   12 +
 app-mini/src/main/res/values-gu/strings.xml        |   19 +
 app-mini/src/main/res/values-he/strings.xml        |  206 ++++
 app-mini/src/main/res/values-hi/poestrings.xml     |   17 +
 app-mini/src/main/res/values-hi/strings.xml        |  207 ++++
 app-mini/src/main/res/values-hr-rHR/strings.xml    |   18 +
 app-mini/src/main/res/values-hr/strings.xml        |  140 +++
 app-mini/src/main/res/values-hu/poestrings.xml     |   17 +
 app-mini/src/main/res/values-hu/strings.xml        |  206 ++++
 app-mini/src/main/res/values-hy-rAM/strings.xml    |   19 +
 app-mini/src/main/res/values-ia/strings.xml        |   21 +
 app-mini/src/main/res/values-id/strings.xml        |  143 +++
 app-mini/src/main/res/values-in-rID/poestrings.xml |   17 +
 app-mini/src/main/res/values-in-rID/strings.xml    |  138 +++
 app-mini/src/main/res/values-in/strings.xml        |   24 +
 app-mini/src/main/res/values-is/poestrings.xml     |   17 +
 app-mini/src/main/res/values-is/strings.xml        |  206 ++++
 app-mini/src/main/res/values-it/poestrings.xml     |   17 +
 app-mini/src/main/res/values-it/strings.xml        |  206 ++++
 app-mini/src/main/res/values-iw/poestrings.xml     |   17 +
 app-mini/src/main/res/values-iw/strings.xml        |  112 ++
 app-mini/src/main/res/values-ja/poestrings.xml     |   17 +
 app-mini/src/main/res/values-ja/strings.xml        |  206 ++++
 app-mini/src/main/res/values-kn-rIN/strings.xml    |   11 +
 app-mini/src/main/res/values-kn/strings.xml        |   17 +
 app-mini/src/main/res/values-ko/strings.xml        |  142 +++
 app-mini/src/main/res/values-ky/strings.xml        |   21 +
 app-mini/src/main/res/values-lt-rLT/strings.xml    |   11 +
 app-mini/src/main/res/values-lt/poestrings.xml     |   17 +
 app-mini/src/main/res/values-lt/strings.xml        |   45 +
 app-mini/src/main/res/values-lv/strings.xml        |  144 +++
 app-mini/src/main/res/values-mk/poestrings.xml     |   17 +
 app-mini/src/main/res/values-mk/strings.xml        |  206 ++++
 app-mini/src/main/res/values-ml/strings.xml        |   21 +
 app-mini/src/main/res/values-mn/strings.xml        |   15 +
 app-mini/src/main/res/values-mr-rIN/strings.xml    |   13 +
 app-mini/src/main/res/values-ms-rMY/strings.xml    |   98 ++
 app-mini/src/main/res/values-ms/strings.xml        |   88 ++
 app-mini/src/main/res/values-my/strings.xml        |   31 +
 app-mini/src/main/res/values-nb/poestrings.xml     |   17 +
 app-mini/src/main/res/values-nb/strings.xml        |  178 +++
 app-mini/src/main/res/values-nl/poestrings.xml     |   17 +
 app-mini/src/main/res/values-nl/strings.xml        |  206 ++++
 app-mini/src/main/res/values-pa/strings.xml        |   20 +
 app-mini/src/main/res/values-pl/strings.xml        |  150 +++
 app-mini/src/main/res/values-ps/strings.xml        |   13 +
 app-mini/src/main/res/values-pt-rBR/poestrings.xml |   17 +
 app-mini/src/main/res/values-pt-rBR/strings.xml    |  185 ++++
 app-mini/src/main/res/values-pt-rPT/strings.xml    |   67 ++
 app-mini/src/main/res/values-pt/strings.xml        |   96 ++
 app-mini/src/main/res/values-ro-rRO/strings.xml    |   18 +
 app-mini/src/main/res/values-ro/strings.xml        |  146 +++
 app-mini/src/main/res/values-rs-rAR/strings.xml    |   32 +
 app-mini/src/main/res/values-ru/poestrings.xml     |   17 +
 app-mini/src/main/res/values-ru/strings.xml        |  206 ++++
 app-mini/src/main/res/values-si-rLK/strings.xml    |   96 ++
 app-mini/src/main/res/values-sk-rSK/strings.xml    |   11 +
 app-mini/src/main/res/values-sk/strings.xml        |  142 +++
 app-mini/src/main/res/values-sl/strings.xml        |   35 +
 app-mini/src/main/res/values-sn/strings.xml        |   23 +
 app-mini/src/main/res/values-sq/strings.xml        |   34 +
 app-mini/src/main/res/values-sr/strings.xml        |  186 ++++
 app-mini/src/main/res/values-sv/poestrings.xml     |   17 +
 app-mini/src/main/res/values-sv/strings.xml        |  206 ++++
 app-mini/src/main/res/values-ta/poestrings.xml     |   17 +
 app-mini/src/main/res/values-ta/strings.xml        |   53 +
 app-mini/src/main/res/values-th/poestrings.xml     |   17 +
 app-mini/src/main/res/values-th/strings.xml        |  206 ++++
 app-mini/src/main/res/values-tl/strings.xml        |  117 ++
 app-mini/src/main/res/values-tr/poestrings.xml     |   17 +
 app-mini/src/main/res/values-tr/strings.xml        |  206 ++++
 app-mini/src/main/res/values-uk/poestrings.xml     |   17 +
 app-mini/src/main/res/values-uk/strings.xml        |  203 ++++
 app-mini/src/main/res/values-ur/strings.xml        |   22 +
 app-mini/src/main/res/values-uz/strings.xml        |   33 +
 app-mini/src/main/res/values-v21/styles.xml        |    1 +
 app-mini/src/main/res/values-vi/strings.xml        |  142 +++
 app-mini/src/main/res/values-w820dp/dimens.xml     |    6 +
 app-mini/src/main/res/values-zh-rCN/strings.xml    |  142 +++
 app-mini/src/main/res/values-zh-rTW/poestrings.xml |   17 +
 app-mini/src/main/res/values-zh-rTW/strings.xml    |  207 ++++
 app-mini/src/main/res/values/arrays.xml            |    9 +
 app-mini/src/main/res/values/colors.xml            |   11 +
 app-mini/src/main/res/values/dimens.xml            |  241 ++++
 .../src/main/res/values/ic_launcher_background.xml |    4 +
 app-mini/src/main/res/values/poestrings.xml        |   17 +
 app-mini/src/main/res/values/strings.xml           |  258 +++++
 app-mini/src/main/res/values/styles.xml            |    7 +
 app-mini/src/main/res/values/theme.xml             |    8 +
 .../src/main/res/xml/hidden_services_paths.xml     |    4 +
 app-mini/src/main/res/xml/preferences.xml          |  301 +++++
 app/src/main/AndroidManifest.xml                   |   24 +-
 .../org/torproject/android/OnBootReceiver.java     |    2 +-
 .../main/java/org/torproject/android/OrbotApp.java |    4 +-
 .../org/torproject/android/OrbotMainActivity.java  |   28 +-
 .../android/mini/settings/Languages.java           |  228 ++++
 .../android/mini/settings/LocaleHelper.java        |   87 ++
 .../{ => mini}/settings/SettingsPreferences.java   |    2 +-
 .../android/{ => mini}/ui/AppManagerActivity.java  |   11 +-
 .../mini/ui/NoPersonalizedLearningEditText.java    |   13 +
 .../android/mini/ui/Rotate3dAnimation.java         |   76 ++
 .../ui/hiddenservices/ClientCookiesActivity.java   |   16 +-
 .../ui/hiddenservices/HiddenServicesActivity.java  |   16 +-
 .../ui/hiddenservices/adapters/BackupAdapter.java  |    2 +-
 .../adapters/ClientCookiesAdapter.java             |    4 +-
 .../hiddenservices/adapters/OnionListAdapter.java  |    4 +-
 .../ui/hiddenservices/backup/BackupUtils.java      |    8 +-
 .../{ => mini}/ui/hiddenservices/backup/ZipIt.java |    2 +-
 .../ui/hiddenservices/database/HSDatabase.java     |    2 +-
 .../ui/hiddenservices/dialogs/AddCookieDialog.java |    4 +-
 .../dialogs/CookieActionsDialog.java               |    6 +-
 .../hiddenservices/dialogs/CookieDeleteDialog.java |    4 +-
 .../ui/hiddenservices/dialogs/HSActionsDialog.java |    6 +-
 .../ui/hiddenservices/dialogs/HSCookieDialog.java  |    4 +-
 .../ui/hiddenservices/dialogs/HSDataDialog.java    |    4 +-
 .../ui/hiddenservices/dialogs/HSDeleteDialog.java  |    4 +-
 .../dialogs/SelectCookieBackupDialog.java          |    8 +-
 .../dialogs/SelectHSBackupDialog.java              |    8 +-
 .../permissions/PermissionManager.java             |    2 +-
 .../providers/CookieContentProvider.java           |    6 +-
 .../providers/HSContentProvider.java               |    6 +-
 .../ui/hiddenservices/storage/ExternalStorage.java |    2 +-
 .../ui/onboarding/BridgeWizardActivity.java        |    5 +-
 .../ui/onboarding/CustomSlideBigText.java          |    2 +-
 .../ui/onboarding/OnboardingActivity.java          |   10 +-
 .../android/mini/vpn/VPNEnableActivity.java        |  120 ++
 app/src/main/res/layout/activity_bridge_wizard.xml |    2 +-
 app/src/main/res/layout/content_bridge_wizard.xml  |    2 +-
 .../res/layout/layout_activity_client_cookies.xml  |    2 +-
 .../res/layout/layout_add_client_cookie_dialog.xml |    4 +-
 .../res/layout/layout_content_client_cookies.xml   |    2 +-
 app/src/main/res/layout/layout_hs_data_dialog.xml  |    6 +-
 app/src/main/res/layout/layout_hs_list_view.xml    |    2 +-
 .../main/res/layout/layout_hs_list_view_main.xml   |    2 +-
 build.gradle                                       |    2 +-
 external/pluto                                     |    1 -
 orbotservice/build.gradle                          |    4 +
 .../android/service/TorEventHandler.java           |    2 +
 .../org/torproject/android/service/TorService.java |    4 +-
 .../src/main/res/drawable-hdpi-v11/ic_stat_tor.png |  Bin 802 -> 0 bytes
 .../res/drawable-hdpi-v11/ic_stat_tor_xfer.png     |  Bin 967 -> 0 bytes
 .../src/main/res/drawable-hdpi-v9/ic_stat_tor.png  |  Bin 713 -> 0 bytes
 .../src/main/res/drawable-hdpi/ic_stat_tor.png     |  Bin 852 -> 606 bytes
 .../main/res/drawable-hdpi/ic_stat_tor_xfer.png    |  Bin 990 -> 0 bytes
 .../src/main/res/drawable-ldpi-v11/ic_stat_tor.png |  Bin 390 -> 0 bytes
 .../src/main/res/drawable-ldpi-v9/ic_stat_tor.png  |  Bin 358 -> 0 bytes
 .../src/main/res/drawable-ldpi/ic_stat_tor.png     |  Bin 606 -> 0 bytes
 .../src/main/res/drawable-mdpi-v11/ic_stat_tor.png |  Bin 517 -> 0 bytes
 .../res/drawable-mdpi-v11/ic_stat_tor_xfer.png     |  Bin 607 -> 0 bytes
 .../src/main/res/drawable-mdpi-v9/ic_stat_tor.png  |  Bin 475 -> 0 bytes
 .../src/main/res/drawable-mdpi/ic_stat_tor.png     |  Bin 535 -> 389 bytes
 .../main/res/drawable-mdpi/ic_stat_tor_xfer.png    |  Bin 600 -> 0 bytes
 .../main/res/drawable-xhdpi-v11/ic_stat_tor.png    |  Bin 1165 -> 0 bytes
 .../res/drawable-xhdpi-v11/ic_stat_tor_xfer.png    |  Bin 1337 -> 0 bytes
 .../src/main/res/drawable-xhdpi-v9/ic_stat_tor.png |  Bin 970 -> 0 bytes
 .../src/main/res/drawable-xhdpi/ic_stat_tor.png    |  Bin 1161 -> 773 bytes
 .../main/res/drawable-xhdpi/ic_stat_tor_xfer.png   |  Bin 1378 -> 0 bytes
 .../main/res/drawable-xxhdpi-v11/ic_stat_tor.png   |  Bin 1903 -> 0 bytes
 .../res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png   |  Bin 2019 -> 0 bytes
 .../src/main/res/drawable-xxhdpi/ic_stat_tor.png   |  Bin 1872 -> 1131 bytes
 .../main/res/drawable-xxhdpi/ic_stat_tor_xfer.png  |  Bin 2216 -> 0 bytes
 .../main/res/drawable-xxxhdpi-v11/ic_stat_tor.png  |  Bin 2661 -> 0 bytes
 .../res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png  |  Bin 3156 -> 0 bytes
 .../src/main/res/drawable-xxxhdpi/ic_stat_tor.png  |  Bin 2631 -> 1564 bytes
 .../main/res/drawable-xxxhdpi/ic_stat_tor_xfer.png |  Bin 2859 -> 0 bytes
 settings.gradle                                    |    2 +-
 301 files changed, 15809 insertions(+), 135 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 67daeac2..691efaad 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,10 +6,6 @@
 	path = external/badvpn
 	url = https://github.com/guardianproject/badvpn.git
 	ignore = dirty
-[submodule "external/pluto"]
-	path = external/pluto
-	url = https://github.com/guardianproject/pluto.git
-	ignore = dirty
 [submodule "external/jsocks"]
 	path = external/jsocks
 	url = https://github.com/guardianproject/jsocks.git
diff --git a/app-mini/build.gradle b/app-mini/build.gradle
new file mode 100644
index 00000000..8f071b98
--- /dev/null
+++ b/app-mini/build.gradle
@@ -0,0 +1,121 @@
+apply plugin: 'com.android.application'
+
+// Create a variable called keystorePropertiesFile, and initialize it to your
+// keystore.properties file, in the rootProject folder.
+def keystorePropertiesFile = rootProject.file("keystore.properties")
+
+// Initialize a new Properties() object called keystoreProperties.
+def keystoreProperties = new Properties()
+
+// Load your keystore.properties file into the keystoreProperties object.
+keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+
+android {
+   signingConfigs {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
+        }
+    }
+
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
+    defaultConfig {
+        applicationId "org.torproject.android.mini"
+        minSdkVersion 16
+        targetSdkVersion 28
+    }
+    lintOptions {
+        checkReleaseBuilds false
+        // Or, if you prefer, you can continue to check for errors in release builds,
+        // but continue the build even when errors are found:
+        abortOnError false
+    }
+    buildTypes {
+        release {
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            signingConfig signingConfigs.release
+        }
+    }
+
+    aaptOptions {
+        cruncherEnabled = false
+    }
+
+    flavorDimensions "free"
+
+    productFlavors {
+        mini {
+            dimension "free"
+            minSdkVersion 16
+            applicationId 'org.torproject.android.mini'
+            targetSdkVersion 28
+            versionCode 10010000
+            versionName '1.0.0-BETA-1-tor-0.4.0.4-rc'
+            archivesBaseName = "Orbot-mini-$versionName"
+        }
+    }
+
+    splits {
+
+        // Configures multiple APKs based on ABI. This helps keep the size down, since PT binaries can be large.
+        abi {
+
+            // Enables building multiple APKs per ABI.
+            enable true
+
+            // By default all ABIs are included, so use reset() and include to specify that we only
+            // want APKs for x86 and x86_64.
+
+            // Resets the list of ABIs that Gradle should create APKs for to none.
+            reset()
+
+            // Specifies a list of ABIs that Gradle should create APKs for.
+            include "x86", "armeabi-v7a", "x86_64", "arm64-v8a"
+
+            // Specifies that we do not want to also generate a universal APK that includes all ABIs.
+            universalApk false
+        }
+
+    }
+
+    packagingOptions {
+        exclude 'assets/arm/obfs4proxy'
+        exclude 'lib/x86/obfs4proxy.so'
+        exclude 'lib/x86_64/obfs4proxy.so'
+        exclude 'lib/arm64-v8a/obfs4proxy.so'
+        exclude 'lib/armeabi-v7a/obfs4proxy.so'
+        exclude 'lib/armeabi/obfs4proxy.so'
+    }
+
+}
+
+
+dependencies {
+    implementation project(':orbotservice')
+    implementation 'com.github.apl-devs:appintro:v4.2.2'
+    implementation 'com.github.javiersantos:AppUpdater:2.7'
+    androidTestImplementation "tools.fastlane:screengrab:1.2.0"
+}
+
+// Map for the version code that gives each ABI a value.
+ext.abiCodes = ['armeabi-v7a':'1', 'arm64-v8a':'2', 'mips':'3', 'x86':'4', 'x86_64':'5']
+
+import com.android.build.OutputFile
+
+// For each APK output variant, override version code of outputs based on ABI codes
+// ex) 'mips' -> 3xxx
+// ex) 'x86' -> 4xxx
+android.applicationVariants.all { variant ->
+    variant.outputs.each { output ->
+        def baseVersionCode = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI))
+        if (baseVersionCode != null) {
+            output.versionCodeOverride = Integer.valueOf(baseVersionCode + variant.versionCode)
+        }
+    }
+}
+
diff --git a/app-mini/mini/release/output.json b/app-mini/mini/release/output.json
new file mode 100644
index 00000000..50073a2c
--- /dev/null
+++ b/app-mini/mini/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkData":{"type":"FULL_SPLIT","splits":[{"filterType":"ABI","value":"arm64-v8a"}],"versionCode":210010000,"versionName":"1.0.0-BETA-1-tor-0.4.0.4-rc","enabled":true,"filterName":"arm64-v8a","outputFile":"Orbot-mini-1.0.0-BETA-1-tor-0.4.0.4-rc-mini-arm64-v8a-release.apk","fullName":"miniArm64-v8aRelease","baseName":"mini-arm64-v8a-release"},"path":"Orbot-mini-1.0.0-BETA-1-tor-0.4.0.4-rc-mini-arm64-v8a-release.apk","properties":{}},{"outputType":{"type":"APK"},"apkData":{"type":"FULL_SPLIT","splits":[{"filterType":"ABI","value":"x86"}],"versionCode":410010000,"versionName":"1.0.0-BETA-1-tor-0.4.0.4-rc","enabled":true,"filterName":"x86","outputFile":"Orbot-mini-1.0.0-BETA-1-tor-0.4.0.4-rc-mini-x86-release.apk","fullName":"miniX86Release","baseName":"mini-x86-release"},"path":"Orbot-mini-1.0.0-BETA-1-tor-0.4.0.4-rc-mini-x86-release.apk","properties":{}},{"outputType":{"type":"APK"},"apkData":{"type":"FULL_SPLIT","splits":[{"filterType":"ABI","value":"armea
 bi-v7a"}],"versionCode":110010000,"versionName":"1.0.0-BETA-1-tor-0.4.0.4-rc","enabled":true,"filterName":"armeabi-v7a","outputFile":"Orbot-mini-1.0.0-BETA-1-tor-0.4.0.4-rc-mini-armeabi-v7a-release.apk","fullName":"miniArmeabi-v7aRelease","baseName":"mini-armeabi-v7a-release"},"path":"Orbot-mini-1.0.0-BETA-1-tor-0.4.0.4-rc-mini-armeabi-v7a-release.apk","properties":{}},{"outputType":{"type":"APK"},"apkData":{"type":"FULL_SPLIT","splits":[{"filterType":"ABI","value":"x86_64"}],"versionCode":510010000,"versionName":"1.0.0-BETA-1-tor-0.4.0.4-rc","enabled":true,"filterName":"x86_64","outputFile":"Orbot-mini-1.0.0-BETA-1-tor-0.4.0.4-rc-mini-x86_64-release.apk","fullName":"miniX86_64Release","baseName":"mini-x86_64-release"},"path":"Orbot-mini-1.0.0-BETA-1-tor-0.4.0.4-rc-mini-x86_64-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app-mini/proguard-rules.txt b/app-mini/proguard-rules.txt
new file mode 100644
index 00000000..b1120f82
--- /dev/null
+++ b/app-mini/proguard-rules.txt
@@ -0,0 +1,14 @@
+-dontobfuscate
+# https://stackoverflow.com/questions/9651703/using-proguard-with-android-without-obfuscation
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*,!code/allocation/variable
+
+-keep class org.torproject.android.service.vpn.Tun2Socks {
+    void logTun2Socks(java.lang.String, java.lang.String, java.lang.String);
+}
+
+-keepattributes Signature
+-keepattributes Annotation
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-dontwarn okhttp3.**
+-dontwarn okio.**
\ No newline at end of file
diff --git a/app-mini/src/androidTest/org.torproject.android/AutomateScreenshotsTest b/app-mini/src/androidTest/org.torproject.android/AutomateScreenshotsTest
new file mode 100644
index 00000000..a64fa59a
--- /dev/null
+++ b/app-mini/src/androidTest/org.torproject.android/AutomateScreenshotsTest
@@ -0,0 +1,16 @@
+ at RunWith(JUnit4::class)
+class AutomateScreenshotsTest {
+  
+  @Before
+  fun setUp() {
+    ActivityScenario.launch(MainActivity::class.java)
+    Screengrab.setDefaultScreenshotStrategry(UiAutomatorScreenshotStrategy())
+  }
+  
+  @Test
+  fun captureScreen() {
+    // Delay 500 millis for app launch to main screen
+    Thread.sleep(500)
+    Screengrab.screenshot("main_screen")
+  }
+}
diff --git a/app-mini/src/debug/AndroidManifest.xml b/app-mini/src/debug/AndroidManifest.xml
new file mode 100644
index 00000000..cd6d8b66
--- /dev/null
+++ b/app-mini/src/debug/AndroidManifest.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="org.torproject.android.mini"
+    android:installLocation="internalOnly">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+    <!-- Some Chromebooks don't support touch. Although not essential,
+         it's a good idea to explicitly include this declaration. -->
+    <uses-feature android:name="android.hardware.touchscreen"
+        android:required="false" />
+
+    <application
+        android:name=".OrbotMiniApp"
+        android:allowBackup="false"
+        android:allowClearUserData="true"
+        android:configChanges="locale|orientation|screenSize"
+        android:description="@string/app_description"
+        android:hardwareAccelerated="false"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/DefaultTheme"
+        tools:replace="android:allowBackup"
+        >
+        <activity
+            android:name=".MiniMainActivity"
+            android:excludeFromRecents="false"
+            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="org.torproject.android.service.util.DummyActivity"
+            android:allowTaskReparenting="true"
+            android:alwaysRetainTaskState="false"
+            android:clearTaskOnLaunch="true"
+            android:enabled="true"
+            android:excludeFromRecents="true"
+            android:finishOnTaskLaunch="true"
+            android:noHistory="true"
+            android:stateNotNeeded="true"
+            android:theme="@android:style/Theme.Translucent" />
+        <activity
+            android:name=".vpn.VPNEnableActivity"
+            android:exported="false"
+            android:label="@string/app_name" />
+        <activity
+            android:name=".settings.SettingsPreferences"
+            android:label="@string/app_name" />
+        <activity
+            android:name=".ui.AppManagerActivity"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.AppCompat" />
+
+        <service
+            android:name="org.torproject.android.service.TorService"
+            android:enabled="true"
+            android:permission="android.permission.BIND_VPN_SERVICE"
+            android:stopWithTask="false"></service>
+        <service
+            android:name="org.torproject.android.service.vpn.TorVpnService"
+            android:enabled="true"
+            android:permission="android.permission.BIND_VPN_SERVICE">
+            <intent-filter>
+                <action android:name="android.net.VpnService" />
+            </intent-filter>
+        </service>
+
+        <receiver
+            android:name="org.torproject.android.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>
+
+
+
+
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="org.torproject.android.mini.ui.hiddenservices.storage"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/hidden_services_paths" />
+        </provider>
+
+
+
+        <activity android:name=".ui.onboarding.OnboardingActivity"/>
+        <activity android:name=".ui.onboarding.BridgeWizardActivity"/>
+
+
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/app-mini/src/main/AndroidManifest.xml b/app-mini/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..94f3f119
--- /dev/null
+++ b/app-mini/src/main/AndroidManifest.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="org.torproject.android.mini"
+    android:installLocation="internalOnly">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+    <!-- Some Chromebooks don't support touch. Although not essential,
+         it's a good idea to explicitly include this declaration. -->
+    <uses-feature android:name="android.hardware.touchscreen"
+        android:required="false" />
+
+    <application
+        android:name=".OrbotMiniApp"
+        android:allowBackup="false"
+        android:allowClearUserData="true"
+        android:configChanges="locale|orientation|screenSize"
+        android:description="@string/app_description"
+        android:hardwareAccelerated="false"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/DefaultTheme"
+        tools:replace="android:allowBackup"
+        >
+        <activity
+            android:name=".MiniMainActivity"
+            android:excludeFromRecents="false"
+            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>-->
+
+        </activity>
+
+        <!--         This is for ensuring the background service still runs when/if the app is swiped away -->
+        <activity
+            android:name="org.torproject.android.service.util.DummyActivity"
+            android:allowTaskReparenting="true"
+            android:alwaysRetainTaskState="false"
+            android:clearTaskOnLaunch="true"
+            android:enabled="true"
+            android:excludeFromRecents="true"
+            android:finishOnTaskLaunch="true"
+            android:noHistory="true"
+            android:stateNotNeeded="true"
+            android:theme="@android:style/Theme.Translucent" />
+        <activity
+            android:name=".vpn.VPNEnableActivity"
+            android:exported="false"
+            android:label="@string/app_name" />
+        <activity
+            android:name=".settings.SettingsPreferences"
+            android:label="@string/app_name" />
+        <activity
+            android:name=".ui.AppManagerActivity"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.AppCompat" />
+
+        <service
+            android:name="org.torproject.android.service.TorService"
+            android:enabled="true"
+            android:permission="android.permission.BIND_VPN_SERVICE"
+            android:stopWithTask="false"></service>
+        <service
+            android:name="org.torproject.android.service.vpn.TorVpnService"
+            android:enabled="true"
+            android:permission="android.permission.BIND_VPN_SERVICE">
+            <intent-filter>
+                <action android:name="android.net.VpnService" />
+            </intent-filter>
+        </service>
+
+        <receiver
+            android:name="org.torproject.android.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>
+
+
+
+
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="org.torproject.android.mini.ui.hiddenservices.storage"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/hidden_services_paths" />
+        </provider>
+
+
+
+        <activity android:name=".ui.onboarding.OnboardingActivity"/>
+        <activity android:name=".ui.onboarding.BridgeWizardActivity"/>
+
+
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/app-mini/src/main/assets/LICENSE b/app-mini/src/main/assets/LICENSE
new file mode 120000
index 00000000..14776154
--- /dev/null
+++ b/app-mini/src/main/assets/LICENSE
@@ -0,0 +1 @@
+../../../../LICENSE
\ No newline at end of file
diff --git a/app-mini/src/main/assets/arm/obfs4proxy b/app-mini/src/main/assets/arm/obfs4proxy
new file mode 100644
index 00000000..b766412f
--- /dev/null
+++ b/app-mini/src/main/assets/arm/obfs4proxy
@@ -0,0 +1 @@
+//empty
\ No newline at end of file
diff --git a/app-mini/src/main/assets/common/geoip b/app-mini/src/main/assets/common/geoip
new file mode 100644
index 00000000..e69de29b
diff --git a/app-mini/src/main/assets/common/geoip6 b/app-mini/src/main/assets/common/geoip6
new file mode 100644
index 00000000..e69de29b
diff --git a/app-mini/src/main/ic_launcher-web.png b/app-mini/src/main/ic_launcher-web.png
new file mode 100644
index 00000000..fe170c1e
Binary files /dev/null and b/app-mini/src/main/ic_launcher-web.png differ
diff --git a/app-mini/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java b/app-mini/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java
new file mode 100644
index 00000000..d5628e87
--- /dev/null
+++ b/app-mini/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-mini/src/main/java/com/google/zxing/integration/android/IntentResult.java b/app-mini/src/main/java/com/google/zxing/integration/android/IntentResult.java
new file mode 100644
index 00000000..2469af92
--- /dev/null
+++ b/app-mini/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-mini/src/main/java/org/torproject/android/mini/MainConstants.java b/app-mini/src/main/java/org/torproject/android/mini/MainConstants.java
new file mode 100644
index 00000000..b4d64147
--- /dev/null
+++ b/app-mini/src/main/java/org/torproject/android/mini/MainConstants.java
@@ -0,0 +1,15 @@
+package org.torproject.android.mini;
+
+public interface MainConstants {
+
+    //EXIT COUNTRY CODES
+    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"};
+
+    //path to check Tor against
+    String URL_TOR_CHECK = "https://check.torproject.org";
+
+    String URL_TOR_BRIDGES = "https://bridges.torproject.org/bridges?transport=";
+
+    int RESULT_CLOSE_ALL = 0;
+
+}
diff --git a/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java b/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java
new file mode 100644
index 00000000..4ab9939a
--- /dev/null
+++ b/app-mini/src/main/java/org/torproject/android/mini/MiniMainActivity.java
@@ -0,0 +1,1167 @@
+/* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - https://guardianproject.info */
+/* See LICENSE for licensing information */
+
+package org.torproject.android.mini;
+
+import android.app.ActivityManager;
+import android.app.ActivityManager.RunningServiceInfo;
+import android.app.AlertDialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+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.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.support.v4.content.LocalBroadcastManager;
+import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.SwitchCompat;
+import android.support.v7.widget.Toolbar;
+import android.text.Html;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnLongClickListener;
+import android.view.animation.AccelerateInterpolator;
+import android.widget.Button;
+import android.widget.CompoundButton;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.google.zxing.integration.android.IntentIntegrator;
+import com.google.zxing.integration.android.IntentResult;
+
+import org.json.JSONArray;
+import org.torproject.android.mini.settings.Languages;
+import org.torproject.android.mini.settings.LocaleHelper;
+import org.torproject.android.mini.settings.SettingsPreferences;
+import org.torproject.android.mini.ui.AppManagerActivity;
+import org.torproject.android.mini.ui.Rotate3dAnimation;
+import org.torproject.android.mini.ui.onboarding.OnboardingActivity;
+import org.torproject.android.mini.vpn.VPNEnableActivity;
+import org.torproject.android.service.OrbotConstants;
+import org.torproject.android.service.TorService;
+import org.torproject.android.service.TorServiceConstants;
+import org.torproject.android.service.util.Prefs;
+import org.torproject.android.service.util.TorServiceUtils;
+import org.torproject.android.service.vpn.VpnConstants;
+import org.torproject.android.service.vpn.VpnPrefs;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+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.Locale;
+import java.util.StringTokenizer;
+
+import static org.torproject.android.mini.MainConstants.RESULT_CLOSE_ALL;
+import static org.torproject.android.mini.MainConstants.URL_TOR_CHECK;
+import static org.torproject.android.service.vpn.VpnPrefs.PREFS_KEY_TORIFIED;
+import static org.torproject.android.service.vpn.VpnUtils.getSharedPrefs;
+
+public class MiniMainActivity extends AppCompatActivity
+        implements OrbotConstants, OnLongClickListener {
+
+    /* Useful UI bits */
+//    private TextView lblStatus = null; //the main text display widget
+    private ImageView imgStatus = null; //the main touchable image for activating Orbot
+
+    private TextView downloadText = null;
+    private TextView uploadText = null;
+    private TextView mTxtOrbotLog = null;
+
+	private SwitchCompat mBtnVPN = null;
+
+	private DrawerLayout mDrawer;
+
+    /* 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;
+    private final static int REQUEST_VPN_APPS_SELECT = 8889;
+
+    private final static int LOG_DRAWER_GRAVITY = Gravity.END;
+
+    // message types for mStatusUpdateHandler
+    private final static int STATUS_UPDATE = 1;
+    private static final int MESSAGE_TRAFFIC_COUNT = 2;
+    private static final int MESSAGE_PORTS = 3;
+
+
+    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";
+
+
+
+
+    /**
+     * 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));
+        lbm.registerReceiver(mLocalBroadcastReceiver,
+                new IntentFilter(TorServiceConstants.LOCAL_ACTION_PORTS));
+
+
+
+        boolean showFirstTime = mPrefs.getBoolean("connect_first_time", true);
+
+        if (showFirstTime)
+        {
+            Editor pEdit = mPrefs.edit();
+            pEdit.putBoolean("connect_first_time", false);
+            pEdit.commit();
+            startActivity(new Intent(this,OnboardingActivity.class));
+        }
+
+        /**
+         * Resets previous DNS Port to the default
+         */
+        getSharedPrefs(getApplicationContext()).edit().putInt(VpnPrefs.PREFS_DNS_PORT,
+                VpnConstants.TOR_DNS_PORT_DEFAULT).apply();
+
+    }
+
+	private void sendIntentToService(final String action) {
+
+		Intent torService = new Intent(MiniMainActivity.this, TorService.class);
+        torService.setAction(action);
+        startService(torService);
+
+	}
+
+    private void stopTor() {
+
+//        requestTorStatus();
+
+        Intent torService = new Intent(MiniMainActivity.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);
+            }
+            else if (action.equals(TorServiceConstants.LOCAL_ACTION_PORTS)) {
+
+                Message msg = mStatusUpdateHandler.obtainMessage(MESSAGE_PORTS);
+                msg.getData().putInt("socks",intent.getIntExtra(TorService.EXTRA_SOCKS_PROXY_PORT,-1));
+                msg.getData().putInt("http",intent.getIntExtra(TorService.EXTRA_HTTP_PROXY_PORT,-1));
+
+                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);
+
+        mTxtOrbotLog = (TextView)findViewById(R.id.orbotLog);
+
+        /**
+        lblStatus = (TextView)findViewById(R.id.lblStatus);
+        lblStatus.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mDrawer.openDrawer(LOG_DRAWER_GRAVITY);
+            }
+        });**/
+
+        imgStatus = (ImageView)findViewById(R.id.imgStatus);
+        imgStatus.setOnLongClickListener(this);
+
+        downloadText = (TextView)findViewById(R.id.trafficDown);
+        uploadText = (TextView)findViewById(R.id.trafficUp);
+
+     //   downloadText.setText(formatCount(0) + " / " + formatTotal(0)+ " \u2193");
+      //  uploadText.setText(formatCount(0) + " / " + formatTotal(0)+ " \u2191");
+
+        downloadText.setText(formatTotal(0) +" \u2193");
+        uploadText.setText(formatTotal(0) + " \u2191");
+
+
+        /**
+		mBtnStart =(Button)findViewById(R.id.btnStart);
+		mBtnStart.setOnClickListener(new View.OnClickListener()
+		{
+			@Override
+			public void onClick(View v) {
+
+				if (torStatus == TorServiceConstants.STATUS_OFF) {
+//					lblStatus.setText(getString(R.string.status_starting_up));
+					startTor();
+				} else {
+//					lblStatus.setText(getString(R.string.status_shutting_down));
+					stopTor();
+				}
+			}
+		});**/
+
+		mBtnVPN = (SwitchCompat)findViewById(R.id.btnVPN);
+		
+        boolean useVPN = Prefs.useVpn();
+        mBtnVPN.setChecked(useVPN);
+
+        //auto start VPN if VPN is enabled
+        if (useVPN) {
+            startActivity(new Intent(MiniMainActivity.this,VPNEnableActivity.class));
+        }
+
+        mBtnVPN.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                enableVPN(isChecked);
+            }
+        });
+
+
+    }
+
+    /**
+    private void setCountrySpinner ()
+    {
+        String currentExit = Prefs.getExitNodes();
+        if (currentExit.length() > 4)
+        {
+            //someone put a complex value in, so let's disable
+            ArrayList<String> cList = new ArrayList<String>();
+            cList.add(0, currentExit);
+            ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, cList);
+            spnCountries.setAdapter(adapter);
+            spnCountries.setEnabled(false);
+        }
+        else {
+            int selIdx = -1;
+
+            ArrayList<String> cList = new ArrayList<String>();
+            cList.add(0, getString(R.string.vpn_default_world));
+
+            for (int i = 0; i < COUNTRY_CODES.length; i++) {
+                Locale locale = new Locale("", COUNTRY_CODES[i]);
+                cList.add(locale.getDisplayCountry());
+
+                if (currentExit.contains(COUNTRY_CODES[i]))
+                    selIdx = i + 1;
+            }
+
+            ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, cList);
+            spnCountries.setAdapter(adapter);
+
+            if (selIdx > 0)
+                spnCountries.setSelection(selIdx,true);
+
+            spnCountries.setOnItemSelectedListener(new OnItemSelectedListener() {
+
+                int mOldPosition = spnCountries.getSelectedItemPosition();
+
+                @Override
+                public void onItemSelected(AdapterView<?> parentView, View selectedItemView, int position, long id) {
+                    // your code here
+
+                    if (mOldPosition == position)
+                        return;
+
+                    mOldPosition = position; //new position!
+
+                    String country = null;
+
+                    if (position == 0)
+                        country = "";
+                    else
+                        country = '{' + COUNTRY_CODES[position - 1] + '}';
+
+                    Intent torService = new Intent(MiniMainActivity.this, TorService.class);
+                    torService.setAction(TorServiceConstants.CMD_SET_EXIT);
+                    torService.putExtra("exit", country);
+                    startService(torService);
+
+                }
+
+                @Override
+                public void onNothingSelected(AdapterView<?> parentView) {
+                    // your code here
+                }
+
+            });
+        }
+    }**/
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleHelper.onAttach(base));
+    }
+
+   /*
+    * 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_newnym)
+        {
+            requestNewTorIdentity();
+        }
+    	 else if (item.getItemId() == R.id.menu_settings)
+         {
+             Intent intent = new Intent(MiniMainActivity.this, SettingsPreferences.class);
+             startActivityForResult(intent, REQUEST_SETTINGS);
+         }
+    	 /**
+         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(MiniMainActivity.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(MiniMainActivity.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 " + TorService.BINARY_TOR_VERSION + ")";
+            } catch (NameNotFoundException e) {
+                version = "Version Not Found";
+            }
+            
+            TextView versionName = (TextView)view.findViewById(R.id.versionName);
+            versionName.setText(version);
+
+            TextView aboutOther = (TextView)view.findViewById(R.id.aboutother);
+
+            try
+            {
+                String aboutText = readFromAssets(this,"LICENSE");
+                aboutText = aboutText.replace("\n","<br/>");
+                aboutOther.setText(Html.fromHtml(aboutText));
+            }
+            catch (Exception e){}
+            
+                    new AlertDialog.Builder(this)
+            .setTitle(getString(R.string.button_about))
+            .setView(view)
+            .show();
+        }
+
+    private static String readFromAssets(Context context, String filename) throws IOException {
+        BufferedReader reader = new BufferedReader(new InputStreamReader(context.getAssets().open(filename)));
+
+        // do reading, usually loop until end of file reading
+        StringBuilder sb = new StringBuilder();
+        String mLine = reader.readLine();
+        while (mLine != null) {
+            sb.append(mLine + '\n'); // process line
+            mLine = reader.readLine();
+        }
+        reader.close();
+        return sb.toString();
+    }
+
+
+    /**
+     * 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
+		}
+	}
+
+
+    @Override
+    public void onBackPressed() {
+        // check to see if the log is open, if so close it
+        if (mDrawer.isDrawerOpen(LOG_DRAWER_GRAVITY)) {
+            mDrawer.closeDrawers();
+        }
+        else {
+            super.onBackPressed();
+        }
+    }
+
+	private void refreshVPNApps ()
+    {
+        stopVpnService();
+        startActivity(new Intent(MiniMainActivity.this, VPNEnableActivity.class));
+    }
+
+    private void enableVPN (boolean enable)
+    {
+        Prefs.putUseVpn(enable);
+
+        if (enable) {
+            startActivityForResult(new Intent(MiniMainActivity.this, VPNEnableActivity.class), REQUEST_VPN);
+        } else
+            stopVpnService();
+
+        addAppShortcuts();
+    }
+
+
+    private synchronized void handleIntents() {
+        if (getIntent() == null)
+            return;
+
+        // Get intent, action and MIME type
+        Intent intent = getIntent();
+        String action = intent.getAction();
+
+        if (action == null)
+            return;
+
+        switch (action) {
+
+            case 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);
+                    }
+                }
+                break;
+        }
+
+        updateStatus(null, torStatus);
+
+        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, String pkgId) {
+		if (pkgId != null) {
+            startIntent(pkgId,Intent.ACTION_VIEW,Uri.parse(browserLaunchUrl));
+        }
+		else if (mBtnVPN.isChecked()||forceExternal) {
+			//use the system browser since VPN is on
+			startIntent(null,Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl));
+		}
+	}
+
+    private void startIntent (String pkg, String action, Uri data)
+    {
+        Intent i;
+		PackageManager pm = getPackageManager();
+
+        try {
+			if (pkg != null) {
+				i = pm.getLaunchIntentForPackage(pkg);
+				if (i == null)
+					throw new PackageManager.NameNotFoundException();
+			}
+			else
+			{
+				i = new Intent();
+			}
+
+            i.setAction(action);
+            i.setData(data);
+
+			if (i.resolveActivity(pm)!=null)
+				startActivity(i);
+
+        } catch (PackageManager.NameNotFoundException e) {
+
+        }
+    }
+    
+    @Override
+    protected void onActivityResult(int request, int response, Intent data) {
+        super.onActivityResult(request, response, data);
+
+        if (request == REQUEST_SETTINGS && response == RESULT_OK)
+        {
+            if (data != null && (!TextUtils.isEmpty(data.getStringExtra("locale")))) {
+
+                String newLocale = data.getStringExtra("locale");
+                Prefs.setDefaultLocale(newLocale);
+                Languages.setLanguage(this, newLocale, true);
+              //  Language.setFromPreference(this, "pref_default_locale");
+
+                finish();
+
+                final Handler handler = new Handler();
+                handler.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        //Do something after 100ms
+                        startActivity(new Intent(MiniMainActivity.this, MiniMainActivity.class));
+
+                    }
+                }, 1000);
+
+
+            }
+        }
+        else if (request == REQUEST_VPN)
+        {
+			if (response == RESULT_OK) {
+                sendIntentToService(TorServiceConstants.CMD_VPN);
+            }
+			else if (response == VPNEnableActivity.ACTIVITY_RESULT_VPN_DENIED)
+			{
+			    mBtnVPN.setChecked(false);
+				Prefs.putUseVpn(false);
+			}
+        }
+        else if (request == REQUEST_VPN_APPS_SELECT)
+        {
+            if (response == RESULT_OK &&
+                    torStatus == TorServiceConstants.STATUS_ON)
+                refreshVPNApps();
+
+        }
+        
+        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 ()
+    {
+
+        if (mBtnBridges.isChecked())
+        {
+            Prefs.putBridgesEnabled(true);
+            startActivity(new Intent(this, BridgeWizardActivity.class));
+        }
+        else
+        {
+        	enableBridges(false);
+        }
+        
+    }**/
+    
+
+    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);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+//        mBtnBridges.setChecked(Prefs.bridgesEnabled());
+        mBtnVPN.setChecked(Prefs.useVpn());
+
+//        setCountrySpinner();
+
+		requestTorStatus();
+
+		if (torStatus == null)
+		    updateStatus("", TorServiceConstants.STATUS_STOPPING);
+        else
+            updateStatus(null, torStatus);
+
+           addAppShortcuts();
+
+           //now you can handle the intents properly
+           handleIntents();
+
+       }
+
+    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(MiniMainActivity.this)
+                     .setIcon(R.drawable.onion32)
+             .setTitle(title)
+             .setMessage(msg)
+             .setPositiveButton(R.string.btn_okay, null)
+             .show();
+             }
+             else
+             {
+                     aDialog = new AlertDialog.Builder(MiniMainActivity.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 synchronized void updateStatus(String torServiceMsg, String newTorStatus) {
+
+        if (!TextUtils.isEmpty(torServiceMsg))
+        {
+            if (torServiceMsg.contains(TorServiceConstants.LOG_NOTICE_HEADER)) {
+           //     lblStatus.setText(torServiceMsg);
+            }
+
+            mTxtOrbotLog.append(torServiceMsg + '\n');
+
+        }
+
+        if (torStatus == null || (newTorStatus != null && newTorStatus.equals(torStatus))) {
+            torStatus = newTorStatus;
+            return;
+        }
+    	else
+    	    torStatus = newTorStatus;
+
+        if (torStatus == TorServiceConstants.STATUS_ON) {
+        	
+            imgStatus.setImageResource(R.drawable.toron);
+
+            //lblStatus.setText(getString(R.string.status_activated));
+
+            if (autoStartFromIntent)
+            {
+                autoStartFromIntent = false;
+                Intent resultIntent = lastStatusIntent;
+
+                if (resultIntent == null)
+                    resultIntent = new Intent(TorServiceConstants.ACTION_START);
+
+                resultIntent.putExtra(
+                        TorServiceConstants.EXTRA_STATUS,
+                        torStatus == null?TorServiceConstants.STATUS_OFF: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));
+
+
+        } 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);
+
+        } else if (torStatus == TorServiceConstants.STATUS_OFF) {
+
+            imgStatus.setImageResource(R.drawable.toroff);
+  //          lblStatus.setText("Tor v" + TorService.BINARY_TOR_VERSION);
+
+
+        }
+
+
+    }
+
+    /**
+     * Starts tor and related daemons by sending an
+     * {@link TorServiceConstants#ACTION_START} {@link Intent} to
+     * {@link TorService}
+     */
+    private void startTor() {
+        sendIntentToService(TorServiceConstants.ACTION_START);
+        mTxtOrbotLog.setText("");
+    }
+    
+    /**
+     * 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) {
+            startTor();
+        } else {
+            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) {
+
+
+            Bundle data = msg.getData();
+
+            switch (msg.what) {
+                case MESSAGE_TRAFFIC_COUNT:
+
+                    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));
+
+                    downloadText.setText(formatTotal(totalRead) +" \u2193");
+                    uploadText.setText(formatTotal(totalWrite) + " \u2191");
+
+                    break;
+                case MESSAGE_PORTS:
+
+                    int socksPort = data.getInt("socks");
+                    int httpPort = data.getInt("http");
+
+                    break;
+                default:
+                    String newTorStatus = msg.getData().getString("status");
+                    String log = (String)msg.obj;
+
+                    if (torStatus == null && newTorStatus != null) //first time status
+                    {
+                        findViewById(R.id.frameMain).setVisibility(View.VISIBLE);
+                        updateStatus(log, newTorStatus);
+
+                    }
+                    else
+                        updateStatus(log, newTorStatus);
+                    super.handleMessage(msg);
+                    break;
+            }
+        }
+    };
+
+    @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(
+                    (int)(((float)count)) * 10f / 1024f / 10f)
+                    )
+                    + getString(R.string.kb);
+        else
+            return numberFormat.format(Math
+                    .round(
+                            ((float)count)) * 100f / 1024f / 1024f / 100f
+                        )
+                    + 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;
+
+    private void requestNewTorIdentity ()
+    {
+        sendIntentToService (TorServiceConstants.CMD_NEWNYM);
+
+        Rotate3dAnimation rotation = new Rotate3dAnimation(ROTATE_FROM, ROTATE_TO, 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);
+//        lblStatus.setText(getString(R.string.newnym));
+    }
+
+    private void addAppShortcuts() {
+
+        LinearLayout llBoxShortcuts = findViewById(R.id.frameMain);
+
+        PackageManager pMgr = getPackageManager();
+
+        llBoxShortcuts.removeAllViews();
+
+
+            if (Prefs.useVpn()) {
+                ArrayList<String> pkgIds = new ArrayList<>();
+                String tordAppString = mPrefs.getString(PREFS_KEY_TORIFIED, "");
+
+                if (TextUtils.isEmpty(tordAppString)) {
+                    addFullDeviceVpnView(llBoxShortcuts);
+                } else {
+                    StringTokenizer st = new StringTokenizer(tordAppString, "|");
+                    while (st.hasMoreTokens() && pkgIds.size() < 4)
+                        pkgIds.add(st.nextToken());
+                    int appsAdded = 0;
+                    for (final String pkgId : pkgIds) {
+                        try {
+                            ApplicationInfo aInfo = getPackageManager().getApplicationInfo(pkgId, 0);
+                            // skip disabled packages
+                            if (!aInfo.enabled) continue;
+                            ImageView iv = new ImageView(this);
+                            LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+                            params.setMargins(3, 3, 3, 3);
+                            iv.setLayoutParams(params);
+                            iv.setImageDrawable(pMgr.getApplicationIcon(pkgId));
+
+                            iv.setOnClickListener(new View.OnClickListener() {
+                                @Override
+                                public void onClick(View v) {
+                                    openBrowser(URL_TOR_CHECK, false, pkgId);
+                                }
+                            });
+
+                            llBoxShortcuts.addView(iv);
+                            appsAdded++;
+                        } catch (Exception e) {
+                            //package not installed?
+                        }
+                    }
+                    if (appsAdded == 0) {
+
+                        addFullDeviceVpnView(llBoxShortcuts);
+                    }
+                }
+            }
+            else
+            {
+                TextView tv = new TextView(this);
+                LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+                params.setMargins(12, 3, 3, 3);
+                tv.setLayoutParams(params);
+                tv.setText(R.string.vpn_disabled);
+                llBoxShortcuts.addView(tv);
+            }
+
+            //now add app edit/add shortcut
+            ImageView iv = new ImageView(this);
+            LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+            params.setMargins(3, 3, 3, 3);
+            iv.setLayoutParams(params);
+            iv.setImageDrawable(getResources().getDrawable(R.drawable.ic_settings_white_24dp));
+            llBoxShortcuts.addView(iv);
+            iv.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    startActivityForResult(new Intent(MiniMainActivity.this, AppManagerActivity.class), REQUEST_VPN_APPS_SELECT);
+
+                }
+            });
+
+
+    }
+
+    private void addFullDeviceVpnView(LinearLayout llBoxShortcuts) {
+        TextView tv = new TextView(this);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+        params.setMargins(12, 3, 3, 3);
+        tv.setLayoutParams(params);
+        tv.setText(R.string.full_device_vpn);
+        llBoxShortcuts.addView(tv);
+    }
+
+}
diff --git a/app-mini/src/main/java/org/torproject/android/mini/OnBootReceiver.java b/app-mini/src/main/java/org/torproject/android/mini/OnBootReceiver.java
new file mode 100644
index 00000000..6ddaf47e
--- /dev/null
+++ b/app-mini/src/main/java/org/torproject/android/mini/OnBootReceiver.java
@@ -0,0 +1,57 @@
+package org.torproject.android.mini;
+
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+
+import org.torproject.android.service.util.Prefs;
+import org.torproject.android.service.TorService;
+import org.torproject.android.service.TorServiceConstants;
+import org.torproject.android.mini.vpn.VPNEnableActivity;
+
+public class OnBootReceiver extends BroadcastReceiver {
+
+	private static boolean sReceivedBoot = false;
+
+	@Override
+	public void onReceive(Context context, Intent intent) {
+
+		if (Prefs.startOnBoot() && (!sReceivedBoot))
+		{
+			if (Prefs.useVpn())
+				startVpnService(context); //VPN will start Tor once it is done
+			else
+				startService(TorServiceConstants.ACTION_START, context);
+
+			sReceivedBoot = true;
+		}
+	}
+	
+	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);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+			context.startForegroundService(torService);
+		}
+		else
+		{
+			context.startService(torService);
+		}
+
+	}
+	
+	
+}
+
diff --git a/app-mini/src/main/java/org/torproject/android/mini/OrbotMiniApp.java b/app-mini/src/main/java/org/torproject/android/mini/OrbotMiniApp.java
new file mode 100644
index 00000000..95e867cf
--- /dev/null
+++ b/app-mini/src/main/java/org/torproject/android/mini/OrbotMiniApp.java
@@ -0,0 +1,111 @@
+
+package org.torproject.android.mini;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.app.Application;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.support.v4.app.NotificationCompat;
+
+import com.github.javiersantos.appupdater.AppUpdater;
+import com.github.javiersantos.appupdater.enums.Display;
+import com.github.javiersantos.appupdater.enums.UpdateFrom;
+
+import org.torproject.android.service.OrbotConstants;
+import org.torproject.android.service.util.Prefs;
+
+import org.torproject.android.mini.settings.Languages;
+import org.torproject.android.mini.settings.LocaleHelper;
+
+import java.util.Locale;
+
+
+public class OrbotMiniApp extends Application implements OrbotConstants {
+
+    private Locale locale;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        Languages.setup(MiniMainActivity.class, R.string.menu_settings);
+
+        if (!Prefs.getDefaultLocale().equals(Locale.getDefault().getLanguage())) {
+            Languages.setLanguage(this, Prefs.getDefaultLocale(), true);
+        }
+
+        //check for updates via github, since it is unlikely to be blocked; notify the user of places where upgrades can be found
+        new AppUpdater(this)
+                .setUpdateFrom(UpdateFrom.JSON)
+                .setUpdateJSON("https://raw.githubusercontent.com/n8fr8/orbot/master/update.json")
+                .setDisplay(Display.NOTIFICATION).start();
+    }
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        Prefs.setContext(base);
+        super.attachBaseContext(LocaleHelper.onAttach(base, Prefs.getDefaultLocale()));
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+
+        if (!Prefs.getDefaultLocale().equals(Locale.getDefault().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);
+    }
+
+
+    @SuppressLint("NewApi")
+    protected void showToolbarNotification (String shortMsg, String notifyMsg, int notifyId, int icon)
+    {
+
+        NotificationCompat.Builder notifyBuilder;
+
+        //Reusable code.
+        PackageManager pm = getPackageManager();
+        Intent intent = pm.getLaunchIntentForPackage(getPackageName());
+        PendingIntent pendIntent = PendingIntent.getActivity(this, 0, intent, 0);
+
+        NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+
+        notifyBuilder = new NotificationCompat.Builder(this)
+                .setContentTitle(getString(org.torproject.android.service.R.string.app_name));
+
+
+        notifyBuilder.setContentIntent(pendIntent);
+
+        notifyBuilder.setContentText(shortMsg);
+        notifyBuilder.setSmallIcon(icon);
+        notifyBuilder.setTicker(notifyMsg);
+
+        notifyBuilder.setOngoing(false);
+
+        notifyBuilder.setStyle(new NotificationCompat.BigTextStyle()
+                .bigText(notifyMsg).setBigContentTitle(getString(org.torproject.android.service.R.string.app_name)));
+
+        Notification notification = notifyBuilder.build();
+
+        notificationManager.notify(notifyId, notification);
+    }
+}
diff --git a/app/src/main/java/org/torproject/android/settings/Languages.java b/app-mini/src/main/java/org/torproject/android/mini/settings/Languages.java
similarity index 99%
rename from app/src/main/java/org/torproject/android/settings/Languages.java
rename to app-mini/src/main/java/org/torproject/android/mini/settings/Languages.java
index 05ae96ce..5fe04a62 100644
--- a/app/src/main/java/org/torproject/android/settings/Languages.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/settings/Languages.java
@@ -1,4 +1,4 @@
-package org.torproject.android.settings;
+package org.torproject.android.mini.settings;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
diff --git a/app/src/main/java/org/torproject/android/settings/LocaleHelper.java b/app-mini/src/main/java/org/torproject/android/mini/settings/LocaleHelper.java
similarity index 95%
rename from app/src/main/java/org/torproject/android/settings/LocaleHelper.java
rename to app-mini/src/main/java/org/torproject/android/mini/settings/LocaleHelper.java
index 4d5f79d7..2d84e988 100644
--- a/app/src/main/java/org/torproject/android/settings/LocaleHelper.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/settings/LocaleHelper.java
@@ -1,12 +1,10 @@
-package org.torproject.android.settings;
+package org.torproject.android.mini.settings;
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Build;
-import android.preference.PreferenceManager;
 
 import org.torproject.android.service.util.Prefs;
 
diff --git a/app-mini/src/main/java/org/torproject/android/mini/settings/SettingsPreferences.java b/app-mini/src/main/java/org/torproject/android/mini/settings/SettingsPreferences.java
new file mode 100644
index 00000000..f551f306
--- /dev/null
+++ b/app-mini/src/main/java/org/torproject/android/mini/settings/SettingsPreferences.java
@@ -0,0 +1,73 @@
+/* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - http://openideals.com/guardian */
+/* See LICENSE for licensing information */
+
+package org.torproject.android.mini.settings;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.preference.EditTextPreference;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceScreen;
+import android.view.inputmethod.EditorInfo;
+import android.widget.EditText;
+
+import org.torproject.android.mini.R;
+
+public class SettingsPreferences extends PreferenceActivity {
+    private ListPreference prefLocale = null;
+
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        addPreferencesFromResource(R.xml.preferences);
+        setNoPersonalizedLearningOnEditTextPreferences();
+        getPreferenceManager().setSharedPreferencesMode(Context.MODE_MULTI_PROCESS);
+
+        prefLocale = (ListPreference) findPreference("pref_default_locale");
+
+        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;
+                Intent intentResult = new Intent();
+                intentResult.putExtra("locale", language);
+                setResult(RESULT_OK, intentResult);
+                finish();
+                return false;
+            }
+        });
+    }
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleHelper.onAttach(base));
+    }
+
+    private void setNoPersonalizedLearningOnEditTextPreferences() {
+        PreferenceScreen preferenceScreen = getPreferenceScreen();
+        int categoryCount = preferenceScreen.getPreferenceCount();
+        for (int i = 0; i < categoryCount; i++) {
+            Preference p = preferenceScreen.getPreference(i);
+            if (p instanceof PreferenceCategory) {
+                PreferenceCategory pc = (PreferenceCategory) p;
+                int preferenceCount = pc.getPreferenceCount();
+                for (int j = 0; j < preferenceCount; j++) {
+                    p = pc.getPreference(j);
+                    if (p instanceof EditTextPreference) {
+                        EditText editText = ((EditTextPreference) p).getEditText();
+                        editText.setImeOptions(editText.getImeOptions() | EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING);
+                    }
+                }
+            }
+        }
+    }
+
+}
diff --git a/app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java b/app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java
new file mode 100644
index 00000000..5c61db99
--- /dev/null
+++ b/app-mini/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java
@@ -0,0 +1,343 @@
+/* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - http://openideals.com/guardian */
+/* See LICENSE for licensing information */
+
+package org.torproject.android.mini.ui;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import org.torproject.android.mini.R;
+import org.torproject.android.service.OrbotConstants;
+import org.torproject.android.service.util.TorServiceUtils;
+import org.torproject.android.service.vpn.TorifiedApp;
+
+import android.Manifest;
+import android.content.Intent;
+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.AsyncTask;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.CheckBox;
+import android.widget.GridView;
+import android.widget.ImageView;
+import android.widget.ListAdapter;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import static org.torproject.android.service.vpn.VpnPrefs.PREFS_KEY_TORIFIED;
+
+public class AppManagerActivity extends AppCompatActivity implements OnClickListener, OrbotConstants {
+
+    private GridView listApps;
+    private ListAdapter adapterApps;
+    private ProgressBar progressBar;
+    PackageManager pMgr = null;
+
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        pMgr = getPackageManager();
+
+        this.setContentView(R.layout.layout_apps);
+        setTitle(R.string.apps_mode);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        listApps = findViewById(R.id.applistview);
+        progressBar = findViewById(R.id.progressBar);
+    }
+
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
+        reloadApps();
+    }
+
+
+    /*
+     * 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.app_main, menu);
+        return true;
+    }
+
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+
+        if (item.getItemId() == R.id.menu_refresh_apps)
+        {
+            mApps = null;
+            reloadApps();
+        }
+        else if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void reloadApps () {
+        new AsyncTask<Void, Void, Void>() {
+            protected void onPreExecute() {
+                // Pre Code
+                progressBar.setVisibility(View.VISIBLE);
+            }
+            protected Void doInBackground(Void... unused) {
+                loadApps(mPrefs);
+                return null;
+            }
+            protected void onPostExecute(Void unused) {
+                listApps.setAdapter(adapterApps);
+                progressBar.setVisibility(View.GONE);
+            }
+        }.execute();
+
+
+    }
+
+    SharedPreferences mPrefs = null;
+    static ArrayList<TorifiedApp> mApps = null;
+
+    private void loadApps (SharedPreferences prefs) {
+        if (mApps == null)
+            mApps = getApps(prefs);
+
+        Collections.sort(mApps,new Comparator<TorifiedApp>() {
+            public int compare(TorifiedApp o1, TorifiedApp o2) {
+                /* Some apps start with lowercase letters and without the sorting being case
+                   insensitive they'd appear at the end of the grid of apps, a position where users
+                   would likely not expect to find them.
+                 */
+                if (o1.isTorified() == o2.isTorified())
+                    return o1.getName().compareToIgnoreCase(o2.getName());
+                if (o1.isTorified()) return -1;
+                return 1;
+            }
+        });
+
+        final LayoutInflater inflater = getLayoutInflater();
+
+        adapterApps = new ArrayAdapter<TorifiedApp>(this, R.layout.layout_apps_item, R.id.itemtext,mApps) {
+
+            @Override
+            public View getView(int position, View convertView, ViewGroup parent) {
+
+                ListEntry entry = null;
+
+                if (convertView == null)
+                    convertView = inflater.inflate(R.layout.layout_apps_item, parent, false);
+                else
+                    entry = (ListEntry) convertView.getTag();
+
+                if (entry == null) {
+                    // Inflate a new view
+                    entry = new ListEntry();
+                    entry.icon = convertView.findViewById(R.id.itemicon);
+                    entry.box = convertView.findViewById(R.id.itemcheck);
+                    entry.text = convertView.findViewById(R.id.itemtext);
+                    convertView.setTag(entry);
+                }
+
+                final TorifiedApp app = mApps.get(position);
+
+                if (entry.icon != null) {
+
+                    try {
+                        entry.icon.setImageDrawable(pMgr.getApplicationIcon(app.getPackageName()));
+                        entry.icon.setOnClickListener(AppManagerActivity.this);
+                        entry.icon.setTag(entry.box);
+                    }
+                    catch (Exception e)
+                    {
+                        e.printStackTrace();
+                    }
+                }
+
+                if (entry.text != null) {
+                    entry.text.setText(app.getName());
+                    entry.text.setOnClickListener(AppManagerActivity.this);
+                    entry.text.setTag(entry.box);
+                }
+
+                if (entry.box != null) {
+                    entry.box.setOnClickListener(AppManagerActivity.this);
+                    entry.box.setChecked(app.isTorified());
+                    entry.box.setTag(app);
+                }
+
+                return convertView;
+            }
+        };
+
+
+    }
+
+    private static class ListEntry {
+        private CheckBox box;
+        private TextView text;
+        private ImageView icon;
+    }
+
+    public ArrayList<TorifiedApp> getApps(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);
+
+        List<ApplicationInfo> lAppInfo = pMgr.getInstalledApplications(0);
+
+        Iterator<ApplicationInfo> itAppInfo = lAppInfo.iterator();
+
+        ArrayList<TorifiedApp> apps = new ArrayList<>();
+
+        ApplicationInfo aInfo;
+
+        TorifiedApp app;
+
+        while (itAppInfo.hasNext())
+        {
+            aInfo = itAppInfo.next();
+            // don't include apps user has disabled, often these ship with the device
+            if (!aInfo.enabled) continue;
+            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(Manifest.permission.INTERNET))
+                        {
+                            app.setUsesInternet(true);
+                        }
+                    }
+
+                }
+
+
+            } catch (Exception e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+
+            try
+            {
+                app.setName(pMgr.getApplicationLabel(aInfo).toString());
+            }
+            catch (Exception e)
+            {
+                // no name
+                continue; //we only show apps with names
+            }
+
+
+            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);
+
+
+            // check if this application is allowed
+            if (Arrays.binarySearch(tordApps, app.getUsername()) >= 0) {
+                app.setTorified(true);
+            }
+            else
+            {
+                app.setTorified(false);
+            }
+
+        }
+
+        Collections.sort(apps);
+
+        return apps;
+    }
+
+
+    public void saveAppSettings() {
+
+        StringBuilder tordApps = new StringBuilder();
+        Intent response = new Intent();
+
+        for (TorifiedApp tApp:mApps)
+        {
+            if (tApp.isTorified())
+            {
+                tordApps.append(tApp.getUsername());
+                tordApps.append("|");
+                response.putExtra(tApp.getUsername(),true);
+            }
+        }
+
+        Editor edit = mPrefs.edit();
+        edit.putString(PREFS_KEY_TORIFIED, tordApps.toString());
+        edit.commit();
+
+        setResult(RESULT_OK,response);
+    }
+
+
+    public void onClick(View v) {
+
+        CheckBox cbox = null;
+
+        if (v instanceof CheckBox)
+            cbox = (CheckBox)v;
+        else if (v.getTag() instanceof CheckBox)
+            cbox = (CheckBox)v.getTag();
+
+        if (cbox != null) {
+            final TorifiedApp app = (TorifiedApp) cbox.getTag();
+            if (app != null) {
+                app.setTorified(!app.isTorified());
+                cbox.setChecked(app.isTorified());
+            }
+
+            saveAppSettings();
+        }
+    }
+}
diff --git a/app/src/main/java/org/torproject/android/ui/NoPersonalizedLearningEditText.java b/app-mini/src/main/java/org/torproject/android/mini/ui/NoPersonalizedLearningEditText.java
similarity index 91%
rename from app/src/main/java/org/torproject/android/ui/NoPersonalizedLearningEditText.java
rename to app-mini/src/main/java/org/torproject/android/mini/ui/NoPersonalizedLearningEditText.java
index 15d8d023..a5d67d79 100644
--- a/app/src/main/java/org/torproject/android/ui/NoPersonalizedLearningEditText.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/ui/NoPersonalizedLearningEditText.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui;
+package org.torproject.android.mini.ui;
 
 import android.content.Context;
 import android.support.v7.widget.AppCompatEditText;
diff --git a/app/src/main/java/org/torproject/android/ui/Rotate3dAnimation.java b/app-mini/src/main/java/org/torproject/android/mini/ui/Rotate3dAnimation.java
similarity index 98%
rename from app/src/main/java/org/torproject/android/ui/Rotate3dAnimation.java
rename to app-mini/src/main/java/org/torproject/android/mini/ui/Rotate3dAnimation.java
index 7829d2db..ac8de549 100644
--- a/app/src/main/java/org/torproject/android/ui/Rotate3dAnimation.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/ui/Rotate3dAnimation.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui;
+package org.torproject.android.mini.ui;
 
 import android.graphics.Camera;
 import android.graphics.Matrix;
diff --git a/app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/BridgeWizardActivity.java b/app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/BridgeWizardActivity.java
new file mode 100644
index 00000000..8a85714d
--- /dev/null
+++ b/app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/BridgeWizardActivity.java
@@ -0,0 +1,223 @@
+package org.torproject.android.mini.ui.onboarding;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.text.TextUtils;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.RadioButton;
+import android.widget.TextView;
+
+import org.torproject.android.mini.R;
+import org.torproject.android.service.util.Prefs;
+import org.torproject.android.mini.settings.LocaleHelper;
+
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketAddress;
+
+import static org.torproject.android.mini.MainConstants.URL_TOR_BRIDGES;
+
+public class BridgeWizardActivity extends AppCompatActivity {
+
+    private TextView tvStatus;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_bridge_wizard);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        tvStatus = findViewById(R.id.lbl_bridge_test_status);
+        tvStatus.setVisibility(View.GONE);
+
+        setTitle(getString(R.string.bridges));
+
+        RadioButton btnDirect = findViewById(R.id.btnBridgesDirect);
+        btnDirect.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Prefs.setBridgesList("");
+                Prefs.putBridgesEnabled(false);
+                testBridgeConnection();
+            }
+        });
+
+        RadioButton btnObfs4 = findViewById(R.id.btnBridgesObfs4);
+        btnObfs4.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Prefs.setBridgesList("obfs4");
+                Prefs.putBridgesEnabled(true);
+                testBridgeConnection();
+            }
+        });
+
+
+        RadioButton btnMeek = findViewById(R.id.btnBridgesMeek);
+        btnMeek.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Prefs.setBridgesList("meek");
+                Prefs.putBridgesEnabled(true);
+                testBridgeConnection();
+            }
+        });
+
+
+        RadioButton btnNew = findViewById(R.id.btnBridgesNew);
+        btnNew.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showGetBridgePrompt();
+            }
+        });
+
+        if (!Prefs.bridgesEnabled())
+            btnDirect.setChecked(true);
+        else if (Prefs.getBridgesList().equals("meek"))
+            btnMeek.setChecked(true);
+        else if (Prefs.getBridgesList().equals("obfs4"))
+            btnObfs4.setChecked(true);
+
+    }
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleHelper.onAttach(base));
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+
+    private void showGetBridgePrompt() {
+        new AlertDialog.Builder(this)
+                .setTitle(R.string.bridge_mode)
+                .setMessage(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_)
+                .setNegativeButton(R.string.btn_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();
+                    }
+
+                })
+                .setPositiveButton(R.string.get_bridges_web, new Dialog.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        openBrowser(URL_TOR_BRIDGES, true);
+                    }
+                }).show();
+    }
+
+    private void sendGetBridgeEmail() {
+        String email = "bridges at torproject.org";
+        Uri emailUri = Uri.parse("mailto:" + email);
+        Intent emailIntent = new Intent(Intent.ACTION_SENDTO, emailUri);
+        emailIntent.putExtra(Intent.EXTRA_SUBJECT, "get transport");
+        emailIntent.putExtra(Intent.EXTRA_TEXT, "get transport");
+        startActivity(Intent.createChooser(emailIntent, getString(R.string.send_email)));
+    }
+
+
+    /*
+     * Launch the system activity for Uri viewing with the provided url
+     */
+    private void openBrowser(final String browserLaunchUrl, boolean forceExternal) {
+        startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl)));
+    }
+
+
+    private void testBridgeConnection() {
+        if (TextUtils.isEmpty(Prefs.getBridgesList()) || (!Prefs.bridgesEnabled())) {
+            new HostTester().execute("check.torproject.org", "443");
+        } else if (Prefs.getBridgesList().equals("meek")) {
+            new HostTester().execute("meek.azureedge.net", "443", "d2cly7j4zqgua7.cloudfront.net", "443");
+        } else if (Prefs.getBridgesList().equals("obfs4")) {
+            new HostTester().execute("85.17.30.79", "443", "154.35.22.9", "443", "192.99.11.54", "443");
+        } else {
+            tvStatus.setText("");
+        }
+    }
+
+    private class HostTester extends AsyncTask<String, Void, Boolean> {
+        @Override
+        protected void onPreExecute() {
+            // Pre Code
+            tvStatus.setVisibility(View.VISIBLE);
+            tvStatus.setText(R.string.testing_bridges);
+        }
+
+        @Override
+        protected Boolean doInBackground(String... host) {
+            // Background Code
+            boolean result = false;
+
+            for (int i = 0; i < host.length; i++) {
+                String testHost = host[i];
+                i++; //move to the port
+                int testPort = Integer.parseInt(host[i]);
+                result = isHostReachable(testHost, testPort, 10000);
+                if (result)
+                    return result;
+            }
+
+            return result;
+        }
+
+        @Override
+        protected void onPostExecute(Boolean result) {
+            // Post Code
+            if (result) {
+                tvStatus.setText(R.string.testing_bridges_success);
+
+            } else {
+                tvStatus.setText(R.string.testing_bridges_fail);
+
+            }
+        }
+    }
+
+    private static boolean isHostReachable(String serverAddress, int serverTCPport, int timeoutMS) {
+        boolean connected = false;
+        Socket socket;
+        try {
+            socket = new Socket();
+            SocketAddress socketAddress = new InetSocketAddress(serverAddress, serverTCPport);
+            socket.connect(socketAddress, timeoutMS);
+            if (socket.isConnected()) {
+                connected = true;
+                socket.close();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            socket = null;
+        }
+        return connected;
+    }
+}
diff --git a/app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/CustomSlideBigText.java b/app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/CustomSlideBigText.java
new file mode 100644
index 00000000..133b3241
--- /dev/null
+++ b/app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/CustomSlideBigText.java
@@ -0,0 +1,82 @@
+package org.torproject.android.mini.ui.onboarding;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import org.torproject.android.mini.R;
+
+
+public class CustomSlideBigText extends Fragment {
+
+    private static final String ARG_LAYOUT_RES_ID = "layoutResId";
+    private int layoutResId;
+    private String mTitle;
+    private String mButtonText;
+    private String mSubTitle;
+    private View.OnClickListener mButtonListener;
+
+    public static CustomSlideBigText newInstance(int layoutResId) {
+        CustomSlideBigText sampleSlide = new CustomSlideBigText();
+
+        Bundle args = new Bundle();
+        args.putInt(ARG_LAYOUT_RES_ID, layoutResId);
+        sampleSlide.setArguments(args);
+
+        return sampleSlide;
+    }
+
+    public void setTitle (String title)
+    {
+        mTitle = title;
+    }
+
+    public void setSubTitle(String subTitle) { mSubTitle = subTitle; }
+
+    public void showButton (String buttonText, View.OnClickListener buttonListener)
+    {
+        mButtonText = buttonText;
+        mButtonListener = buttonListener;
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (getArguments() != null && getArguments().containsKey(ARG_LAYOUT_RES_ID)) {
+            layoutResId = getArguments().getInt(ARG_LAYOUT_RES_ID);
+        }
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(layoutResId, container, false);
+        ((TextView)view.findViewById(R.id.custom_slide_big_text)).setText(mTitle);
+
+        if (!TextUtils.isEmpty(mSubTitle)) {
+
+            TextView tv =
+                    (TextView)view.findViewById(R.id.custom_slide_big_text_sub);
+            tv.setText(mSubTitle);
+            tv.setVisibility(View.VISIBLE);
+        }
+
+        if (mButtonText != null)
+        {
+            Button button = (Button)view.findViewById(R.id.custom_slide_button);
+            button.setVisibility(View.VISIBLE);
+            button.setText(mButtonText);
+            button.setOnClickListener(mButtonListener);
+        }
+        return view;
+
+    }
+}
diff --git a/app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/OnboardingActivity.java b/app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/OnboardingActivity.java
new file mode 100644
index 00000000..7a2f6d25
--- /dev/null
+++ b/app-mini/src/main/java/org/torproject/android/mini/ui/onboarding/OnboardingActivity.java
@@ -0,0 +1,81 @@
+package org.torproject.android.mini.ui.onboarding;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.View;
+
+import com.github.paolorotolo.appintro.AppIntro;
+
+import org.torproject.android.mini.R;
+import org.torproject.android.mini.settings.LocaleHelper;
+import org.torproject.android.mini.ui.AppManagerActivity;
+import org.torproject.android.mini.vpn.VPNEnableActivity;
+
+public class OnboardingActivity extends AppIntro {
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Instead of fragments, you can also use our default slide
+        // Just set a title, description, background and image. AppIntro will do the rest.
+        CustomSlideBigText welcome = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text);
+        welcome.setTitle(getString(R.string.hello));
+        welcome.setSubTitle(getString(R.string.welcome));
+        addSlide(welcome);
+
+        CustomSlideBigText intro2 = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text);
+        intro2.setTitle(getString(R.string.browser_the_internet));
+        intro2.setSubTitle(getString(R.string.no_tracking));
+        addSlide(intro2);
+
+        CustomSlideBigText cs2 = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text);
+        cs2.setTitle(getString(R.string.bridges_sometimes));
+        cs2.showButton(getString(R.string.action_more), new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(OnboardingActivity.this,BridgeWizardActivity.class));
+            }
+        });
+        addSlide(cs2);
+
+        CustomSlideBigText cs3 = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text);
+        cs3.setTitle(getString(R.string.vpn_setup));
+        cs3.setSubTitle(getString(R.string.vpn_setup_sub));
+        cs3.showButton(getString(R.string.action_vpn_choose), new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(OnboardingActivity.this, VPNEnableActivity.class));
+                startActivityForResult(new Intent(OnboardingActivity.this, AppManagerActivity.class), 9999);
+
+            }
+        });
+        addSlide(cs3);
+
+
+
+        // OPTIONAL METHODS
+        // Override bar/separator color.
+        setBarColor(getResources().getColor(R.color.dark_purple));
+        setSeparatorColor(getResources().getColor(R.color.panel_background_main));
+
+        // Hide Skip/Done button.
+        showSkipButton(false);
+        setProgressButtonEnabled(true);
+    }
+
+    @Override
+    public void onDonePressed(Fragment currentFragment) {
+        super.onDonePressed(currentFragment);
+        // Do something when users tap on Done button.
+        finish();
+    }
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleHelper.onAttach(base));
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java b/app-mini/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java
similarity index 98%
rename from app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java
rename to app-mini/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java
index c1b30c50..29492d3e 100644
--- a/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java
+++ b/app-mini/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java
@@ -1,4 +1,4 @@
-package org.torproject.android.vpn;
+package org.torproject.android.mini.vpn;
 
 import org.torproject.android.service.util.Prefs;
 import org.torproject.android.service.TorService;
diff --git a/app-mini/src/main/res/drawable-hdpi-v11/ic_stat_notifyerr.png b/app-mini/src/main/res/drawable-hdpi-v11/ic_stat_notifyerr.png
new file mode 100644
index 00000000..1f97a9ed
Binary files /dev/null and b/app-mini/src/main/res/drawable-hdpi-v11/ic_stat_notifyerr.png differ
diff --git a/app-mini/src/main/res/drawable-hdpi-v11/ic_stat_tor_off.png b/app-mini/src/main/res/drawable-hdpi-v11/ic_stat_tor_off.png
new file mode 100644
index 00000000..6df646eb
Binary files /dev/null and b/app-mini/src/main/res/drawable-hdpi-v11/ic_stat_tor_off.png differ
diff --git a/app-mini/src/main/res/drawable-hdpi-v9/ic_stat_notifyerr.png b/app-mini/src/main/res/drawable-hdpi-v9/ic_stat_notifyerr.png
new file mode 100644
index 00000000..58fc5ae8
Binary files /dev/null and b/app-mini/src/main/res/drawable-hdpi-v9/ic_stat_notifyerr.png differ
diff --git a/app-mini/src/main/res/drawable-hdpi/ic_action_settings.png b/app-mini/src/main/res/drawable-hdpi/ic_action_settings.png
new file mode 100644
index 00000000..d57b2905
Binary files /dev/null and b/app-mini/src/main/res/drawable-hdpi/ic_action_settings.png differ
diff --git a/app-mini/src/main/res/drawable-hdpi/ic_settings_white_24dp.png b/app-mini/src/main/res/drawable-hdpi/ic_settings_white_24dp.png
new file mode 100644
index 00000000..97ded33b
Binary files /dev/null and b/app-mini/src/main/res/drawable-hdpi/ic_settings_white_24dp.png differ
diff --git a/app-mini/src/main/res/drawable-hdpi/ic_stat_notifyerr.png b/app-mini/src/main/res/drawable-hdpi/ic_stat_notifyerr.png
new file mode 100644
index 00000000..b65fa648
Binary files /dev/null and b/app-mini/src/main/res/drawable-hdpi/ic_stat_notifyerr.png differ
diff --git a/app-mini/src/main/res/drawable-hdpi/ic_stat_tor.png b/app-mini/src/main/res/drawable-hdpi/ic_stat_tor.png
new file mode 100644
index 00000000..3091474e
Binary files /dev/null and b/app-mini/src/main/res/drawable-hdpi/ic_stat_tor.png differ
diff --git a/app-mini/src/main/res/drawable-ldpi-v11/ic_stat_notifyerr.png b/app-mini/src/main/res/drawable-ldpi-v11/ic_stat_notifyerr.png
new file mode 100644
index 00000000..b73292dd
Binary files /dev/null and b/app-mini/src/main/res/drawable-ldpi-v11/ic_stat_notifyerr.png differ
diff --git a/app-mini/src/main/res/drawable-ldpi-v9/ic_stat_notifyerr.png b/app-mini/src/main/res/drawable-ldpi-v9/ic_stat_notifyerr.png
new file mode 100644
index 00000000..2787bbb5
Binary files /dev/null and b/app-mini/src/main/res/drawable-ldpi-v9/ic_stat_notifyerr.png differ
diff --git a/app-mini/src/main/res/drawable-ldpi/ic_action_settings.png b/app-mini/src/main/res/drawable-ldpi/ic_action_settings.png
new file mode 100644
index 00000000..c3927fd7
Binary files /dev/null and b/app-mini/src/main/res/drawable-ldpi/ic_action_settings.png differ
diff --git a/app-mini/src/main/res/drawable-ldpi/ic_stat_notifyerr.png b/app-mini/src/main/res/drawable-ldpi/ic_stat_notifyerr.png
new file mode 100644
index 00000000..518e188e
Binary files /dev/null and b/app-mini/src/main/res/drawable-ldpi/ic_stat_notifyerr.png differ
diff --git a/app-mini/src/main/res/drawable-mdpi-v11/ic_stat_notifyerr.png b/app-mini/src/main/res/drawable-mdpi-v11/ic_stat_notifyerr.png
new file mode 100644
index 00000000..935e2093
Binary files /dev/null and b/app-mini/src/main/res/drawable-mdpi-v11/ic_stat_notifyerr.png differ
diff --git a/app-mini/src/main/res/drawable-mdpi-v9/ic_stat_notifyerr.png b/app-mini/src/main/res/drawable-mdpi-v9/ic_stat_notifyerr.png
new file mode 100644
index 00000000..b1490315
Binary files /dev/null and b/app-mini/src/main/res/drawable-mdpi-v9/ic_stat_notifyerr.png differ
diff --git a/app-mini/src/main/res/drawable-mdpi/ic_settings_white_24dp.png b/app-mini/src/main/res/drawable-mdpi/ic_settings_white_24dp.png
new file mode 100644
index 00000000..8909c355
Binary files /dev/null and b/app-mini/src/main/res/drawable-mdpi/ic_settings_white_24dp.png differ
diff --git a/app-mini/src/main/res/drawable-mdpi/ic_stat_tor.png b/app-mini/src/main/res/drawable-mdpi/ic_stat_tor.png
new file mode 100644
index 00000000..a10c654d
Binary files /dev/null and b/app-mini/src/main/res/drawable-mdpi/ic_stat_tor.png differ
diff --git a/app-mini/src/main/res/drawable-xhdpi-v11/ic_stat_notifyerr.png b/app-mini/src/main/res/drawable-xhdpi-v11/ic_stat_notifyerr.png
new file mode 100644
index 00000000..bed9e215
Binary files /dev/null and b/app-mini/src/main/res/drawable-xhdpi-v11/ic_stat_notifyerr.png differ
diff --git a/app-mini/src/main/res/drawable-xhdpi-v9/ic_stat_notifyerr.png b/app-mini/src/main/res/drawable-xhdpi-v9/ic_stat_notifyerr.png
new file mode 100644
index 00000000..7d1139c9
Binary files /dev/null and b/app-mini/src/main/res/drawable-xhdpi-v9/ic_stat_notifyerr.png differ
diff --git a/app-mini/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png b/app-mini/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png
new file mode 100644
index 00000000..5caedc8e
Binary files /dev/null and b/app-mini/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png differ
diff --git a/app-mini/src/main/res/drawable-xhdpi/ic_stat_tor.png b/app-mini/src/main/res/drawable-xhdpi/ic_stat_tor.png
new file mode 100644
index 00000000..25bf4549
Binary files /dev/null and b/app-mini/src/main/res/drawable-xhdpi/ic_stat_tor.png differ
diff --git a/app-mini/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png b/app-mini/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png
new file mode 100644
index 00000000..eabb0a2b
Binary files /dev/null and b/app-mini/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png differ
diff --git a/app-mini/src/main/res/drawable-xxhdpi/ic_stat_tor.png b/app-mini/src/main/res/drawable-xxhdpi/ic_stat_tor.png
new file mode 100644
index 00000000..fb7bce8a
Binary files /dev/null and b/app-mini/src/main/res/drawable-xxhdpi/ic_stat_tor.png differ
diff --git a/app-mini/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png b/app-mini/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png
new file mode 100644
index 00000000..507c5edd
Binary files /dev/null and b/app-mini/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png differ
diff --git a/app-mini/src/main/res/drawable-xxxhdpi/ic_stat_tor.png b/app-mini/src/main/res/drawable-xxxhdpi/ic_stat_tor.png
new file mode 100644
index 00000000..32595644
Binary files /dev/null and b/app-mini/src/main/res/drawable-xxxhdpi/ic_stat_tor.png differ
diff --git a/app-mini/src/main/res/drawable/ic_menu_about.png b/app-mini/src/main/res/drawable/ic_menu_about.png
new file mode 100644
index 00000000..866d4e0b
Binary files /dev/null and b/app-mini/src/main/res/drawable/ic_menu_about.png differ
diff --git a/app-mini/src/main/res/drawable/ic_menu_exit.png b/app-mini/src/main/res/drawable/ic_menu_exit.png
new file mode 100644
index 00000000..d301ea64
Binary files /dev/null and b/app-mini/src/main/res/drawable/ic_menu_exit.png differ
diff --git a/app-mini/src/main/res/drawable/ic_stat_tor_off.png b/app-mini/src/main/res/drawable/ic_stat_tor_off.png
new file mode 100644
index 00000000..6df646eb
Binary files /dev/null and b/app-mini/src/main/res/drawable/ic_stat_tor_off.png differ
diff --git a/app-mini/src/main/res/drawable/onion32.png b/app-mini/src/main/res/drawable/onion32.png
new file mode 100644
index 00000000..78467601
Binary files /dev/null and b/app-mini/src/main/res/drawable/onion32.png differ
diff --git a/app-mini/src/main/res/drawable/round_drawable.xml b/app-mini/src/main/res/drawable/round_drawable.xml
new file mode 100644
index 00000000..134c36e7
--- /dev/null
+++ b/app-mini/src/main/res/drawable/round_drawable.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="3dp"
+        android:color="#ffffff" />
+
+    <padding
+        android:left="5dp"
+        android:right="5dp"/>
+
+    <corners
+        android:bottomLeftRadius="7dp"
+        android:bottomRightRadius="7dp"
+        android:topLeftRadius="7dp"
+        android:topRightRadius="7dp" />
+</shape>
\ No newline at end of file
diff --git a/app-mini/src/main/res/drawable/toroff.png b/app-mini/src/main/res/drawable/toroff.png
new file mode 100644
index 00000000..759400f2
Binary files /dev/null and b/app-mini/src/main/res/drawable/toroff.png differ
diff --git a/app-mini/src/main/res/drawable/toron.png b/app-mini/src/main/res/drawable/toron.png
new file mode 100644
index 00000000..12f830a5
Binary files /dev/null and b/app-mini/src/main/res/drawable/toron.png differ
diff --git a/app-mini/src/main/res/drawable/torstarting.png b/app-mini/src/main/res/drawable/torstarting.png
new file mode 100644
index 00000000..3a08305f
Binary files /dev/null and b/app-mini/src/main/res/drawable/torstarting.png differ
diff --git a/app-mini/src/main/res/layout/activity_bridge_wizard.xml b/app-mini/src/main/res/layout/activity_bridge_wizard.xml
new file mode 100644
index 00000000..cc23654c
--- /dev/null
+++ b/app-mini/src/main/res/layout/activity_bridge_wizard.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/dark_purple"
+
+    tools:context="org.torproject.android.mini.ui.onboarding.BridgeWizardActivity">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/DefaultTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/DefaultTheme.PopupOverlay" />
+
+    </android.support.design.widget.AppBarLayout>
+
+    <include layout="@layout/content_bridge_wizard" />
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/app-mini/src/main/res/layout/content_bridge_wizard.xml b/app-mini/src/main/res/layout/content_bridge_wizard.xml
new file mode 100644
index 00000000..15387fff
--- /dev/null
+++ b/app-mini/src/main/res/layout/content_bridge_wizard.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context="org.torproject.android.mini.ui.onboarding.BridgeWizardActivity"
+    tools:showIn="@layout/activity_bridge_wizard">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="12dp"
+
+        android:text="@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_"
+        android:textColor="@color/panel_background_main"
+        android:textSize="16sp"
+        android:textStyle="bold" />
+
+    <RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <RadioButton
+            android:id="@+id/btnBridgesDirect"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="12dp"
+            android:text="@string/bridge_direct_connect" />
+
+        <RadioButton
+            android:id="@+id/btnBridgesObfs4"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="12dp"
+            android:text="@string/bridge_community" />
+
+        <RadioButton
+            android:id="@+id/btnBridgesMeek"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="12dp"
+            android:text="@string/bridge_cloud" />
+
+        <RadioButton
+            android:id="@+id/btnBridgesNew"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="12dp"
+            android:text="@string/bridges_get_new" />
+
+    </RadioGroup>
+
+    <TextView
+        android:id="@+id/lbl_bridge_test_status"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="12dp"
+        android:gravity="center"
+        android:textColor="@color/bright_green"
+        android:textSize="16sp"
+        android:textStyle="bold" />
+</LinearLayout>
diff --git a/app-mini/src/main/res/layout/custom_slide_big_text.xml b/app-mini/src/main/res/layout/custom_slide_big_text.xml
new file mode 100644
index 00000000..100392e6
--- /dev/null
+++ b/app-mini/src/main/res/layout/custom_slide_big_text.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:background="@color/dark_purple"
+    >
+
+    <TextView
+        android:id="@+id/custom_slide_big_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text=""
+        android:textColor="@color/panel_background_main"
+        android:gravity="center"
+        android:layout_margin="12dp"
+        android:textStyle="bold"
+        android:textSize="28sp"/>
+    <TextView
+        android:id="@+id/custom_slide_big_text_sub"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text=""
+        android:textColor="@color/panel_background_main"
+        android:gravity="center"
+        android:layout_margin="12dp"
+        android:textStyle="bold"
+        android:textSize="16sp"
+        android:visibility="gone"
+        />
+
+    <Button
+        android:id="@+id/custom_slide_button"
+        android:layout_width="120dp"
+        android:layout_height="40dp"
+        android:layout_margin="10dp"
+        android:background="@drawable/round_drawable"
+        android:textColor="@color/panel_background_main"
+        android:visibility="gone"
+
+        />
+</LinearLayout>
\ No newline at end of file
diff --git a/app-mini/src/main/res/layout/layout_about.xml b/app-mini/src/main/res/layout/layout_about.xml
new file mode 100644
index 00000000..9d01498b
--- /dev/null
+++ b/app-mini/src/main/res/layout/layout_about.xml
@@ -0,0 +1,117 @@
+<?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: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="@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/obfsproxy_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" />
+
+			<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:id="@+id/aboutother"
+				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-mini/src/main/res/layout/layout_activity_client_cookies.xml b/app-mini/src/main/res/layout/layout_activity_client_cookies.xml
new file mode 100644
index 00000000..5c5bf936
--- /dev/null
+++ b/app-mini/src/main/res/layout/layout_activity_client_cookies.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context="org.torproject.android.mini.ui.hiddenservices.ClientCookiesActivity">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/DefaultTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:popupTheme="@style/DefaultTheme.PopupOverlay" />
+
+    </android.support.design.widget.AppBarLayout>
+
+    <include layout="@layout/layout_content_client_cookies" />
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        app:srcCompat="@android:drawable/stat_notify_more"
+        app:backgroundTint="@android:color/darker_gray" />
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/app-mini/src/main/res/layout/layout_add_client_cookie_dialog.xml b/app-mini/src/main/res/layout/layout_add_client_cookie_dialog.xml
new file mode 100644
index 00000000..f28a8282
--- /dev/null
+++ b/app-mini/src/main/res/layout/layout_add_client_cookie_dialog.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingLeft="5dp"
+    android:paddingRight="5dp"
+    android:paddingTop="5dp"
+    android:paddingBottom="5dp">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/onion"
+        android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
+        android:paddingLeft="5dp" />
+
+    <org.torproject.android.mini.ui.NoPersonalizedLearningEditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="text"
+        android:ems="10"
+        android:id="@+id/cookie_onion" />
+
+    <TextView
+        android:text="@string/auth_cookie"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
+        android:paddingLeft="5dp" />
+
+    <org.torproject.android.mini.ui.NoPersonalizedLearningEditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ems="10"
+        android:id="@+id/cookie_value"
+        android:inputType="text" />
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <Button
+            android:text="@string/btn_cancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/cookie_dialog_cancel"
+            android:layout_weight="1"
+            style="@style/Widget.AppCompat.Button.Borderless.Colored" />
+
+        <Button
+            android:text="@string/save"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/cookie_dialog_save"
+            android:layout_weight="1"
+            style="@style/Widget.AppCompat.Button.Borderless.Colored" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app-mini/src/main/res/layout/layout_apps.xml b/app-mini/src/main/res/layout/layout_apps.xml
new file mode 100644
index 00000000..bc35af99
--- /dev/null
+++ b/app-mini/src/main/res/layout/layout_apps.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:duplicateParentState="true">
+
+    <ProgressBar
+        android:id="@+id/progressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone" />
+
+    <GridView
+        android:id="@+id/applistview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentTop="true"
+        android:gravity="center"
+        android:horizontalSpacing="5dp"
+        android:numColumns="4"
+        android:verticalSpacing="15dp">
+
+    </GridView>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app-mini/src/main/res/layout/layout_apps_item.xml b/app-mini/src/main/res/layout/layout_apps_item.xml
new file mode 100644
index 00000000..ef188b3e
--- /dev/null
+++ b/app-mini/src/main/res/layout/layout_apps_item.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="90dp"
+    android:layout_height="90dp"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/itemicon"
+        android:layout_width="40dp"
+        android:layout_height="40dp" />
+
+    <TextView
+        android:id="@+id/itemtext"
+        android:layout_width="80dp"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:gravity="center_horizontal"
+        android:maxLines="2"
+        android:minLines="2"
+        android:scrollHorizontally="false"
+        android:text="uid:packages"
+        android:textAlignment="center"
+        android:textSize="12sp" />
+
+    <CheckBox
+        android:id="@+id/itemcheck"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
+
diff --git a/app-mini/src/main/res/layout/layout_client_cookie_list_item.xml b/app-mini/src/main/res/layout/layout_client_cookie_list_item.xml
new file mode 100644
index 00000000..80eefb94
--- /dev/null
+++ b/app-mini/src/main/res/layout/layout_client_cookie_list_item.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:padding="15dp">
+
+    <TextView
+        android:id="@+id/cookie_onion"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="18sp"
+        android:layout_weight="1" />
+
+    <Switch
+        android:id="@+id/cookie_switch"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:switchPadding="30dp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app-mini/src/main/res/layout/layout_content_client_cookies.xml b/app-mini/src/main/res/layout/layout_content_client_cookies.xml
new file mode 100644
index 00000000..5295641c
--- /dev/null
+++ b/app-mini/src/main/res/layout/layout_content_client_cookies.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context="org.torproject.android.mini.ui.hiddenservices.ClientCookiesActivity"
+    tools:showIn="@layout/layout_activity_client_cookies">
+
+    <ListView
+        android:id="@+id/clien_cookies_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</RelativeLayout>
diff --git a/app-mini/src/main/res/layout/layout_cookie_actions.xml b/app-mini/src/main/res/layout/layout_cookie_actions.xml
new file mode 100644
index 00000000..64d8c1c6
--- /dev/null
+++ b/app-mini/src/main/res/layout/layout_cookie_actions.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <Button
+        android:text="@string/backup_cookie"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/btn_cookie_backup" />
+
+    <Button
+        android:text="@string/delete_cookie"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/btn_cookie_delete" />
+
+    <Button
+        android:text="@string/btn_cancel"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/btn_cookie_cancel" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app-mini/src/main/res/layout/layout_main.xml b/app-mini/src/main/res/layout/layout_main.xml
new file mode 100644
index 00000000..d4422fa2
--- /dev/null
+++ b/app-mini/src/main/res/layout/layout_main.xml
@@ -0,0 +1,151 @@
+<?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:background="@color/light_gray"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+    
+     <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"
+    >
+<RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+	<LinearLayout
+	    	android:layout_width="match_parent"
+		android:layout_height="250dp"
+		android:id="@+id/frameMain"any 
+		android:visibility="visible"	
+		 android:orientation="vertical"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_margin="3dp"
+		android:weightSum="1">
+
+
+    </LinearLayout>
+
+
+
+
+
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="50dp"
+    android:orientation="vertical"
+    android:id="@+id/controls"
+	android:layout_alignParentBottom="true"
+    >
+
+
+    <LinearLayout
+        android:layout_gravity="center"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:layout_margin="3dp"
+        android:layout_weight="1"
+        android:gravity="center"
+        >
+
+		<ImageView
+			android:id="@+id/imgStatus"
+			android:layout_width="50dp"
+			android:layout_height="50dp"
+			android:padding="0dp"
+			android:layout_margin="0dp"
+			android:src="@drawable/toroff" />
+
+		<android.support.v7.widget.SwitchCompat
+            android:id="@+id/btnVPN"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/activate"
+            android:layout_margin="9dp"
+            android:layout_gravity="center"
+            app:switchPadding="3dp"
+
+            />
+
+
+
+
+			<TextView
+				android:id="@+id/trafficDown"
+				android:layout_width="80dp"
+				android:layout_height="wrap_content"
+				android:gravity="center_vertical"
+				android:fontFamily="sans-serif-light"
+				android:text="0kbps"
+				android:layout_margin="3dp"
+				android:lines="1"
+				/>
+
+
+			<TextView
+				android:id="@+id/trafficUp"
+				android:layout_width="80dp"
+				android:layout_height="wrap_content"
+				android:gravity="center_vertical"
+				android:fontFamily="sans-serif-light"
+				android:text="0kbps"
+				android:layout_margin="3dp"
+				android:lines="1"
+				/>
+
+
+    </LinearLayout>
+
+
+
+
+
+</LinearLayout>
+
+
+</RelativeLayout>
+
+	    
+	 <LinearLayout
+    android:layout_width="320dp"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+         android:layout_gravity="end"
+    android:background="#dddddd"
+         android:padding="6dp"
+     >
+         <TextView
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:text="@string/menu_log"
+             android:textAppearance="?android:attr/textAppearanceMedium"
+             />
+    	<TextView
+			android:id="@+id/orbotLog"
+			android:textSize="12sp"
+			android:gravity="start"
+			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-mini/src/main/res/menu/app_main.xml b/app-mini/src/main/res/menu/app_main.xml
new file mode 100644
index 00000000..7f0e34d0
--- /dev/null
+++ b/app-mini/src/main/res/menu/app_main.xml
@@ -0,0 +1,33 @@
+<?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_refresh_apps"
+        android:title="@string/refresh_apps"
+        android:icon="@drawable/ic_refresh_white_24dp"
+        yourapp:showAsAction="always"
+        />
+
+
+ 
+</menu>
diff --git a/app-mini/src/main/res/menu/orbot_main.xml b/app-mini/src/main/res/menu/orbot_main.xml
new file mode 100644
index 00000000..2c1939d7
--- /dev/null
+++ b/app-mini/src/main/res/menu/orbot_main.xml
@@ -0,0 +1,73 @@
+<?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_newnym"
+        android:title="@string/menu_new_identity"
+        android:icon="@drawable/ic_refresh_white_24dp"
+        yourapp:showAsAction="never"
+        />
+
+
+    <item android:id="@+id/menu_settings"
+        android:title="@string/menu_settings"
+         android:icon="@drawable/ic_action_settings"
+         yourapp:showAsAction="never"
+         />
+
+    <!--
+ <item
+        android:title="@string/menu_qr"
+     yourapp:showAsAction="never"
+         >
+  <menu>
+  <item android:id="@+id/menu_scan"
+        android:title="@string/menu_scan"
+      yourapp:showAsAction="never"
+         />
+  
+  <item android:id="@+id/menu_share_bridge"
+        android:title="@string/menu_share_bridge"
+      yourapp:showAsAction="never"
+         />
+  </menu>
+ </item>
+-->
+
+
+ 
+  <item android:id="@+id/menu_about"
+        android:title="@string/menu_about"
+         android:icon="@drawable/ic_menu_about"
+      yourapp:showAsAction="never"
+         
+         />
+ <!--
+  <item android:id="@+id/menu_exit"
+        android:title="@string/menu_exit"
+         android:icon="@drawable/ic_menu_exit"
+      yourapp:showAsAction="never"
+         
+         />-->
+ 
+</menu>
diff --git a/app-mini/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app-mini/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 00000000..036d09bc
--- /dev/null
+++ b/app-mini/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app-mini/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app-mini/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 00000000..036d09bc
--- /dev/null
+++ b/app-mini/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app-mini/src/main/res/mipmap-hdpi/ic_launcher.png b/app-mini/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..42426c19
Binary files /dev/null and b/app-mini/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app-mini/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app-mini/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..aa867fe2
Binary files /dev/null and b/app-mini/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/app-mini/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app-mini/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 00000000..d8e76add
Binary files /dev/null and b/app-mini/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app-mini/src/main/res/mipmap-mdpi/ic_launcher.png b/app-mini/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..6c8a8aac
Binary files /dev/null and b/app-mini/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app-mini/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app-mini/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..ea25e877
Binary files /dev/null and b/app-mini/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/app-mini/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app-mini/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 00000000..d056f3cf
Binary files /dev/null and b/app-mini/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app-mini/src/main/res/mipmap-xhdpi/ic_launcher.png b/app-mini/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..09ca1b23
Binary files /dev/null and b/app-mini/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app-mini/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app-mini/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..782034e0
Binary files /dev/null and b/app-mini/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/app-mini/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app-mini/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..9197cb68
Binary files /dev/null and b/app-mini/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app-mini/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app-mini/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..b45b0359
Binary files /dev/null and b/app-mini/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app-mini/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app-mini/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..a0b88e23
Binary files /dev/null and b/app-mini/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/app-mini/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app-mini/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..51aac254
Binary files /dev/null and b/app-mini/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app-mini/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app-mini/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..7061de75
Binary files /dev/null and b/app-mini/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app-mini/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app-mini/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 00000000..829f12db
Binary files /dev/null and b/app-mini/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/app-mini/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app-mini/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..1b155587
Binary files /dev/null and b/app-mini/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app-mini/src/main/res/values-ach/strings.xml b/app-mini/src/main/res/values-ach/strings.xml
new file mode 100644
index 00000000..49c8dbc4
--- /dev/null
+++ b/app-mini/src/main/res/values-ach/strings.xml
@@ -0,0 +1,11 @@
+<?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-->
+</resources>
diff --git a/app-mini/src/main/res/values-ar/poestrings.xml b/app-mini/src/main/res/values-ar/poestrings.xml
new file mode 100644
index 00000000..ebde94bc
--- /dev/null
+++ b/app-mini/src/main/res/values-ar/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">أحيانا تحتاج إلى جسر للعبور عبر تور.</string>
+    <string name="action_more">إكتشف المزيد</string>
+
+    <string name="vpn_setup">ُيمْكنُك اختيار أي من التطبيقات ستستعمل شبكتنا الإفتراضية المدمجة للعبور عبر تور.</string>
+    <string name="vpn_setup_sub">هذا لن يجعلك مجهول الهوية ولكن سيساعدك في تخطي جدران الحماية.</string>
+    <string name="action_vpn_choose">إختيار التطبيقات</string>
+
+    <string name="hello">مرحبا</string>
+    <string name="welcome">أهلا بك إلى تور على جهازك المحمول.</string>
+
+    <string name="browser_the_internet">أبحِر على الإنترنت كما يحلو لك.</string>
+    <string name="no_tracking">دون رقابة أو تَعقّب أو حجب.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-ar/strings.xml b/app-mini/src/main/res/values-ar/strings.xml
new file mode 100644
index 00000000..9c544e93
--- /dev/null
+++ b/app-mini/src/main/res/values-ar/strings.xml
@@ -0,0 +1,194 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_description">اوربوت هو تطبيق الوكيل-البروكسي الحر الذي يمكّن تطبيقات أخرى لاستخدام الإنترنت بأمان أكثر . يُستخدم اوربوت تور لتشفير تحركات مرورك على الإنترنت ، ثم يخفيك ويجعلك وهمي من خلال سلسلة من أجهزة الكمبيوتر في جميع أنحاء العالم . تور هو تطبيق حر وشبكة مفتوحة والتي تساعدك على حماية نفسك من مراقبة الشبكات التي تهدد الحرية الشخصية والخصوصية ، والأنشطة التجارية السرية والعلاقات ، وأمن الدولة والحكومات القمعيّة والتي تستخدم مايعرف باسم تحليل حركة مرور البيانات .</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="menu_settings">إعدادات</string>
+  <string name="menu_log">السجل</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_about">حول</string>
+  <string name="menu_exit">خروج</string>
+  <string name="menu_scan">فحص QR الجسر</string>
+  <string name="menu_share_bridge">مشاركة QR الجسر</string>
+  <string name="btn_okay">موافق</string>
+  <string name="btn_cancel">إلغاء</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">بعض التفاصيل عن اوربوت</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <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-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <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="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="couldn_t_start_tor_process_">لقد تعذر بدء تشغيل تور:</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="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_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="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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="found_existing_tor_process">عُثر علي عملية تور سابقة تعمل...</string>
+  <string name="something_bad_happened">حصل خطأ ما. افحص السجل</string>
+  <string name="unable_to_read_hidden_service_name">غير قادر على قراءة اسم الخدمة المخفية</string>
+  <string name="unable_to_start_tor">غير قادر على بدء تور:</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="set_locale_title">اللغة</string>
+  <string name="no_internet_connection_tor">لا يوجد ارتباط بألانترنيت: تور في وضع الوقف المؤقت</string>
+  <string name="pref_disable_network_title">لاتوجد شبكة نوم-آلي</string>
+  <string name="pref_disable_network_summary">ضع تور في وضعية النوم عند عدم وجود الأنترنت</string>
+  <string name="newnym">لقد تحولت الى هوية تور جديدة</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="pref_torrc_title">ترتيبات خاصة بـ torrc</string>
+  <string name="pref_torrc_summary">للخبراء فقط : أدخل أسطر ملف torrc مباشرةً</string>
+  <string name="pref_torrc_dialog">torrc خاص</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_">الرجاء إعادة تشغيل أوربوت لتفعيل التعديلات</string>
+  <string name="menu_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="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_">تستطيع الحصول على عنوان جسر عبر البريد الإلكتروني، عبر الويب، أو بعمل مسح لكيوآر كود خاص بجسر.
+إختر \"بريد إلكتروني\" أو \"ويب\" بالأسفل لطلب عنوان جسر.
+
+ما أن تحصل على جسر، أنسخه وألصقه في خانة \"الجسور\" في إعدادات أوربوت وأعد التشغيل.</string>
+    <string name="vpn_default_world">شامل (تلقائي)</string>
+  <string name="hidden_services">خدمات خفية</string>
+  <string name="title_activity_hidden_services">خدمات خفية</string>
+  <string name="menu_hidden_services">خدمات خفية</string>
+  <string name="save">حفظ</string>
+  <string name="local_port">المنفذ المحلي</string>
+  <string name="onion_port">منفذ الـ Onion</string>
+  <string name="name">الاسم</string>
+  <string name="done">تم !</string>
+  <string name="invalid_port">المنفذ غير صالح</string>
+  <string name="copy_address_to_clipboard">نسخ العنوان إلى الحافظة</string>
+  <string name="show_auth_cookie">عرض كعكة المصادقة</string>
+  <string name="backup_service">النسخ الإحتياطي للخدمة</string>
+  <string name="delete_service">حذف الخدمة</string>
+  <string name="backup_saved_at_external_storage">تمت عملية حفظ النسخة الإحتياطية في ذاكرة التخزين الخارجية</string>
+  <string name="backup_restored">تمت استعادة النسخة الإحتياطية</string>
+  <string name="filemanager_not_available">تعذر العثور على مدير الملفات</string>
+  <string name="restore_backup">إسترجاع نسخة احتياطية</string>
+  <string name="create_a_backup_first">قم أولاً بإنشاء نسخة إحتياطية</string>
+  <string name="name_can_t_be_empty">لا يمكن ترك الإسم فارغا</string>
+  <string name="fields_can_t_be_empty">لا يمكن ترك الحقول فارغة</string>
+  <string name="start_tor_again_for_finish_the_process">قم بتشغيل تور ثانيةً لإنهاء العملية</string>
+  <string name="confirm_service_deletion">تأكيد حذف الخدمة</string>
+  <string name="click_again_for_backup">قم بالنقر ثانية للقيام بالنسخ الإحتياطي</string>
+  <string name="service_type">نوع الخدمة</string>
+  <string name="auth_cookie">كعكة المصادقة</string>
+  <string name="copy_cookie_to_clipboard">نسخ الكعكة إلى الحافظة</string>
+  <string name="auth_cookie_was_not_configured">لم يتم إعداد كعكة المصادقة</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">الرجاء إعادة تشغيل أوربوت لتفعيل التعديلات</string>
+  <string name="client_cookies">كعكات العميل</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">عنوان الـ .onion غير صالح</string>
+  <string name="cookie_from_QR">القراءة مِن رمز الكيو آر</string>
+  <string name="backup_cookie">النسخ الإحتياطي للكعكة</string>
+  <string name="delete_cookie">حذف الكعكة</string>
+  <string name="confirm_cookie_deletion">تأكيد إزالة الكعكة</string>
+  <string name="hosted_services">الخدمات المستضافة</string>
+  <string name="share_as_qr">شارك كرمز كيو آر</string>
+  <string name="disable">إلغاء</string>
+  <string name="enable">تمكين</string>
+  <string name="consider_disable_battery_optimizations">يرجى تعطيل تحسينات البطارية</string>
+  <string name="consider_enable_battery_optimizations">يرجى تشغيل تحسينات طاقة البطارية</string>
+  <string name="app_shortcuts">التطبيقات المهيئة للعبور عبر تور</string>
+  <string name="testing_bridges">جارٍ فحص اتصال الجسر بشبكة تور ...</string>
+  <string name="testing_bridges_success">نجحت العملية. إنّ إعدادات الجسر جيدة !</string>
+  <string name="testing_bridges_fail">فشلت العملية. حاول بخيارات أخرى</string>
+  <string name="bridge_direct_connect">الإتصال المباشر بشبكة تور (أفضل)</string>
+  <string name="bridge_community">الإتصال عبر خوادم المجتمع</string>
+  <string name="bridge_cloud">الإتصال عن طريق الخوادم السحابية</string>
+  <string name="trouble_connecting">تواجه مشكلة للإتصال ؟</string>
+  <string name="full_device_vpn">كل الجهاز عبر الشبكة الإفتراضية الخاصة VPN</string>
+  <string name="vpn_disabled">الـ VPN غير مُفَعّل</string>
+</resources>
diff --git a/app-mini/src/main/res/values-ay/poestrings.xml b/app-mini/src/main/res/values-ay/poestrings.xml
new file mode 100644
index 00000000..417f7597
--- /dev/null
+++ b/app-mini/src/main/res/values-ay/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">Yaqhippachax Tor apnaqañatakix mä jalakipañaw wakisi</string>
+    <string name="action_more">JUK\'AMP YATIYASKAKITA</string>
+
+    <string name="vpn_setup">Toran VPN utjirinaktuqüm kawknïr wakichäwinaks qhantayarakismawa</string>
+    <string name="vpn_setup_sub">Akax janiw jan uñjkay tukuykatamti, ukhamarus jark\'antatanak jalakipañanx yanapt\'ätamwa.</string>
+    <string name="action_vpn_choose">WAKICHÄWINAK CHHIJLLAÑA</string>
+
+    <string name="hello">Kamisaki</string>
+    <string name="welcome">Jawsañatak wakt\'ayat Tor ukarux walik mantantaxa.</string>
+
+    <string name="browser_the_internet">Jichhax jan katjayasisakiw llikankxasma</string>
+    <string name="no_tracking">Jan uñjayasisa, jan k\'umiyasisa.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-ay/strings.xml b/app-mini/src/main/res/values-ay/strings.xml
new file mode 100644
index 00000000..7a206666
--- /dev/null
+++ b/app-mini/src/main/res/values-ay/strings.xml
@@ -0,0 +1,205 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_description">Orbotax proxyn mä wakichawipawa, llikatuq jan lunthatayasiñatakiw yaqha wakichawinakampachar yanapi. Orbotax Toratuqiw uraqpachan luratanak jañ uñjayasiñatak atamirinaktuq jark\'aqi. Torax Software Libre ukhamawa, ukampirus maynin luratanakapa, aruskipatanakapa, amuyunakap jan uñjayasiñatakiw jark\'aqi. </string>
+  <string name="status_starting_up">Orbotax qalltaskiwa...</string>
+  <string name="status_activated">Tor llikatuqir waythapitawa</string>
+  <string name="status_disabled">Orbotax jiwt\'atawa</string>
+  <string name="status_shutting_down">Tor wakichawix jist\'antasiskiwa</string>
+  <string name="tor_process_starting">Tor apnaqirix qalltayaskiwa...</string>
+  <string name="tor_process_complete">tukuyata.</string>
+  <string name="menu_settings">Mayjt\'ayaña</string>
+  <string name="menu_log">Imata</string>
+  <string name="menu_start">Qalltaña</string>
+  <string name="menu_stop">Sayt\'ayaña</string>
+  <string name="menu_about">Juk\'ampi</string>
+  <string name="main_layout_download">Apaqaña</string>
+  <string name="main_layout_upload">Apkataña</string>
+  <string name="button_about">Juk\'ampi</string>
+  <string name="menu_exit">Mistuña</string>
+  <string name="menu_scan">Jalakipañ QR waruqaña</string>
+  <string name="menu_share_bridge">Jalakipañ QR ch\'iqiyaña</string>
+  <string name="btn_okay">Iyaw saña</string>
+  <string name="btn_cancel">Janiw saña</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Orbotxat juk\'amp yatiñataki</string>
+  <string name="wizard_details_msg">Orbot wakichawix inakiwa ukatx Tor ukaniwa, Obfs4Proxy, BadVPN Tun2Socks, LibEvent ukhamarak Polipo. Proxy HTTP (8118) ukhamarak mä proxy SOCKS (9050) Tor taypin utjayi. Mä rooteat atamirinx Orbotax Tor tuqiw taqpach llika yatiyäwinak  apayarakispawa.</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Wakiskiri</string>
+  <string name="pref_start_boot_title">Orbot qhantaykas qalltaña</string>
+  <string name="pref_start_boot_summary">Android aqtaykasax Orbot, Tor justupak aqtayam.</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="pref_node_configuration">Puriñawjanak mayjt\'ayaña</string>
+  <string name="pref_node_configuration_summary">Akanakax jan amuykay tukuñaman mayjt\'ayañatakiwa.</string>
+  <string name="pref_entrance_node">Puriñawjan mantañanaka</string>
+  <string name="pref_entrance_node_summary">Nayrïr jalakipañanakan ampar luk\'an chimpunaka, ñanqha sutinaka, markanaka, chiqawjanakapa</string>
+  <string name="pref_entrance_node_dialog">Puriñawjan mantañanak qillqantaña</string>
+  <string name="pref_allow_background_starts_title">Wakichäwinak qhiparkipstayaña</string>
+  <string name="pref_allow_background_starts_summary">Toramp kikip luratanakamp qalltañapataki, yaqha wakichäwinakamp Orbot apnaqayam</string>
+  <string name="pref_proxy_title">Llikan uñstir proxy (munsta ukaki)</string>
+  <string name="pref_proxy_type_title">Uñstir proxy</string>
+  <string name="pref_proxy_type_summary">Uñstir yanapiri ajllt\'aña: HTTP, HTTPS, Socks4, Socks5.i</string>
+  <string name="pref_proxy_type_dialog">Mä Proxy ajllt\'am</string>
+  <string name="pref_proxy_host_title">Uñstir proxy</string>
+  <string name="pref_proxy_host_summary">Proxy suti</string>
+  <string name="pref_proxy_host_dialog">Yanapir proxy qillqantam</string>
+  <string name="pref_proxy_port_title">Uñstir proxy apayañ thakhi</string>
+  <string name="pref_proxy_port_summary">Proxy apayañ thakhi</string>
+  <string name="pref_proxy_port_dialog">Proxy apayañ thakh qillqantam</string>
+  <string name="pref_proxy_username_title">Uñstir proxyn apnaqañ sutima</string>
+  <string name="pref_proxy_username_summary">Proxyn apnaqañ suti (munsta ukaki)</string>
+  <string name="pref_proxy_username_dialog">Proxytuqin apnaqirin sutip qillqantam</string>
+  <string name="pref_proxy_password_title">Proxy chimpu</string>
+  <string name="pref_proxy_password_summary">Proxy chimpu (munsta ukaki)</string>
+  <string name="pref_proxy_password_dialog">Proxytuqin chimpu qillqantam</string>
+  <string name="couldn_t_start_tor_process_">Torax janiw qalltkiti:</string>
+  <string name="error">Pantjata</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">¡\'Reglas de direcciones accesibles\' ukanakax pantjatawa!</string>
+  <string name="your_relay_settings_caused_an_exception_">¡Katuqir apayirinakax pantjatawa!</string>
+  <string name="exit_nodes">Puriñawjan mistuñanakapa</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Qhipïr jalakipañanakan ampar luk\'an chimpunaka, ñanqha sutinaka, markanaka, chiqawjanakapa</string>
+  <string name="enter_exit_nodes">Puriñawjan mistsuñanakap qillqantam</string>
+  <string name="exclude_nodes">Puriñawjanak uñanukuña</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Ampar luk\'an chimpunaka, ñanqha sutinaka, markanaka, chiqawjanaka, jan Tor llikar mantayañataki</string>
+  <string name="enter_exclude_nodes">Puriñawjanak uñanuqut qillqantam</string>
+  <string name="strict_nodes">Sum uñjat puriñawjanaka</string>
+  <string name="use_only_these_specified_nodes">Aka sutiñchat puriñawjanakak apnaqam</string>
+  <string name="bridges">Jalakipañanaka</string>
+  <string name="use_bridges">Jalakipañanak apnaqaña</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Tor llika manqhan yaqha mantañanak qhantayaña</string>
+  <string name="ip_address_and_port_of_bridges">IP ukanakamp jalakipañ apayañ thakhinakampi</string>
+  <string name="enter_bridge_addresses">Jalakipañanakan chiqawjanakap qillqantam</string>
+  <string name="relays">Ch\'iqiyirinaka</string>
+  <string name="relaying">Apayat ch\'iqiyaña</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Jan uñstir ch\'iqiyirïñapatak dispositivo aqtayam</string>
+  <string name="relay_port">Ch\'iqiyirin apayañ thakhipa</string>
+  <string name="listening_port_for_your_tor_relay">Tor ch\'iqiyirimatak ist\'añ thakhi</string>
+  <string name="enter_or_port">OR apayañ thakhi qillqantam</string>
+  <string name="relay_nickname">Ch\'iqiyirin ñanqha sutipa</string>
+  <string name="the_nickname_for_your_tor_relay">Tor ch\'iqiyiriman ñanqha sutip uñt\'ayiri</string>
+  <string name="enter_a_custom_relay_nickname">Ch\'iqiyirimatak mayjt\'ayat ñanqha suti qillqantam</string>
+  <string name="reachable_addresses">Kawkjanakarus purini</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Jark\'antat kamachinakampi, apnaqirjam jark\'antat taypin Tor aqtayaña</string>
+  <string name="reachable_ports">Mantkañ apayañ thakhinaka</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Jark\'antat taypin mantkañ apayañ thakhinaka</string>
+  <string name="enter_ports">Apayañ thakhinak qillqantam</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">imatanak ajllirañ qhantayaña (uñjañatakix adb jan ukax aLogCat apnaqañamawa)</string>
+  <string name="project_home">Nayrïr uñsta janja:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="third_party_software">3ar jaljat-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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">Imantat apayañ thakhinak Tor llikar mä wakichäwiw jist\'arañ muni %1$s. Wakichawitix uñt\'atachixa, iyaw sama.</string>
+  <string name="found_existing_tor_process">Utjir Toraw jikxatata...</string>
+  <string name="something_bad_happened">Mä jan walt\'äwiw utji. Qillqantayasit uñakipam</string>
+  <string name="unable_to_read_hidden_service_name">Janiw imantat yanapirin sutiman ullarañjamakänti</string>
+  <string name="unable_to_start_tor">Janiw Torax aqtayañjamäkiti:</string>
+  <string name="pref_use_persistent_notifications">Orbot aqtatäki ukjax chimpup uñstayañapuni</string>
+  <string name="pref_use_persistent_notifications_title">Yatiyäwinakax purinipuniniwa</string>
+  <string name="pref_use_expanded_notifications">Kawkja markans IP ukamp Toramp  uñstani uka yatiyäw juk\'amp uñacht\'ayaña</string>
+  <string name="pref_use_expanded_notifications_title">Phuqhat yatiyäwinaka</string>
+  <string name="set_locale_title">Aru</string>
+  <string name="no_internet_connection_tor">Llikax janiw utjkiti; Tor ukax suyt\'atawa...</string>
+  <string name="pref_disable_network_title">Jan jiwt\'ayas suyt\'aña</string>
+  <string name="pref_disable_network_summary">Llika jan uktjki ukjax Tor suyt\'ayam</string>
+  <string name="newnym">¡Jichhax Tor sutimax yaqhäxiwa!</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Janiw llikax utjkiti. Torax suyt\'ayatawa...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Llikax khus uñstaniski. Torax aqtaskiwa...</string>
+  <string name="updating_settings_in_tor_service">Toran wakichäwinakax mayjt\'ayaskiwa</string>
+  <string name="pref_socks_title">Toran SOCKS ukapa</string>
+  <string name="pref_socks_summary">Toran proxy SOCKS apayañ thakhipa: (nayra utt\'atatakix 9050, jiwt\'ayañatakix 0)</string>
+  <string name="pref_socks_dialog"> SOCKS apayañ thakhinak mayjt\'ayaña</string>
+  <string name="pref_transport_title">Toran TransProxy apayañ thakhipa</string>
+  <string name="pref_transport_summary">Toran Qhan Apnaqat Proxy apayañ thakh churañ munatapa (Nayra utt\'atatakix 9040, jiwt\'ayañatakix 0)</string>
+  <string name="pref_transport_dialog">TransProxyn apayañ thakhinak mayjt\'ayaña</string>
+  <string name="pref_dnsport_title">Tor DNS apayañ thakhi</string>
+  <string name="pref_dnsport_summary">Toran DNS apayañ thakhipa: (nayra utt\'atatakix 5400, jiwt\'ayañatakix 0)</string>
+  <string name="pref_dnsport_dialog">DNS apayañ thakhinak mayjt\'ayaña</string>
+  <string name="pref_torrc_title">Torrc mayjt\'ayaña</string>
+  <string name="pref_torrc_summary">YATIRINAKATAKIKI: torrc apthapitan chiqak mayjt\'ayam</string>
+  <string name="pref_torrc_dialog">Maynipachpatak Torrc kuttayaña</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">Jichhaptayat jalakipañanaka</string>
+  <string name="restart_orbot_to_use_this_bridge_">Mayjt\'ayatanak aqtayañatak Orbot mayamp qhant\'ayam, amp suma</string>
+  <string name="menu_qr">QR chimpunaka</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_">Jawsañ apnaqirinakax Tor jark\'antañ yatipk ukjax \'Jalakipañ yanapiri\' mantañatak apnaqarakismawa. Yant\'añataki, mayjt\'ayañatakix AJLLT\'AM...</string>
+  <string name="bridge_mode">Jalakipaña</string>
+  <string name="get_bridges_email">Imaylu (Email)</string>
+  <string name="get_bridges_web">Llika janja</string>
+  <string name="activate">Qhantayaña</string>
+  <string name="apps_mode">VPN</string>
+  <string name="send_email">Qillqat apayaña</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_">Jalakipañan QR waruqasa, jan ukax llikatuqi, imailtuqis jalakipañ utjirinakx jikxatarakismawa. Jalakipañ thakh jikxatañatakix \'Imail\' jan ukax \'llika\' ajllt\'am.\n\n Orbotan majt\'ayañawjapan \"Jalakipañ Thakhi\" limt\'añar apkatam, ukat mayamp qalltam.</string>
+    <string name="vpn_default_world">Uraqpacha (justupaki)</string>
+  <string name="hidden_services">Imantat lurañanaka</string>
+  <string name="title_activity_hidden_services">Imantat lurañanaka</string>
+  <string name="menu_hidden_services">Imantat lurañanaka</string>
+  <string name="save">Imaña</string>
+  <string name="local_port">Akankïr apayañ thakhi</string>
+  <string name="onion_port">Onion apayañ thakhi</string>
+  <string name="name">Suti</string>
+  <string name="done">¡Tukuyata!</string>
+  <string name="invalid_port">Jan apaykay thakhi</string>
+  <string name="copy_address_to_clipboard">Utjirinak waruqañawjar imam</string>
+  <string name="show_auth_cookie"> Uñt\'ayktam uka cookie uñstayam</string>
+  <string name="backup_service">Yanapirit imat luratanakam waruqam</string>
+  <string name="delete_service">Lurañanak pichsuña</string>
+  <string name="backup_saved_at_external_storage">Imat luratanakamax yaqha yänakar imataxiwa</string>
+  <string name="backup_restored">Imat luratanakamax mayamp apnaqatäxiwa</string>
+  <string name="filemanager_not_available">Imatanak apnaqirix janiw uñjañjamäkiti</string>
+  <string name="please_grant_permissions_for_external_storage">Yaqha yänakar imañatak iyaw sam, amp suma</string>
+  <string name="restore_backup">Imat luratanak mayamp aqtayam</string>
+  <string name="create_a_backup_first"> Imat luratanak nayraqat uñstayam</string>
+  <string name="name_can_t_be_empty">Sutix qillqantatäñapapuniwa</string>
+  <string name="fields_can_t_be_empty">Janiw kunas ch\'usäñapakiti</string>
+  <string name="start_tor_again_for_finish_the_process">Tukuyañatakix Tor mayamp naktayam</string>
+  <string name="confirm_service_deletion">Lurañanakax pichsutäniwa</string>
+  <string name="click_again_for_backup">Imat luratanak utjañapatak mayamp limt\'am</string>
+  <string name="service_type">Kunayman lurañanaka</string>
+  <string name="auth_cookie">Chiqat k\'arich uk katjir cookie</string>
+  <string name="copy_cookie_to_clipboard">Cookie waruqañawjar imam</string>
+  <string name="auth_cookie_was_not_configured">Chiqat k\'arich uk katjir cookiex janiw mayjt\'ayatäkiti</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Mayjt\'ayatanak aqtayañatak Orbot mayamp qhant\'ayam, amp suma</string>
+  <string name="client_cookies">Apnaqirin Cookiepa</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">Jan wali Onion ukan chiqawjanakapa</string>
+  <string name="cookie_from_QR">QR ukamp ullaraña</string>
+  <string name="backup_cookie">Cookien imat luratanakapa</string>
+  <string name="delete_cookie">Cookie pichsum</string>
+  <string name="confirm_cookie_deletion">Cookie pichsut mayamp uñxatam</string>
+  <string name="hosted_services">Qurpachat lurañanaka</string>
+  <string name="share_as_qr">QRjam ch\'iqiyaña</string>
+  <string name="disable">Jiwt\'ayaña</string>
+  <string name="enable">Aqtayaña</string>
+  <string name="consider_disable_battery_optimizations">Ch\'amanchir pist\'k ukjax jiwt\'añkam aqaskañapatakik amuyt\'am</string>
+  <string name="consider_enable_battery_optimizations">Ch\'amanchir pist\'k ukjax jiwt\'añkam jan aqañapatak amuyt\'am</string>
+  <string name="pref_isolate_dest">Apayañ chiqanak jark\'aqaña</string>
+  <string name="pref_isolate_dest_summary">Sapa apayañ chiqatak kunayman thakhinak apnaqaña</string>
+  <string name="no_transproxy_warning_short">UKATARAKI: Transproxy luräwix janiw mayampis iyaw jisxiti</string>
+  <string name="no_transproxy_warning">UKATARAKI: Qhan apnaqat proxyx janiw iyaw satäkiti. Uka lantix Orbot wakichäw VPN apnaqam.</string>
+  <string name="pref_connection_padding">Waythapiñ ch\'amachiri</string>
+  <string name="pref_connection_padding_summary">Yaqhip apayat uñsusirinakat jark\'aqasiñataki, waythapiñ ch\'amachir aqtayapunim. Utt\'ayata: justupacha</string>
+  <string name="pref_reduced_connection_padding">Juk\'aptayat waythapiñ ch\'amañchiri</string>
+  <string name="pref_reduced_connection_padding_summary">Ch\'amachirimp llika katuqatamp  juk\'aqtayañataki, jank\'aki ch\'iqiyir waythapir jist\'antam ukatx juk\'amp juk\'a ch\'amachir wakichäwinak apayam</string>
+  <string name="app_shortcuts">Toramp apnaqañataki wakichäwinaka</string>
+  <string name="testing_bridges">Torar waythapir apayañ thakhix yant\'ataskiwa</string>
+  <string name="testing_bridges_success">Walikipuniwa. ¡jalakipäwix askinjam mayjt\'ayatawa!</string>
+  <string name="testing_bridges_fail">PANTJATAWA. Yaqh yant\'am</string>
+  <string name="bridge_direct_connect">Tor ukar chiqak waykattaña (juk\'amp khusa)</string>
+  <string name="bridge_community">Yanapirinakan atamirinakapamp waythapiña</string>
+  <string name="bridge_cloud">Llikan imirinakamp waythapiña</string>
+  <string name="bridges_get_new">Machaq jalakipañanak mayiña... (yaqhanak jan walt\'kasp ukja)</string>
+  <string name="trouble_connecting">¿Waythapiykasat jan walt\'xï?</string>
+  <string name="full_device_vpn">Taqpach wakichäwinakaw VPN ukamp apnaqatäni</string>
+  <string name="vpn_disabled">VPN jiwt\'ayatawa</string>
+</resources>
diff --git a/app-mini/src/main/res/values-az/strings.xml b/app-mini/src/main/res/values-az/strings.xml
new file mode 100644
index 00000000..13ce69b9
--- /dev/null
+++ b/app-mini/src/main/res/values-az/strings.xml
@@ -0,0 +1,143 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <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="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="menu_settings">Quraşdırmalar</string>
+  <string name="menu_log">Jurnal</string>
+    <string name="menu_start">Başla</string>
+  <string name="menu_stop">Dur</string>
+  <string name="menu_about">Haqqında</string>
+    <string name="main_layout_download">Endir</string>
+  <string name="main_layout_upload">Yüklə</string>
+    <string name="button_about">Haqqında</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="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>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="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="couldn_t_start_tor_process_">Tor prosesi başlana bilmədi:</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="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_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="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="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="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="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="set_locale_title">Dil</string>
+    <string name="no_internet_connection_tor">İnternet yoxdur; Tor gözləyir</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="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="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="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="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="save">Saxla</string>
+  <string name="name">Ad</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">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="disable">Söndür</string>
+  <string name="enable">İşə sal</string>
+</resources>
diff --git a/app-mini/src/main/res/values-be/poestrings.xml b/app-mini/src/main/res/values-be/poestrings.xml
new file mode 100644
index 00000000..8a247208
--- /dev/null
+++ b/app-mini/src/main/res/values-be/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">Часам вам будзе патрэбен мост, каб далезці да Tor.</string>
+    <string name="action_more">РАСКАЖЫЦЕ ДЭТАЛЁВЕЙ</string>
+
+    <string name="vpn_setup">Вы можаце наладзіць кожны дадатак, каб яно праходзіла праз праз Tor, выкарыстоўваючы наш убудаваны VPN.</string>
+    <string name="vpn_setup_sub">Гэта не зробіць вас ананімным, але гэта дапаможа прайсці праз брандмаўэры.</string>
+    <string name="action_vpn_choose">ВЫБРАЦЬ ДАДАТКІ</string>
+
+    <string name="hello">Прывітанне</string>
+    <string name="welcome">Сардэчна запрашаем у Tor для мабільных прылад.</string>
+
+    <string name="browser_the_internet">Праглядайце інтэрнэт так, як лічыце патрэбным вы.</string>
+    <string name="no_tracking">Няма адсочвання. Ніякай цэнзуры.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-be/strings.xml b/app-mini/src/main/res/values-be/strings.xml
new file mode 100644
index 00000000..a2440c79
--- /dev/null
+++ b/app-mini/src/main/res/values-be/strings.xml
@@ -0,0 +1,205 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_description">Orbot — гэта свабодная праграма для проксі-злучэнняў, яна дазваляе іншым дадаткам больш бяспечна выкарыстоўваць інтэрнэт-злучэнне. Orbot ужывае Tor для шыфравання інтэрнэт-трафіка, які потым хаваецца падчас перасылання праз некалькі кампутараў у розных частках планеты. 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="menu_settings">Налады</string>
+  <string name="menu_log">Журнал</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_about">Пра праграму</string>
+  <string name="menu_exit">Выйсце</string>
+  <string name="menu_scan">Сканаваць QR-код моста</string>
+  <string name="menu_share_bridge">Апублікаваць QR-код моста</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, Obfs4Proxy, BadVPN Tun2Socks, LibEvent і Polipo. Яно прапануе лакальны HTTP- (8118) і SOCKS-проксі (9050) у сетку Tor. Orbot таксама дазваляе на прыладах з правамі root перасылаць увесь інтэрнэт-трафік праз Tor.</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <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-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <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="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="couldn_t_start_tor_process_">Немагчыма запусціць Tor: </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="enable_alternate_entrance_nodes_into_the_tor_network">Уключыць альтэрнатыўныя ўваходныя вузлы ў сетку Tor</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_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="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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">Дадатак хоча адкрыць схаваны порт сервера %1$s сеткі Tor. Гэта бяспечна, калі вы давяраеце дадзенаму дадатку.</string>
+  <string name="found_existing_tor_process">знойдзены існавалы працэс Tor...</string>
+  <string name="something_bad_happened">Адбылася нейкая памылка. Праверце журнал.</string>
+  <string name="unable_to_read_hidden_service_name">немагчыма прачытаць імя схаванай службы</string>
+  <string name="unable_to_start_tor">Немагчыма запусціць 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="set_locale_title">Мова</string>
+  <string name="no_internet_connection_tor">Адсутнічае падключэнне да інтэрнэту, Tor знаходзіцца ў рэжыме чакання…</string>
+  <string name="pref_disable_network_title">Аўтазасынанне без сеткі</string>
+  <string name="pref_disable_network_summary">Пераводзіць Tor у спячы рэжым пры немені інтэрнэту</string>
+  <string name="newnym">Вы перамкнуліся на новы ідэнтыфікатар Tor!</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="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="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="vpn_default_world">Свет (аўта)</string>
+  <string name="hidden_services">Схаваныя службы</string>
+  <string name="title_activity_hidden_services">Схаваныя службы</string>
+  <string name="menu_hidden_services">Схаваныя службы</string>
+  <string name="save">Захаваць</string>
+  <string name="local_port">Лакальны порт</string>
+  <string name="onion_port">Onion-порт</string>
+  <string name="name">Імя</string>
+  <string name="done">Гатова!</string>
+  <string name="invalid_port">Некарэктны порт</string>
+  <string name="copy_address_to_clipboard">Скапіяваць адрас у буфер памену</string>
+  <string name="show_auth_cookie">Паказаць аўтарызуючыя cookie</string>
+  <string name="backup_service">Рэзерваваць службу</string>
+  <string name="delete_service">Выдаліць службу</string>
+  <string name="backup_saved_at_external_storage">Рэзервовая копія захавана на вонкавым сховішчы</string>
+  <string name="backup_restored">Адноўлена з рэзервовай копіі</string>
+  <string name="filemanager_not_available">Файлавы менеджар недаступны</string>
+  <string name="please_grant_permissions_for_external_storage">Дайце дазвол для доступу да вонкавага сховішча</string>
+  <string name="restore_backup">Аднавіць з копіі</string>
+  <string name="create_a_backup_first">Спачатку стварыце рэзервовую копію</string>
+  <string name="name_can_t_be_empty">Імя не можа быць пустым</string>
+  <string name="fields_can_t_be_empty">Палі не могуць быць пустымі</string>
+  <string name="start_tor_again_for_finish_the_process">Запусціце Tor ізноў для завяршэння працэсу</string>
+  <string name="confirm_service_deletion">Пацверджанне выдалення службы</string>
+  <string name="click_again_for_backup">Націсніце яшчэ раз для рэзервавання</string>
+  <string name="service_type">Тып службы</string>
+  <string name="auth_cookie">Аўтарызучыя cookie</string>
+  <string name="copy_cookie_to_clipboard">Капіяваць cookie у буфер памену</string>
+  <string name="auth_cookie_was_not_configured">Аўтарызучыя cookie не наладжаны</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Калі ласка, перазапусціце Orbot для ўступу змены ў сілу</string>
+  <string name="client_cookies">Cookies кліента</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">Несапраўдны .onion-адрас</string>
+  <string name="cookie_from_QR">Прачытаць з QR-кода</string>
+  <string name="backup_cookie">Рэзерваваць cookie</string>
+  <string name="delete_cookie">Выдаліць cookies</string>
+  <string name="confirm_cookie_deletion">Пацвердзіце выдаленне cookie</string>
+  <string name="hosted_services">Размешчаныя службы</string>
+  <string name="share_as_qr">Падзяліцца праз QR-код</string>
+  <string name="disable">Адключыць</string>
+  <string name="enable">Уключыць</string>
+  <string name="consider_disable_battery_optimizations">Разгледзьце магчымасць адключэння аптымізацыі батарэі</string>
+  <string name="consider_enable_battery_optimizations">Разгледзьце магчымасць уключэння аптымізацыі батарэі</string>
+  <string name="pref_isolate_dest">Ізаляваць адрасы прызначэння</string>
+  <string name="pref_isolate_dest_summary">Ужываць розныя ланцугі для кожнага адраса прызначэння</string>
+  <string name="no_transproxy_warning_short">ПАПЯРЭДЖАННЕ: празрысты проксі больш не падтрымліваецца</string>
+  <string name="no_transproxy_warning">ПАПЯРЭДЖАННЕ: празрысты проксі больш не падтрымліваецца. Замест гэтага выкарыстоўвайце VPN-рэжым Orbot.</string>
+  <string name="pref_connection_padding">Пракладка злучэння</string>
+  <string name="pref_connection_padding_summary">Заўсёды ўключае пракладку злучэння для абароны ад некаторых формаў аналізу трафіка. Звычайна: аўта</string>
+  <string name="pref_reduced_connection_padding">Сокращённая прокладка соединения</string>
+  <string name="pref_reduced_connection_padding_summary">Раней зачыняе рэтрансляваныя злучэнні і адпраўляе менш пакетаў запаўнення для змяншэння аб\'ёму перадатных дадзеных і выкарыстання батарэі</string>
+  <string name="app_shortcuts">Дадаткі з падтрымкай Tor</string>
+  <string name="testing_bridges">Тэставанне злучэння з Tor праз мост…</string>
+  <string name="testing_bridges_success">Паспяхова! Мост наладжаны правільна.</string>
+  <string name="testing_bridges_fail">НЯЎДАЛА. Паспрабуйце іншы варыянт.</string>
+  <string name="bridge_direct_connect">Падключэнне непасрэдна да Tor (найлепей)</string>
+  <string name="bridge_community">Падключэнне праз серверы супольнасці</string>
+  <string name="bridge_cloud">Падключэнне праз воблачныя серверы</string>
+  <string name="bridges_get_new">Запытаць новыя масты… (калі ўсе іншыя не атрымалася)</string>
+  <string name="trouble_connecting">Праблема з падключэннем?</string>
+  <string name="full_device_vpn">VPN для ўсёй прылады</string>
+  <string name="vpn_disabled">VPN адключаны</string>
+</resources>
diff --git a/app-mini/src/main/res/values-bg/poestrings.xml b/app-mini/src/main/res/values-bg/poestrings.xml
new file mode 100644
index 00000000..ef3a781b
--- /dev/null
+++ b/app-mini/src/main/res/values-bg/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">Понякога се нуждаете от мост, за да стигнете до Тор.</string>
+    <string name="action_more">Разкажете ми повече</string>
+
+    <string name="vpn_setup">Вие можете да позволите на всяка програма да мине през Тор, използвайки нашата вградена ВЧМ.</string>
+    <string name="vpn_setup_sub">Това няма да Ви направи анонимни, но ще помогне да минете през защитни стени.</string>
+    <string name="action_vpn_choose">Изберете програми</string>
+
+    <string name="hello">Здравейте</string>
+    <string name="welcome">Добре дошли в Тор за мобилни устройства.</string>
+
+    <string name="browser_the_internet">Четете безразборно интернет, както Вие очаквате че трябва.</string>
+    <string name="no_tracking">Без проследяване. Без цензора.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-bg/strings.xml b/app-mini/src/main/res/values-bg/strings.xml
new file mode 100644
index 00000000..d2cfe5e1
--- /dev/null
+++ b/app-mini/src/main/res/values-bg/strings.xml
@@ -0,0 +1,145 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Орботmini</string>
+  <string name="app_description">Orbot е безплатна прокси програма, която дава възможноста на други програми да използват интерент по-сигурно. Orbot използва Tor, за да криптира Интернет трафика и след това го скрива като препраща през няколко компютъра по целия свят. 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="menu_settings">Настройки</string>
+  <string name="menu_log">Лог</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_about">Относно</string>
+    <string name="menu_exit">Изход</string>
+  <string name="menu_scan">Сканирай BridgeQR</string>
+  <string name="menu_share_bridge">Сподели BridgeQR</string>
+    <string name="btn_okay">ОК</string>
+  <string name="btn_cancel">Откажи</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Някои Орбот детайли</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="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="couldn_t_start_tor_process_">Неуспешно стартиране на Тор процес: </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="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_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="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="found_existing_tor_process">намерил си съвместим Tor проект...</string>
+  <string name="something_bad_happened">Нещо лошо се случи. Проверете лога</string>
+    <string name="unable_to_read_hidden_service_name">не може да прочете име на скрита услуга</string>
+  <string name="unable_to_start_tor">Не може да стартира Тор:</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="set_locale_title">Език</string>
+    <string name="no_internet_connection_tor">Няма интернет връзка; Tor е в режим на изчакване...</string>
+    <string name="pref_disable_network_title">Лиспва Автоматичен Режим на Изчакване</string>
+  <string name="pref_disable_network_summary">Сложи Tor в режим на изчакване, когато няма интернет</string>
+  <string name="newnym">Сменихте своята Тор идентичност!</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="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="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="hidden_services">Скрити услуги</string>
+  <string name="title_activity_hidden_services">Скрити услуги</string>
+  <string name="menu_hidden_services">Скрити услуги</string>
+  <string name="save">Запази</string>
+  <string name="name">Име</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Моля, рестартирай Orbot, за да влязат в действие промените</string>
+  <string name="disable">Деактивиране</string>
+  <string name="enable">Активиране</string>
+</resources>
diff --git a/app-mini/src/main/res/values-bn-rBD/strings.xml b/app-mini/src/main/res/values-bn-rBD/strings.xml
new file mode 100644
index 00000000..4d2bc8f2
--- /dev/null
+++ b/app-mini/src/main/res/values-bn-rBD/strings.xml
@@ -0,0 +1,39 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">অরবটmini</string>
+  <string name="app_description">Orbot একটি ফ্রি প্রক্সি অ্যাপ্লিকেশন যা অন্যান্য Apps কে আরও নিরাপদভাবে ইন্টারনেট ব্যবহার করার ক্ষমতাপ্রদান করে।  Orbot আপনার ইন্টারনেট ট্রাফিক এনক্রিপ্ট করতে টর ব্যবহার এবং তারপর সারা বিশ্বের কম্পিউটারের সিরিজের moddho diye porichalito kore gopon kore. টর ফ্রি সফটওয়্যার এবং আপনি ট্রাফিক বিশ্লেষণ হিসেবে পরিচিত ব্যক্তিগত স্বাধীনতা ও গোপনীয়তা, গোপনীয় বাণিজ্যিক কার্যক্রম এবং সম্পর্ক, এবং রà¦
 ¾à¦·à§à¦Ÿà§à¦°à§€à¦¯à¦¼ নিরাপত্তা হুমকির মুখে পড়ে নেটওয়ার্ক নজরদারি একটি ফর্ম বিরুদ্ধে রক্ষা করতে সাহায্য করে যে একটি খোলা নেটওয়ার্ক.</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="menu_settings">নিয়ম বিন্যাস</string>
+  <string name="menu_log">লগ</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_about">বিস্তারিত</string>
+    <string name="menu_exit">প্রস্থান</string>
+  <string name="menu_scan">ব্রিজকিউআর চেক করুন</string>
+  <string name="menu_share_bridge">ব্রিজকিউআর শেয়ার করুন</string>
+    <string name="btn_okay">ঠিক আছে</string>
+  <string name="btn_cancel">বাদ</string>
+  <!--Welcome Wizard strings (DJH)-->
+    <!--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="error">ভুল</string>
+  <string name="bridges">ব্রিজ</string>
+    <string name="set_locale_title">ভাষা</string>
+    <string name="save">সংরক্ষণ করুন</string>
+  <string name="name">Name</string>
+  <string name="disable">টর অক্ষম</string>
+</resources>
diff --git a/app-mini/src/main/res/values-bn-rIN/strings.xml b/app-mini/src/main/res/values-bn-rIN/strings.xml
new file mode 100644
index 00000000..e832af24
--- /dev/null
+++ b/app-mini/src/main/res/values-bn-rIN/strings.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+    <string name="btn_cancel">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="name">Name</string>
+</resources>
diff --git a/app-mini/src/main/res/values-bn/strings.xml b/app-mini/src/main/res/values-bn/strings.xml
new file mode 100644
index 00000000..288474fd
--- /dev/null
+++ b/app-mini/src/main/res/values-bn/strings.xml
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+    <string name="menu_settings">বিন্যাসmini</string>
+  <string name="menu_log">লগ</string>
+    <string name="menu_start">শুরু</string>
+  <string name="menu_stop">থামুন</string>
+  <string name="menu_about">সম্বন্ধে</string>
+  <string name="main_layout_download">ডাউনলোড</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)-->
+  <string name="pref_general_group">সাধারণ</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+    <string name="error">ভুল</string>
+  <string name="bridges">ব্রিজ</string>
+    <string name="set_locale_title">ভাষা</string>
+    <string name="get_bridges_email">ইমেইল</string>
+  <string name="save">সংরক্ষণ করুন</string>
+  <string name="name">নাম</string>
+  <string name="disable">টর অক্ষম</string>
+</resources>
diff --git a/app-mini/src/main/res/values-brx/strings.xml b/app-mini/src/main/res/values-brx/strings.xml
new file mode 100644
index 00000000..806663f3
--- /dev/null
+++ b/app-mini/src/main/res/values-brx/strings.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="menu_settings">सेटिंग्स</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="save">थिना दोन</string>
+</resources>
diff --git a/app-mini/src/main/res/values-bs/strings.xml b/app-mini/src/main/res/values-bs/strings.xml
new file mode 100644
index 00000000..85fe87e3
--- /dev/null
+++ b/app-mini/src/main/res/values-bs/strings.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="menu_settings">Postavke</string>
+    <string name="btn_cancel">Otkaži</string>
+  <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Osnovno</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+    <string name="set_locale_title">Jezik</string>
+  <string name="activate">Aktiviraj</string>
+  <string name="save">Sačuvaj</string>
+  <string name="name">Ime</string>
+</resources>
diff --git a/app-mini/src/main/res/values-ca/poestrings.xml b/app-mini/src/main/res/values-ca/poestrings.xml
new file mode 100644
index 00000000..7f4028bb
--- /dev/null
+++ b/app-mini/src/main/res/values-ca/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">A vegades necessites un pont per accedir a Tor.</string>
+    <string name="action_more">Més informació</string>
+
+    <string name="vpn_setup">Podeu habilitar qualsevol aplicació perquè usi el Tor mitjançant la nostra VPN incorporada.</string>
+    <string name="vpn_setup_sub">No us anonimitzarà, però us ajudarà a aconseguir-ho mitjançant els tallafocs.</string>
+    <string name="action_vpn_choose">Escull aplicacions</string>
+
+    <string name="hello">Hola</string>
+    <string name="welcome">Us donem la benvinguda al Tor.</string>
+
+    <string name="browser_the_internet">Navega internet com ho esperaries.</string>
+    <string name="no_tracking">Sense rastre. Sense censura.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-ca/strings.xml b/app-mini/src/main/res/values-ca/strings.xml
new file mode 100644
index 00000000..9e20becf
--- /dev/null
+++ b/app-mini/src/main/res/values-ca/strings.xml
@@ -0,0 +1,206 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot mini</string>
+  <string name="app_description">L\'Orbot és una aplicació de servidor intermediari gratuïta que capacita a les altres aplicacions per utilitzar internet de forma més segura. L\'Orbot utilitza Tor per xifrar les vostres comunicacions per Internet i ocultar-les fent-les saltar per una sèrie d\'ordinadors repartits per tot el món. Tor és un programari lliure i una xarxa oberta que us ajuda a defensar-vos d\'un tipus de vigilància a la xarxa que amenaça la llibertat personal i la privadesa, activitats empresarials i relacions confidencials i la seguretat en general, coneguda com anàlisi de trànsit.</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="status_shutting_down">El servei Tor s\'està desactivant</string>
+  <string name="tor_process_starting">S\'està iniciant el client Tor...</string>
+  <string name="tor_process_complete">fet.</string>
+    <string name="menu_settings">Preferències</string>
+  <string name="menu_log">Registre</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_about">Quant a...</string>
+    <string name="menu_exit">Surt</string>
+  <string name="menu_scan">Escaneja el BridgeQR</string>
+  <string name="menu_share_bridge">Comparteix el BridgeQR</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_details_msg">Orbot és una aplicació de codi obert que conté Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent i Polipo. Proporciona un proxy HTTP local (8118) i un proxy SOCKS (9050) a la xarxa Tor. En dispositius root Orbot també té la capacitat d\'enviar tot el trànsit d\'Internet a través de Tor</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="pref_allow_background_starts_title">Permet l\'inici en rerefons</string>
+  <string name="pref_allow_background_starts_summary">Permet a qualsevol aplicació iniciar la xarxa Tor mitjançant l\'Orbot i els serveis relacionats</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="couldn_t_start_tor_process_">No s\'ha pogut iniciar el procés Tor:</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="enable_alternate_entrance_nodes_into_the_tor_network">Activar entrades alternes a la xarxa Tor</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_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="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">Una aplicació vol obrir el port de servidor ocults%1$s 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="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_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="pref_use_expanded_notifications">Mostra la informació de sortida addicional del Tor amb  el país i la IP</string>
+  <string name="pref_use_expanded_notifications_title">Notificacions addicionals</string>
+    <string name="set_locale_title">Llengua</string>
+    <string name="no_internet_connection_tor">No s\'ha trobat cap connexió a Internet; el Tor és a l\'espera</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="no_network_connectivity_putting_tor_to_sleep_">No s\'ha trobat connectivitat a la xarxa. El Tor entra en suspensió...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">La connectivitat de la xarxa és bona. S\'està despertant el Tor...</string>
+  <string name="updating_settings_in_tor_service">S\'està actualitzant la configuració als serveis del Tor</string>
+  <string name="pref_socks_title">SOCKS Tor</string>
+  <string name="pref_socks_summary">Port que ofereix el servidor intermediari SOCKS al Tor (per defecte:  9050 or 0 per inhabilitar)</string>
+  <string name="pref_socks_dialog">Configuració del port SOCKS</string>
+  <string name="pref_transport_title">Port TransProxy del Tor</string>
+  <string name="pref_transport_summary">Port que ofereix el seu servidor intermediari transparent al Tor (per defecte: 9040 or 0 per inhabilitar)</string>
+  <string name="pref_transport_dialog">Configuració del port TransProxy</string>
+  <string name="pref_dnsport_title">Port DNS del Tor</string>
+  <string name="pref_dnsport_summary">Port que ofereix les DNS al Tor (per defecte: 5400 or 0 per inhabilitar)</string>
+  <string name="pref_dnsport_dialog">Configuració del port DNS</string>
+  <string name="pref_torrc_title">Configuració personalitzada del Torrc</string>
+  <string name="pref_torrc_summary">NOMÉS EXPERTS: Escriviu les línies de configuració directa del Torrc</string>
+  <string name="pref_torrc_dialog">Torrc personalitzat</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">S\'han actualitzat els ponts</string>
+  <string name="restart_orbot_to_use_this_bridge_">Reinicieu l\'Orbot per aplicar els canvis</string>
+  <string name="menu_qr">Codis 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 la teva xarxa mòbil boqueja activament Tor, pots utilitzar un \'Servidor pont\' com a via alternativa. SELECCIONA una de les opcions per configurar i provar.</string>
+  <string name="bridge_mode">Mode pont</string>
+  <string name="get_bridges_email">Correu-e</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Activa</string>
+  <string name="apps_mode">Mode VPN</string>
+    <string name="send_email">Envia correu-e</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_">Podeu obtenir un enllaç pont mitjançant el correu electrònic, el web o escanejant un codi QR. Trieu Correu-e o Web a sota per demanar una adreça.\n\nQuan tingueu un enllaç d\'aquest tipus, copieu-ho i enganxeu-ho a l\'apartat «Ponts» de la configuració de l\'Orbot i reinicieu.</string>
+    <string name="vpn_default_world">Global (auto)</string>
+  <string name="hidden_services">Serveis ocults</string>
+  <string name="title_activity_hidden_services">Serveis ocults</string>
+  <string name="menu_hidden_services">Serveis ocults</string>
+  <string name="save">Desa</string>
+    <string name="local_port">Port local</string>
+  <string name="onion_port">Port ceba</string>
+  <string name="name">Nom</string>
+  <string name="done">Fet!</string>
+  <string name="invalid_port">Port invàlid</string>
+  <string name="copy_address_to_clipboard">Copia adreça al portapapers</string>
+  <string name="show_auth_cookie">Mostrar galetes d\'autentificació</string>
+  <string name="backup_service">Servei de còpia de seguretat</string>
+  <string name="delete_service">Esborrar servei</string>
+  <string name="backup_saved_at_external_storage">Còpia de seguretat desada a emmagatzematge extern</string>
+  <string name="backup_restored">Còpia de seguretat restaurada</string>
+  <string name="filemanager_not_available">Gestor d\'arxius no disponible</string>
+  <string name="please_grant_permissions_for_external_storage">Si us plau concedeix permisos per emmagatzematge extern</string>
+    <string name="restore_backup">Restaurar còpia de seguretat</string>
+  <string name="create_a_backup_first">Crea una còpia de seguretat primer</string>
+  <string name="name_can_t_be_empty">El nom no pot estar buit</string>
+  <string name="fields_can_t_be_empty">Els camps no poden estar buits</string>
+  <string name="start_tor_again_for_finish_the_process">Torna a iniciar Tor per acabar el procés</string>
+  <string name="confirm_service_deletion">Confirma la supressió del servei</string>
+  <string name="click_again_for_backup">Feu clic novament per fer còpia de seguretat</string>
+  <string name="service_type">Tipus de servei</string>
+  <string name="auth_cookie">Auth cookie</string>
+  <string name="copy_cookie_to_clipboard">Copieu les galetes al porta-retalls</string>
+  <string name="auth_cookie_was_not_configured">No s\'ha configurat l\'Auth cookie</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Reinicieu l\'Orbot per aplicar els canvis</string>
+  <string name="client_cookies">Client cookies</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">L\'adreça .onion no és vàlida</string>
+  <string name="cookie_from_QR">Llegir de QR</string>
+  <string name="backup_cookie">Backup cookie</string>
+  <string name="delete_cookie">Elimina la galeta</string>
+  <string name="confirm_cookie_deletion">Confirma la supressió de les galetes</string>
+  <string name="hosted_services">Serveis allotjats</string>
+  <string name="share_as_qr">Comparteix com a QR</string>
+  <string name="disable">Deshabilitar </string>
+  <string name="enable">Habilitar</string>
+  <string name="consider_disable_battery_optimizations">Penseu a desactivar les optimitzacions de la bateria</string>
+  <string name="consider_enable_battery_optimizations">Penseu a habilitar les optimitzacions de la bateria</string>
+  <string name="pref_isolate_dest">Aïllar adreces de destinació</string>
+  <string name="pref_isolate_dest_summary">Utilitzeu un circuit diferent per a cada adreça de destinació</string>
+  <string name="no_transproxy_warning_short">ATENCIÓ: Transproxying ja no és compatible</string>
+  <string name="no_transproxy_warning">ATENCIÓ: no s\'admet Transparent proxying. Utilitzeu les aplicacions Orbot VPN.</string>
+  <string name="pref_connection_padding">Farciment de connexió</string>
+  <string name="pref_connection_padding_summary">Activeu sempre el farciment de connexió per defensar-vos d\'algunes formes d\'anàlisi de trànsit. Per defecte: automàtic</string>
+  <string name="pref_reduced_connection_padding">Farciment de connexió reduit</string>
+  <string name="pref_reduced_connection_padding_summary">Tanca les connexions de retransmissió abans i envia menys paquets de farciment per reduir l\'ús de dades i bateria.</string>
+    <string name="app_shortcuts">Aplicacions emprant Tor</string>
+    <string name="testing_bridges">Provant connexió pont a Tor...</string>
+  <string name="testing_bridges_success">Èxit. Connexió pont funciona!</string>
+  <string name="testing_bridges_fail">ERROR. Prova una altra opció</string>
+  <string name="bridge_direct_connect">Connecta directament a Tor (Lo millor)</string>
+  <string name="bridge_community">Connecta mitjançant servidors de comunitat</string>
+  <string name="bridge_cloud">Connecta mitjançant servidors núvol</string>
+  <string name="bridges_get_new">Demana nous ponts (Si tot lo altra falla)</string>
+  <string name="trouble_connecting">Problemes connectant?</string>
+  <string name="full_device_vpn">Dispositiu completament VPN</string>
+  <string name="vpn_disabled">VPN desactivat</string>
+</resources>
diff --git a/app-mini/src/main/res/values-cs-rCZ/strings.xml b/app-mini/src/main/res/values-cs-rCZ/strings.xml
new file mode 100644
index 00000000..c333b4c7
--- /dev/null
+++ b/app-mini/src/main/res/values-cs-rCZ/strings.xml
@@ -0,0 +1,139 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot je bezplatný proxy server, který umožňuje bezpečnější použití internetu v ostatních apklikacích. Orbot používá Tor pro šifrování internetového provozu a skrývá se díky předávání provozu přes více počítačů po celém světě. Tor je bezplatný software a otevřená síť, která vám pomáhá chránit se před sledováním sítě, které ohrožuje osobní svobodu, bezpečnost, důvěrné obchodní aktivity a vztahy a před státním sledováním, označovaným jako anylýza provozu.</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">TorService se vypíná...</string>
+  <string name="tor_process_starting">Startuji Tor klienta...</string>
+  <string name="tor_process_complete">hotovo.</string>
+    <string name="menu_settings">Nastavení</string>
+  <string name="menu_log">Log</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_about">O aplikaci</string>
+    <string name="menu_exit">Konec</string>
+  <string name="menu_scan">Skenovat BridgeQR</string>
+  <string name="menu_share_bridge">Sdílet BridgeQR</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>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="pref_allow_background_starts_title">Povolit spuštění na pozadí</string>
+  <string name="pref_allow_background_starts_summary">Povolit všem aplikacím spustit Orbot, Tor a přslušně služby</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="couldn_t_start_tor_process_">Nelze spustit Tor proces:</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="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_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="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="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="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="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="pref_use_expanded_notifications">Zobrazit rozšířené oznánemí s Tor výstupní zemí a IP</string>
+  <string name="pref_use_expanded_notifications_title">Rozšířené oznámení</string>
+    <string name="set_locale_title">Jazyk</string>
+    <string name="no_internet_connection_tor">Žádné připojení k internetu; Tor je standby...</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="no_network_connectivity_putting_tor_to_sleep_">Žádný síťový provoz. Ukládám Tor k spánku…</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Síťový provoz v pořádku. Probouzím Tor…</string>
+  <string name="updating_settings_in_tor_service">aktualizuji nastavení služby Tor</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Port, na kterém Tor nabízí SOCKS proxy (default: 9050, 0 pro zakázání)</string>
+  <string name="pref_socks_dialog">SOCKS nastavení portu</string>
+  <string name="pref_transport_title">Tor TransProxy port</string>
+  <string name="pref_transport_summary">Port, na kterém Tor nabízí transparentní proxy (default: 9040, 0 pro zakázání)</string>
+  <string name="pref_transport_dialog">TransProxy nastavení portu</string>
+  <string name="pref_dnsport_title">Tor DNS port</string>
+  <string name="pref_dnsport_summary">Port, na kterém Tor nabízí DNS (default: 5400, 0 pro zakázání)</string>
+  <string name="pref_dnsport_dialog">DNS nastavení portu</string>
+  <string name="pref_torrc_title">Torrc vstastní konfigurace</string>
+  <string name="pref_torrc_summary">POUZE PRO EXPERTY: zadejte přímo řádky nastavení torrc</string>
+  <string name="pref_torrc_dialog">Vlastní Torrs</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 aktualizovány</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="bridge_mode">Bridge mód</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="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_">Abresu bridge můžete získat emailem, na webu, nebo naskenováním bridge QR kódu. Zvolte níže \'Email\', nebo \'Web\' pro vyžádání adresy bridge.\n\nJakmile máte adresu, zkopírujte & vložte ji do položky \"Bridge\" v nastavení Orbot a restartujte aplikaci.</string>
+    <string name="save">Uložit</string>
+  <string name="name">Jméno</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Pro projevení změn restartujte Orbot</string>
+</resources>
diff --git a/app-mini/src/main/res/values-cs/strings.xml b/app-mini/src/main/res/values-cs/strings.xml
new file mode 100644
index 00000000..5fe50ed5
--- /dev/null
+++ b/app-mini/src/main/res/values-cs/strings.xml
@@ -0,0 +1,48 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot je proxy aplikace zdarma, která umožňuje ostatním aplikacím používat internet bezpečněji. Používá Tor pro zašifrování přenášených dat a skrývá je pomocí skoků přes sérii počítačů po celém světě. Tor je software zdarma a jeho otevřená síť pomáhá v obraně proti sledování, které zasahuje do osobní svobody a soukromí, důvěrných obchodních komunikací a vztahů a proti státní bezpečnosti zvané analýza internetového provozu.</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="menu_settings">Nastavení</string>
+  <string name="menu_log">Log</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">Stahování</string>
+  <string name="main_layout_upload">Nahrávání</string>
+    <string name="button_about">O aplikaci</string>
+    <string name="menu_exit">Konec</string>
+  <string name="menu_scan">Skenovat QR kód bridge</string>
+  <string name="menu_share_bridge">Sdílet QR kód bridge</string>
+    <string name="btn_cancel">Zrušit</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Detaily o Orbotu</string>
+    <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Hlavní</string>
+  <string name="pref_start_boot_title">Spustit Orbot při zapnutí zařízení</string>
+  <string name="pref_start_boot_summary">Automaticky spustit Orbot a připojit k Toru po zapnutí</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+    <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+    <string name="error">Chyba</string>
+  <string name="bridges">Přemostění</string>
+    <string name="set_locale_title">Jazyk</string>
+    <string name="get_bridges_email">Email</string>
+  <string name="activate">Aktivovat</string>
+  <string name="hidden_services">Skryté Služby</string>
+  <string name="title_activity_hidden_services">Skryté Služby</string>
+  <string name="menu_hidden_services">Skryté Služby</string>
+  <string name="save">Uložit</string>
+  <string name="name">Jméno</string>
+  <string name="done">Hotovo!</string>
+  <string name="disable">Zakázat</string>
+  <string name="enable">Zapnout</string>
+</resources>
diff --git a/app-mini/src/main/res/values-cy/strings.xml b/app-mini/src/main/res/values-cy/strings.xml
new file mode 100644
index 00000000..9bd3852d
--- /dev/null
+++ b/app-mini/src/main/res/values-cy/strings.xml
@@ -0,0 +1,46 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</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="menu_settings">Gosodiadau</string>
+  <string name="menu_log">Log</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_about">Amdanom ni</string>
+    <string name="menu_exit">Gadael</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>
+    <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Cyffredinol</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+    <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+    <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="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="third_party_software">Meddalwedd 3ydd-parti</string>
+    <string name="set_locale_title">Iaith</string>
+    <string name="activate">Ysgogi</string>
+  <string name="hidden_services">Gwasanaethau Cudd</string>
+  <string name="title_activity_hidden_services">Gwasanaethau Cudd</string>
+  <string name="menu_hidden_services">Gwasanaethau Cudd</string>
+  <string name="save">Cadw</string>
+  <string name="name">Enw</string>
+</resources>
diff --git a/app-mini/src/main/res/values-da/strings.xml b/app-mini/src/main/res/values-da/strings.xml
new file mode 100644
index 00000000..d212aac5
--- /dev/null
+++ b/app-mini/src/main/res/values-da/strings.xml
@@ -0,0 +1,111 @@
+<?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="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="status_shutting_down">TorServe lukker ned</string>
+  <string name="tor_process_starting">Starter Tor klienten...</string>
+  <string name="tor_process_complete">udført.</string>
+    <string name="menu_settings">Indstillinger</string>
+  <string name="menu_log">Log</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_about">Om</string>
+    <string name="menu_exit">Afslut</string>
+  <string name="menu_scan">Skan BridgeQR</string>
+  <string name="menu_share_bridge">Del BridgeQR</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>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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_allow_background_starts_title">Tillad baggrunds starts</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="couldn_t_start_tor_process_">Kunne ikke starte Tor processen:</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="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_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="third_party_software">Tredjeparts-software:</string>
+  <string name="tor_version">Tor: https://www.torproject.org</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="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="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="set_locale_title">Sprog</string>
+    <string name="no_internet_connection_tor">Ingen internetforbindelse; Tor er på standby...</string>
+    <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="get_bridges_email">Mail</string>
+  <string name="activate">Aktiver</string>
+  <string name="hidden_services">Skjulte tjenester</string>
+  <string name="title_activity_hidden_services">Skjulte tjenester</string>
+  <string name="menu_hidden_services">Skjulte tjenester</string>
+  <string name="save">Gem</string>
+  <string name="name">Navn</string>
+  <string name="disable">Deaktivere</string>
+  <string name="enable">Aktiver</string>
+</resources>
diff --git a/app-mini/src/main/res/values-de-rAT/strings.xml b/app-mini/src/main/res/values-de-rAT/strings.xml
new file mode 100644
index 00000000..49c8dbc4
--- /dev/null
+++ b/app-mini/src/main/res/values-de-rAT/strings.xml
@@ -0,0 +1,11 @@
+<?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-->
+</resources>
diff --git a/app-mini/src/main/res/values-de/poestrings.xml b/app-mini/src/main/res/values-de/poestrings.xml
new file mode 100644
index 00000000..052b7157
--- /dev/null
+++ b/app-mini/src/main/res/values-de/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">Manchmal wird eine Brücke benötigt, um auf das Tor Netzwerk zugreifen zu können.</string>
+    <string name="action_more">ERZÄHL MIR MEHR</string>
+
+    <string name="vpn_setup">Sie können jede App aktivieren, um mit dem integrierten VPN-Tunnel, alles durch Tor zu leiten.</string>
+    <string name="vpn_setup_sub">Es macht dich nicht Anonym, aber es wird Dir helfen, durch Firewalls hindurch zu kommen.</string>
+    <string name="action_vpn_choose">WÄHLE APPS</string>
+
+    <string name="hello">Hallo</string>
+    <string name="welcome">Willkommen auf der Mobilen Plattform von Tor.</string>
+
+    <string name="browser_the_internet">Surfen Sie im Internet, so wie Sie es auch erwarten sollten.</string>
+    <string name="no_tracking">Keine Verfolgung. Keine Zensur.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-de/strings.xml b/app-mini/src/main/res/values-de/strings.xml
new file mode 100644
index 00000000..bf416e95
--- /dev/null
+++ b/app-mini/src/main/res/values-de/strings.xml
@@ -0,0 +1,206 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot ist eine kostenlose Proxy-App, die es anderen Apps ermöglicht, das Internet sicherer zu nutzen. Orbot verwendet Tor, um Ihren Internetverkehr zu verschlüsseln und versteckt ihn dann, indem er durch eine Reihe von Computern auf der ganzen Welt springt. Tor ist freie Software und ein offenes Netzwerk, das Ihnen hilft, sich gegen eine Form der Netzwerküberwachung zu verteidigen, die persönliche Freiheit und Privatsphäre, vertrauliche Geschäftsaktivitäten und Beziehungen sowie die staatliche Sicherheit, die als Verkehrsanalyse bezeichnet wird, bedroht.</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="menu_settings">Einstellungen</string>
+  <string name="menu_log">Protokoll</string>
+    <string name="menu_start">Start</string>
+  <string name="menu_stop">Stopp</string>
+  <string name="menu_about">Über</string>
+    <string name="main_layout_download">Herunterladen</string>
+  <string name="main_layout_upload">Hochladen</string>
+    <string name="button_about">Über</string>
+    <string name="menu_exit">Beenden</string>
+  <string name="menu_scan">BrückenQR scannen</string>
+  <string name="menu_share_bridge">BrückenQR-Code teilen</string>
+    <string name="btn_okay">Okay</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, Obfs4Proxy, BadVPN Tun2Socks, 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>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="pref_node_configuration">Netzknoten-Konfiguration</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">Eingangs-Netzknoten</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">Eingangs-Netzknoten eingeben</string>
+  <string name="pref_allow_background_starts_title">Erlaube Starts im Hintergrund</string>
+  <string name="pref_allow_background_starts_summary">Alle Apps, Orbot mitteilen, dass es Tor und damit verbundene Dienste starten soll</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">Vermittlungs-Anschluss 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="couldn_t_start_tor_process_">Tor-Prozess konnte nicht gestartet werden:</string>
+    <string name="error">Fehler</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Ihre eingestellten ErreichbarenAdressen haben einen Ausnahmefehler verursacht!</string>
+  <string name="your_relay_settings_caused_an_exception_">Ihre Relais-Einstellungen haben einen Ausnahmefehler verursacht!</string>
+  <string name="exit_nodes">Ausgangs-Netzknoten</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">Ausgangs-Netzknoten 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">Ausschluss-Netzknoten eingeben</string>
+  <string name="strict_nodes"> Strikte Netzknoten</string>
+  <string name="use_only_these_specified_nodes">Verwende *Nur* diese angegebenen Netzknoten</string>
+  <string name="bridges">Brücken</string>
+  <string name="use_bridges">Brücken benutzen</string>
+    <string name="enable_alternate_entrance_nodes_into_the_tor_network">Aktiviere alternative Zugangswege ins Tor-Netzwerk</string>
+    <string name="ip_address_and_port_of_bridges">IP-Adresse und Anschluss 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">Aktivieren Sie ihr Gerät als Nichtausgangsrelais</string>
+  <string name="relay_port">Relais-Anschluss</string>
+  <string name="listening_port_for_your_tor_relay">Anschluss, auf den Ihr Tor-Relais gehört werden soll</string>
+  <string name="enter_or_port">OR-Anschluss eingeben</string>
+  <string name="relay_nickname">Relais Spitzname</string>
+  <string name="the_nickname_for_your_tor_relay">Der Spitzname für Dein Tor-Relais</string>
+  <string name="enter_a_custom_relay_nickname">Geben Sie ein benutzerdefinierten Relay Spitznamen ein</string>
+  <string name="reachable_addresses">Erreichbare Adressen</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Laufe als Client hinter einer Firewall mit restriktiven Richtlinien</string>
+  <string name="reachable_ports">Erreichbare Anschlüsse</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Anschlüsse die hinter einer restriktiven Firewall erreichbar sind</string>
+  <string name="enter_ports">Anschlüsse eingeben</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Aktiviere Ausgabe des Fehlerprotokolls (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="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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">Eine Anwendung möchte den Versteckten Server-Anschluss %1$s zum Tor-Netz öffnen. Dies ist sicher, wenn Sie der Anwendung vertrauen.</string>
+  <string name="found_existing_tor_process">bestehenden Tor-Prozess gefunden …</string>
+  <string name="something_bad_happened">Etwas ist schief gelaufen. Bitte Protokoll überprüfen</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="pref_use_persistent_notifications">Behalte immer das Symbol in der Symbolleiste, wenn Orbot verbunden ist</string>
+  <string name="pref_use_persistent_notifications_title">Aktivitätsanzeige</string>
+  <string name="pref_use_expanded_notifications">Zeige erweiterte Benachrichtigung mit Tor-Ausgangsland und IP an</string>
+  <string name="pref_use_expanded_notifications_title">Erweiterte Benachrichtigungen</string>
+    <string name="set_locale_title">Sprache</string>
+    <string name="no_internet_connection_tor">Keine Internetverbindung; Tor ist in Bereitschaft...</string>
+    <string name="pref_disable_network_title">Kein Automatischer Netzwerk Ruhezustand</string>
+  <string name="pref_disable_network_summary">Versetze Tor in den Ruhezustand wenn kein Internet verfügbar ist</string>
+  <string name="newnym">Sie haben zu einer Neuen Tor-Identität gewechselt!</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Keine Netzwerk-Verbindung. Tor wird in den Ruhezustand versetzt…</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Netzwerk-Verbindung ist Gut. Tor wird aktiviert …</string>
+  <string name="updating_settings_in_tor_service">Aktualisiere Einstellungen für den Tor-Dienst</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Anschluss auf dem der SOCKS-Proxy von Tor bereitgestellt wird (Standard: 9050 oder 0 zum deaktivieren)</string>
+  <string name="pref_socks_dialog">SOCKS Anschluss-Konfiguration</string>
+  <string name="pref_transport_title">Tor TransProxy Anschluss</string>
+  <string name="pref_transport_summary">Anschluss auf dem der Transparente Proxy von Tor bereitgestellt wird (Standard: 9040 oder 0 zum deaktivieren)</string>
+  <string name="pref_transport_dialog">TransProxy Anschluss-Konfiguration</string>
+  <string name="pref_dnsport_title">Tor DNS-Anschluss</string>
+  <string name="pref_dnsport_summary">Anschluss, auf dem Tor seinen DNS bereitstellt (Standard: 5400 oder 0 zum deaktivieren)</string>
+  <string name="pref_dnsport_dialog">DNS Anschluss Konfiguration</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">Benutzerdefinierter Torrc</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 Tor Erneut Starten um die Änderungen wirksam werden zu lassen</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 Tor blockiert, können Sie einen \"Brücken-Server\" als alternativen Weg verwenden. Wählen Sie eine der Optionen zum Konfigurieren und Testen ..,.</string>
+  <string name="bridge_mode">Brücken-Modus</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</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="vpn_default_world">Global (Automatisch)</string>
+  <string name="hidden_services">Versteckte Dienste</string>
+  <string name="title_activity_hidden_services">Versteckte Dienste</string>
+  <string name="menu_hidden_services">Versteckte Dienste</string>
+  <string name="save">Speichern</string>
+    <string name="local_port">Lokaler Anschluss</string>
+  <string name="onion_port">Onion Anschluss</string>
+  <string name="name">Name</string>
+  <string name="done">Fertig!</string>
+  <string name="invalid_port">Ungültiger Anschluss</string>
+  <string name="copy_address_to_clipboard">Adresse in die Zwischenablage kopieren</string>
+  <string name="show_auth_cookie">Authentifikationscookie anzeigen</string>
+  <string name="backup_service">Sicherungsdienst</string>
+  <string name="delete_service">Dienst löschen</string>
+  <string name="backup_saved_at_external_storage">Sicherung auf externem Speicher gespeichert </string>
+  <string name="backup_restored">Sicherung wiederhergestellt</string>
+  <string name="filemanager_not_available">Dateimanager nicht verfügbar</string>
+  <string name="please_grant_permissions_for_external_storage">Bitte Zugriffsrechte auf externen Speicher gewähren</string>
+    <string name="restore_backup">Sicherung wiederherstellen</string>
+  <string name="create_a_backup_first">Erstellen Sie zuerst eine Sicherung</string>
+  <string name="name_can_t_be_empty">Name darf nicht leer sein</string>
+  <string name="fields_can_t_be_empty">Felder dürfen nicht leer sein</string>
+  <string name="start_tor_again_for_finish_the_process">Tor neu starten, um den Vorgang abzuschließen</string>
+  <string name="confirm_service_deletion">Löschen des Dienst bestätigen</string>
+  <string name="click_again_for_backup">Zum Sichern noch einmal klicken</string>
+  <string name="service_type">Dienst-Typ</string>
+  <string name="auth_cookie">Authentifikationscookie</string>
+  <string name="copy_cookie_to_clipboard">Cookie in die Zwischenablage kopieren</string>
+  <string name="auth_cookie_was_not_configured">Es wurde kein Authentifikationscookie festgelegt</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Bitte Orbot zum Aktivieren der Änderungen neustarten</string>
+  <string name="client_cookies">Client Cookies</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">Ungültige .onion-Adresse</string>
+  <string name="cookie_from_QR">Lese QR-Code</string>
+  <string name="backup_cookie">Cookie sichern</string>
+  <string name="delete_cookie">Cookie löschen</string>
+  <string name="confirm_cookie_deletion">Cookie-Löschung bestätigen</string>
+  <string name="hosted_services">Gehostete Dienste</string>
+  <string name="share_as_qr">Teile als QR-Code</string>
+  <string name="disable">Deaktivieren</string>
+  <string name="enable">Aktivieren</string>
+  <string name="consider_disable_battery_optimizations">Deaktivieren Sie die Akku-Optimierung</string>
+  <string name="consider_enable_battery_optimizations">Aktivieren Sie die Akku-Optimierung</string>
+  <string name="pref_isolate_dest">Isolierte Zieladressen</string>
+  <string name="pref_isolate_dest_summary">Verwenden Sie für jeden Netzwerk-Kreislauf eine andere Zieladresse</string>
+  <string name="no_transproxy_warning_short">ACHTUNG: Transproxying wird nicht mehr unterstützt</string>
+  <string name="no_transproxy_warning">ACHTUNG: Transparente Proxy-Unterstützung wird nicht mehr unterstützt. Verwenden Sie stattdessen Orbot Apps VPN.</string>
+  <string name="pref_connection_padding">Verbindungsauffüllung</string>
+  <string name="pref_connection_padding_summary">Aktiviert immer die Verbindungsauffüllung, um einige Formen der Verkehrsanalyse zu verhindern. Standard: Automatisch</string>
+  <string name="pref_reduced_connection_padding">Reduzierte Verbindungsauffüllung</string>
+  <string name="pref_reduced_connection_padding_summary">Schließt Relaisverbindungen früher und sendet weniger Füllpakete, um die Daten und die Batterie zu reduzieren</string>
+    <string name="app_shortcuts">Tor-Aktivierte Apps</string>
+    <string name="testing_bridges">Brücken-Verbindung zu Tor wird getestet ....</string>
+  <string name="testing_bridges_success">Erfolgreich. Brücken Konfiguration ist gut!</string>
+  <string name="testing_bridges_fail">GESCHEITERT. Versuchen Sie eine andere Option</string>
+  <string name="bridge_direct_connect">Direkt mit Tor verbinden (am Besten)</string>
+  <string name="bridge_community">Verbinden Sie sich über Community-Server</string>
+  <string name="bridge_cloud">Verbinden Sie sich über Cloud-Server</string>
+  <string name="bridges_get_new">Fordere Neue Brücken an... (Wenn alles andere fehlschlägt)</string>
+  <string name="trouble_connecting">Probleme beim Verbinden?</string>
+  <string name="full_device_vpn">Vollständiger Geräte-VPN</string>
+  <string name="vpn_disabled">VPN Deaktiviert</string>
+</resources>
diff --git a/app-mini/src/main/res/values-el/poestrings.xml b/app-mini/src/main/res/values-el/poestrings.xml
new file mode 100644
index 00000000..0676df68
--- /dev/null
+++ b/app-mini/src/main/res/values-el/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">Μερικές φορές χρειάζεστε μια γέφυρα για να χρησιμοποίησετε το Tor.</string>
+    <string name="action_more">ΠΕΣ ΜΟΥ ΠΕΡΙΣΣΌΤΕΡΑ</string>
+
+    <string name="vpn_setup">Μπορείτε να ενεργοποιήσετε οποιαδήποτε εφαρμογή για να χρησιμοποίησετε το Tor μέσω ενός το ενσωματωμένου VPN.</string>
+    <string name="vpn_setup_sub">Αυτό θα γίνει ανώνυμα, αλλά θα σας βοηθήσει να περάσετε μέσα από τείχη προστασίας.</string>
+    <string name="action_vpn_choose">ΕΠΙΛΟΓΗ ΕΦΑΡΜΟΓΩΝ</string>
+
+    <string name="hello">Γεια</string>
+    <string name="welcome">Καλώς ήρθατε στο Tor για κινητό.</string>
+
+    <string name="browser_the_internet">Περιηγηθείτε στο διαδίκτυο, όπως μπορείτε να περιμένετε ότι θα έπρεπε.</string>
+    <string name="no_tracking">Χωρίς εντοπισμό. Χωρίς λογοκρισία.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-el/strings.xml b/app-mini/src/main/res/values-el/strings.xml
new file mode 100644
index 00000000..140ae79a
--- /dev/null
+++ b/app-mini/src/main/res/values-el/strings.xml
@@ -0,0 +1,206 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Το Orbot είναι μια δωρεάν εφαρμογή μεσολάβησης που επιτρέπει σε άλλες εφαρμογές να χρησιμοποιούν το Διαδίκτυο με περισσότερη ασφάλεια. Το Orbot χρησιμοποιεί τον Tor για την κρυπτογράφηση της διαδικτυακής σας κίνησης και στη συνέχεια την κρύβει αναπηδώντας μέσω μιας σειράς υπολογιστών σε όλο τον κόσμο. Το Tor είναι ελεύθερο λογισμικό και ένα ανοιχτό δίκτυο που σας βοηθά να σταθείτε ενάντια σε μια μορφή επιτήρησης δικτύου που απειλεί την προσωπική ελευθερία και ιδιωτικότητα, εμπιστευτικές επιχειρηματικές δραστηριότητες και σχÎ
 ­ÏƒÎµÎ¹Ï‚, και την κρατική ασφάλεια γνωστή ως traffic analysis.</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="menu_settings">Ρυθμίσεις</string>
+  <string name="menu_log">Καταγραφή</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_about">Σχετικά</string>
+    <string name="menu_exit">Έξοδος</string>
+  <string name="menu_scan">Σάρωση BridgeQR</string>
+  <string name="menu_share_bridge">Κοινή χρήση BridgeQR</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_details_msg">Το Orbot είναι μια εφαρμογή ανοικτού λογισμικού που περιέχει τα Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent καί Polipo.  Διαθέτει τοπικούς πληρεξούσιους διακομιστές HTTP (8118) και SOCKS (9050) για το δίκτυο Tor. Σε συσκευές που έχουν διαμορφωθεί για ριζική χρήση, το Orbot μπορεί να μεταδίδει όλη την διαδυκτιακή κυκλοφορία μέσω Tor.</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="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="couldn_t_start_tor_process_">Αδυναμία εκκίνησης της διεργασίας Tor:</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="enable_alternate_entrance_nodes_into_the_tor_network">Ενεργοποίηση εναλλακτικών κόμβων εισόδου στο δίκτυο Tor</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_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="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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">Κάποια εφαρμογή προσπαθεί να ανοίξει την κρυφή θύρα διακομιστή %1$sστο δίκτυο Tor. Πρόκειται για ασφαλή ενέργεια, εφόσον γνωρίζετε την εφαρμογή.</string>
+  <string name="found_existing_tor_process">αναζήτηση διεργασιών Tor...</string>
+  <string name="something_bad_happened">Κάτι κακό συνέβη. Ελέγξτε τις καταγραφές</string>
+    <string name="unable_to_read_hidden_service_name">αδυναμία ανάγνωσης του ονόματος της κρυφής υπηρεσίας</string>
+  <string name="unable_to_start_tor">Αδυναμία εκκίνησης του 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="set_locale_title">Γλώσσα </string>
+    <string name="no_internet_connection_tor">Δεν υπάρχει σύνδεση στο διαδίκτυο. Ο Tor είναι σε αναμονή...</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="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 proxy του (προεπιλογή: 9050 ή 0 για απενεργοποίηση)</string>
+  <string name="pref_socks_dialog">Διάρθρωση Θύρας SOCKS</string>
+  <string name="pref_transport_title">Θύρα Tor TransProxy </string>
+  <string name="pref_transport_summary">Θύρα που προσφέρει ο Tor στον 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 Custom Config</string>
+  <string name="pref_torrc_summary">ΜΟΝΟ ΓΙΑ ΕΙΔΙΚΟΥΣ: πληκτρολογήστε απευθείας torrc config γραμμές</string>
+  <string name="pref_torrc_dialog">Προσαρμογή Torrc</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">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Ενεργοποίηση</string>
+  <string name="apps_mode">Λειτουργία VPN</string>
+    <string name="send_email">Στείλτε 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\' ή \'Web\' παρακάτω για να ζητήσετε μια διεύθυνση γέφυρας.\n\nΌταν έχετε μια διεύθυνση, αντιγράψτε το & επικολλήστε το στην προτίμηση \"Bridges\" στη ρύθμιση του Orbot και επανεκκινήστε.</string>
+    <string name="vpn_default_world">Παγκόσμια (Auto)</string>
+  <string name="hidden_services">Αποκρυφες υπηρεσιες</string>
+  <string name="title_activity_hidden_services">Αποκρυφες υπηρεσιες</string>
+  <string name="menu_hidden_services">Αποκρυφες υπηρεσιες</string>
+  <string name="save">Αποθήκευση</string>
+    <string name="local_port">Τοπική θύρα</string>
+  <string name="onion_port">Θύρα Κρεμμυδιού</string>
+  <string name="name">Όνομα</string>
+  <string name="done">Έγινε!</string>
+  <string name="invalid_port">Άκυρη θύρα</string>
+  <string name="copy_address_to_clipboard">Αντιγραφή διέυθυνσης στο πρόχειρο</string>
+  <string name="show_auth_cookie">Εμφάνιση αναγνωριστικού cookie</string>
+  <string name="backup_service">Υπηρεσία δημιουργίας αντιγράφου ασφαλείας</string>
+  <string name="delete_service">Διαγραφή υπηρεσίας</string>
+  <string name="backup_saved_at_external_storage">Το αντίγράφο ασφαλείας αποθηκεύθηκε σε εξωτερικό μέσο αποθήκευσης</string>
+  <string name="backup_restored">Το αντίγραφο ασφαλείας επαναφέρθηκε</string>
+  <string name="filemanager_not_available">Ο διαχειριστής αρχείων δεν είναι διαθέσιμος.</string>
+  <string name="please_grant_permissions_for_external_storage">Παρακαλούμε να παραχωρήσετε δικαιώματα για εξωτερική αποθήκευση</string>
+    <string name="restore_backup">Επαναφορά αντιγράφου ασφαλείας</string>
+  <string name="create_a_backup_first">Δημιουργήστε πρώτα ένα αντίγραφο ασφαλείας </string>
+  <string name="name_can_t_be_empty">Το όνομα δεν γίνεται να είναι κενό</string>
+  <string name="fields_can_t_be_empty">Τα πεδία δεν μπορεί να είναι κενά</string>
+  <string name="start_tor_again_for_finish_the_process">Έναρξη ξανά τού Tor για τον τερματισμό της ενέργειας</string>
+  <string name="confirm_service_deletion">Επιβεβαίωση διαγραφής υπηρεσίας</string>
+  <string name="click_again_for_backup">Πατήστε ξανά για το αντίγραφο ασφαλείας</string>
+  <string name="service_type">Τύπος υπηρεσίας</string>
+  <string name="auth_cookie">Αναγνωριστικό cookie</string>
+  <string name="copy_cookie_to_clipboard">Αντιγραφή τού cookie στο πρόχειρο</string>
+  <string name="auth_cookie_was_not_configured">Το αναγνωριστικό cookie δεν διαμορφώθηκε</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Παρακαλούμε επανεκκινήστε το Orbot για να ενεργοποιήσετε τις αλλαγές</string>
+  <string name="client_cookies">Cookies πελατών</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">Άκυρη .onion διεύθυνση</string>
+  <string name="cookie_from_QR">Ανάγνωση από QR</string>
+  <string name="backup_cookie">Cookie αντίγραφου ασφαλείας </string>
+  <string name="delete_cookie">Αφαίρεση Cookie</string>
+  <string name="confirm_cookie_deletion">Επιβεβαίωση διαγραφής τού cookie </string>
+  <string name="hosted_services">Φιλοξενημένες υπηρεσίες</string>
+  <string name="share_as_qr">Κοινοποίηση ως QR</string>
+  <string name="disable">Απενεργοποίηση</string>
+  <string name="enable">Ενεργοποίηση</string>
+  <string name="consider_disable_battery_optimizations">Σκέψη απενεργοποίησης βελτιστοποιήσεων μπαταρίας</string>
+  <string name="consider_enable_battery_optimizations">Σκέψη ενεργοποίησης βελτιστοποιήσεων μπαταρίας</string>
+  <string name="pref_isolate_dest">Μη έγκυρος προορισμός διευθύνσεων</string>
+  <string name="pref_isolate_dest_summary">Χρησιμοποιήστε ένα διαφορετικό κύκλωμα για κάθε διεύθυνση προορισμού</string>
+  <string name="no_transproxy_warning_short">ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Το Transproxying δεν υποστηρίζεται πλέον</string>
+  <string name="no_transproxy_warning">ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Το Transparent proxying δεν υποστηρίζεται. Χρήση Orbot Εφαρμογών VPN αντ \' αυτού.</string>
+  <string name="pref_connection_padding">Σύνδεση αναπλήρωσης</string>
+  <string name="pref_connection_padding_summary">Πάντα δίνετε η δυνατότητα σύνδεσης padding για υπεράσπιση ενάντια σε ορισμένες μορφές ανάλυση της κυκλοφορίας. Προεπιλογή: auto</string>
+  <string name="pref_reduced_connection_padding">Σύνδεση αναπλήρωσης</string>
+  <string name="pref_reduced_connection_padding_summary">Κλείνει τον ηλεκτρονόμο συνδέσεων αργά και αποστολή λιγότερο να γεμίσει τα πακέτα για να μειώσει δεδομένων και τη χρήση της μπαταρίας</string>
+    <string name="app_shortcuts">Ενεργοποιημένες εφαρμογές με το Τοr</string>
+    <string name="testing_bridges">Δοκιμή σύνδεσης γέφυρας με το Tor....</string>
+  <string name="testing_bridges_success">Επιτυχία. Η διαμόρφωση της γέφυρας πέτυχε!</string>
+  <string name="testing_bridges_fail">ΑΠΟΤΥΧΙΑ. Δοκιμάστε μία άλλη διαμόρφωση</string>
+  <string name="bridge_direct_connect">Απευθείας σύνδεση με το δίκτυο Tor (προεπιλογή)</string>
+  <string name="bridge_community">Σύνδεση μέσω κοινοτικών διακομιστών</string>
+  <string name="bridge_cloud">Σύνδεση μέσω cloud server</string>
+  <string name="bridges_get_new">Αίτημα νέων γεφυρών... (Αν όλα τα άλλα αποτύχουν)</string>
+  <string name="trouble_connecting">Πρόβλημα σύνδεσης;</string>
+  <string name="full_device_vpn">Πλήρης Συσκευή VPN</string>
+  <string name="vpn_disabled">Το VPN απενεργοποιήθηκε</string>
+</resources>
diff --git a/app-mini/src/main/res/values-en-rGB/poestrings.xml b/app-mini/src/main/res/values-en-rGB/poestrings.xml
new file mode 100644
index 00000000..c80c7204
--- /dev/null
+++ b/app-mini/src/main/res/values-en-rGB/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">Sometimes you need a bridge to get to Tor.</string>
+    <string name="action_more">TELL ME MORE</string>
+
+    <string name="vpn_setup">You can enable any app to go through Tor using our built-in VPN.</string>
+    <string name="vpn_setup_sub">This won\'t make you anonymous, but it will help get through firewalls.</string>
+    <string name="action_vpn_choose">CHOOSE APPS</string>
+
+    <string name="hello">Hello</string>
+    <string name="welcome">Welcome to Tor on mobile.</string>
+
+    <string name="browser_the_internet">Browse the Internet how you expect you should.</string>
+    <string name="no_tracking">No tracking. No censorship.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-en-rGB/strings.xml b/app-mini/src/main/res/values-en-rGB/strings.xml
new file mode 100644
index 00000000..75531ff4
--- /dev/null
+++ b/app-mini/src/main/res/values-en-rGB/strings.xml
@@ -0,0 +1,41 @@
+<?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="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="menu_settings">Settings</string>
+  <string name="menu_log">Log</string>
+    <string name="menu_start">Start</string>
+  <string name="menu_stop">Stop</string>
+  <string name="menu_about">About</string>
+    <string name="main_layout_download">Download</string>
+  <string name="main_layout_upload">Upload</string>
+    <string name="button_about">About</string>
+    <string name="menu_exit">Exit</string>
+  <string name="menu_scan">Scan BridgeQR</string>
+  <string name="menu_share_bridge">Share BridgeQR</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, Obfs4Proxy, BadVPN Tun2Socks, 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>
+    <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+    <string name="error">Error</string>
+  <string name="bridges">Bridges</string>
+    <string name="set_locale_title">Language</string>
+    <string name="get_bridges_email">Email</string>
+  <string name="save">Save</string>
+  <string name="name">Name</string>
+  <string name="disable">Disable</string>
+</resources>
diff --git a/app-mini/src/main/res/values-eo/strings.xml b/app-mini/src/main/res/values-eo/strings.xml
new file mode 100644
index 00000000..c00f5234
--- /dev/null
+++ b/app-mini/src/main/res/values-eo/strings.xml
@@ -0,0 +1,80 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</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="menu_settings">Agordoj</string>
+  <string name="menu_log">Protokolo</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_about">Pri</string>
+    <string name="menu_exit">Eliri</string>
+    <string name="btn_cancel">Rezigni</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Kelkaj Detaloj pri Orbot</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="couldn_t_start_tor_process_">Tor-procedo ne sukcesis stariĝi:</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="project_home">Retpaĝaro(j) de la Projekto:</string>
+    <string name="found_existing_tor_process">trovi ekzistantan Tor-procedon...</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="set_locale_title">Lingvo</string>
+    <string name="activate">Aktivi</string>
+  <string name="save">Konservi</string>
+  <string name="name">Nomo</string>
+  <string name="done"> Farita! </string>
+</resources>
diff --git a/app-mini/src/main/res/values-es-rAR/poestrings.xml b/app-mini/src/main/res/values-es-rAR/poestrings.xml
new file mode 100644
index 00000000..53e6e635
--- /dev/null
+++ b/app-mini/src/main/res/values-es-rAR/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">aveces necesitas un puente para llegar a tor </string>
+    <string name="action_more">dime mas</string>
+
+    <string name="vpn_setup">puede habilitar cualquier aplicación para pasar por tor usando nuestra VPN incorporada</string>
+    <string name="vpn_setup_sub">esto no lo hará anónimo, pero le ayudara a atravesar los firewalls</string>
+    <string name="action_vpn_choose">elige aplicaciones</string>
+
+    <string name="hello">hola</string>
+    <string name="welcome">bienvenido a tor en el móvil</string>
+
+    <string name="browser_the_internet">navegue por Internet como espera que debería hacerlo</string>
+    <string name="no_tracking">sin seguimiento. sin censura</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-es-rAR/strings.xml b/app-mini/src/main/res/values-es-rAR/strings.xml
new file mode 100644
index 00000000..f8af8019
--- /dev/null
+++ b/app-mini/src/main/res/values-es-rAR/strings.xml
@@ -0,0 +1,118 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot es una aplicación de proxy gratuita que le permite a otras aplicaciones utilizar Internet de forma segura. Tor encripta tu trafico de Internet y lo oculta rebotandolo a través de una serie de ordenadores alrededor del mundo. Tor es un software gratuito y una red abierta que te ayuda a defenderte contra una forma de vigilancia de red que amenaza la libertad personal y la privacidad, actividades confidenciales de negocios y relaciones, y la seguridad de estado conocida como análisis de trafico.</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">El servicio de Tor se esta cerrando</string>
+  <string name="tor_process_starting">Iniciando el cliente Tor...</string>
+  <string name="tor_process_complete">completo.</string>
+    <string name="menu_settings">Configuración</string>
+  <string name="menu_log">Registro</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_about">Acerca de</string>
+    <string name="menu_exit">Salir</string>
+  <string name="menu_scan">Escanea código QR</string>
+  <string name="menu_share_bridge">Compartir el código QR</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_details_msg">Orbot es una aplicación de código abierto que contiene Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent y Polipo. Proporciona un proxy local HTTP (8118) y un proxy SOCKS (9050) adentro de la red de Tor. Orbot también tiene la habilidad, en dispositivos ruteados, de enviar todo el trafico de Internet a través de Tor</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <string name="pref_general_group">General</string>
+  <string name="pref_start_boot_title">Arrancar Orbot al inicio</string>
+  <string name="pref_start_boot_summary">Inicie automáticamente Orbot y conecte Tor cuando el dispositivo android arranque.</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="pref_node_configuration">configuracion del nodo</string>
+  <string name="pref_node_configuration_summary">Estas son configuraciones avanzadas que pueden reducir tu anonimato</string>
+  <string name="pref_entrance_node">Nodos de entrada</string>
+  <string name="pref_entrance_node_summary">Huellas dactilares, apodos, países y direcciones para el primer salto</string>
+  <string name="pref_entrance_node_dialog">Introduzca los nodos de entrada</string>
+  <string name="pref_allow_background_starts_title">Permitir inicio de fondo</string>
+  <string name="pref_allow_background_starts_summary">Deje que cualquier aplicación indique a Orbot que inicie Tor y servicios relacionados</string>
+    <string name="pref_proxy_title">red de proxy de salida (opcional)</string>
+  <string name="pref_proxy_type_title">tipo de proxy de salida</string>
+  <string name="pref_proxy_type_summary">Protocolo a utilizar para el servidor proxy: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">introduzca el tipo de proxy</string>
+  <string name="pref_proxy_host_title">host de proxy de salida</string>
+  <string name="pref_proxy_host_summary">nombre de host del servidor proxy </string>
+  <string name="pref_proxy_host_dialog">ingresar host proxy</string>
+  <string name="pref_proxy_port_title">puerto proxy externo</string>
+  <string name="pref_proxy_port_summary">puerto del servidor proxy</string>
+  <string name="pref_proxy_port_dialog">introduzca el puerto proxy</string>
+  <string name="pref_proxy_username_title">nombre de usuario de proxy de salida</string>
+  <string name="pref_proxy_username_summary">nombre de usuario de proxy (opcional)</string>
+  <string name="pref_proxy_username_dialog">ingrese nombre de usuario de proxy</string>
+  <string name="pref_proxy_password_title">contraseña de proxy de salida</string>
+  <string name="pref_proxy_password_summary">contraseña de proxy (opcional)</string>
+  <string name="pref_proxy_password_dialog">Ingrese contraseña Proxy</string>
+    <string name="couldn_t_start_tor_process_">no se pudo iniciar Tor</string>
+    <string name="error">Error</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">La configuración de las direcciones alcanzables causó una excepción.</string>
+  <string name="your_relay_settings_caused_an_exception_">Su configuración de retransmisión provocó una excepción.</string>
+  <string name="exit_nodes">nodos de salida</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">huellas dactilares, apodos, paises y direcciones para el ultimo salto</string>
+  <string name="enter_exit_nodes">ingrese nodos de salida</string>
+  <string name="exclude_nodes">excluir nodos</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">huellas digitales, usuarios, paises y direcciones para excluir</string>
+  <string name="enter_exclude_nodes">ingrese nodos excluidos</string>
+  <string name="strict_nodes">nodos estrictos</string>
+  <string name="use_only_these_specified_nodes">utilice *solo* estos nodos especificos </string>
+  <string name="bridges">puentes</string>
+  <string name="use_bridges">usar puentes</string>
+    <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilitar entradas alternativas en la red de Tor</string>
+    <string name="ip_address_and_port_of_bridges">direccion IP y puerto de puentes</string>
+  <string name="enter_bridge_addresses">introduzca las direcciones de puente</string>
+  <string name="relays">retransmitir</string>
+  <string name="relaying">retransmision </string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Habilite su dispositivo para que sea retransmision sin salida</string>
+  <string name="relay_port">puerto de retransmision</string>
+  <string name="listening_port_for_your_tor_relay">puerto de escucha para la retransmision de Tor</string>
+  <string name="enter_or_port">entrar puerto OR</string>
+  <string name="relay_nickname">apodo de retransmision</string>
+  <string name="the_nickname_for_your_tor_relay">el apodo para tu retransmision de Tor</string>
+  <string name="enter_a_custom_relay_nickname">Introduzca un apodo de retransmisión personalizado</string>
+  <string name="reachable_addresses">direcciones alcanzables</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Ejecutar como un cliente detrás de un firewall con políticas restrictivas</string>
+  <string name="reachable_ports">puertos alcanzables</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Puertos accesibles detrás de un firewall restrictivo</string>
+  <string name="enter_ports">Ingresar puertos</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">habilitar registro de depuración para salida (debe usar adb o aLogCat para visualizar)</string>
+  <string name="project_home">proyecto de inicio(s):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+    <string name="third_party_software">Software de terceros:</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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">Una aplicación quiere abrir el puerto del servidor oculto %1$s a la red de tor. Esto es seguro si confías en la aplicación</string>
+  <string name="found_existing_tor_process">encontrado el proceso tor existente</string>
+  <string name="something_bad_happened">algo malo ha ocurrido. verifica el registro.</string>
+  <string name="unable_to_start_tor">No se puede iniciar Tor:</string>
+    <string name="set_locale_title">Idioma</string>
+    <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_dnsport_title">Puerto DNS Tor</string>
+  <string name="pref_dnsport_dialog">Configuración del Puerto DNS</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">Activar</string>
+    <string name="save">Guardar</string>
+  <string name="name">Nombre</string>
+  <string name="disable">Deshabilitar</string>
+</resources>
diff --git a/app-mini/src/main/res/values-es/arrays.xml b/app-mini/src/main/res/values-es/arrays.xml
new file mode 100644
index 00000000..c8149515
--- /dev/null
+++ b/app-mini/src/main/res/values-es/arrays.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+
+    <string-array name="array_hs_types">
+		<item>Usuarios</item>
+		<item>Aplicaciones</item>
+	</string-array>
+</resources>
diff --git a/app-mini/src/main/res/values-es/poestrings.xml b/app-mini/src/main/res/values-es/poestrings.xml
new file mode 100644
index 00000000..951cd44a
--- /dev/null
+++ b/app-mini/src/main/res/values-es/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">A veces necesita un puente para llegar a Tor</string>
+    <string name="action_more">CUÉNTAME MÁS</string>
+
+    <string name="vpn_setup">Puede habilitar que cualquier aplicación vaya a través de Tor usando nuestra VPN integrada.</string>
+    <string name="vpn_setup_sub">Esto no le hará anónimo, pero le ayudará a atravesar cortafuegos/firewalls.</string>
+    <string name="action_vpn_choose">ESCOGER APLICACIONES</string>
+
+    <string name="hello">Hola</string>
+    <string name="welcome">Bienvenido a Tor para móvil.</string>
+
+    <string name="browser_the_internet">Navegue por Internet de la forma en la que cree que debe.</string>
+    <string name="no_tracking">Sin rastreo. Sin censura.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-es/strings.xml b/app-mini/src/main/res/values-es/strings.xml
new file mode 100644
index 00000000..dd25a163
--- /dev/null
+++ b/app-mini/src/main/res/values-es/strings.xml
@@ -0,0 +1,207 @@
+<?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="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="menu_settings">Configuración</string>
+  <string name="menu_log">Registro (log)</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">Descarga</string>
+  <string name="main_layout_upload">Subida</string>
+    <string name="button_about">Acerca de</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="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, Obfs4Proxy, BadVPN Tun2Socks, LibEvent y Polipo. Proporciona un proxy HTTP (8118) y un proxy SOCKS (9050) hacia el interior de la red Tor. En una maquina rooteada, Orbot también tiene la capacidad de enviar todo el tráfico de Internet a través de Tor.</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="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="couldn_t_start_tor_process_">No se pudo iniciar el proceso de Tor: </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="enable_alternate_entrance_nodes_into_the_tor_network">Habilitar entradas alternativas hacia el interior de la red Tor</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_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="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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">Una aplicación quiere abrir el puerto %1$s de servidor oculto a la red Tor. Esto es seguro si confía en la aplicación.</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="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="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="set_locale_title">Idioma</string>
+    <string name="no_internet_connection_tor">Sin conexión a Internet; Tor está en suspensión...</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="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="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 bloquea Tor activamente, puede usar un \'Servidor Puente\' como alternativa para acceder. SELECCIONE una de las opciones a configurar y probar...</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">Modo VPN</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="vpn_default_world">Global (Automático)</string>
+  <string name="hidden_services">Servicios ocultos</string>
+  <string name="title_activity_hidden_services">Servicios ocultos</string>
+  <string name="menu_hidden_services">Servicios ocultos</string>
+  <string name="save">Guardar</string>
+    <string name="local_port">Puerto local</string>
+  <string name="onion_port">Puerto onion</string>
+  <string name="name">Nombre</string>
+  <string name="done">¡Hecho!</string>
+  <string name="invalid_port">Puerto no válido</string>
+  <string name="copy_address_to_clipboard">Copiar dirección al portapapeles</string>
+  <string name="show_auth_cookie">Mostrar cookie de autentificación</string>
+  <string name="backup_service">Hacer copia de seguridad del servicio</string>
+  <string name="delete_service">Borrar servicio</string>
+  <string name="backup_saved_at_external_storage">Copia de seguridad guardada en un almacenamiento externo</string>
+  <string name="backup_restored">Copia de seguridad restaurada</string>
+  <string name="filemanager_not_available">Administrador de ficheros no disponible</string>
+  <string name="please_grant_permissions_for_external_storage">Por favor, conceda permisos para almacenamiento externo</string>
+    <string name="restore_backup">Restaurar copia de seguridad</string>
+  <string name="create_a_backup_first">Primero cree una copia de seguridad</string>
+  <string name="name_can_t_be_empty">El nombre no puede estar vacío</string>
+  <string name="fields_can_t_be_empty">Los campos no pueden estar vacíos</string>
+  <string name="start_tor_again_for_finish_the_process">Inicie Tor de nuevo para finalizar el proceso</string>
+  <string name="confirm_service_deletion">Confirme el borrado del servicio</string>
+  <string name="click_again_for_backup">Pulse de nuevo para realizar copia de seguridad</string>
+  <string name="service_type">Tipo de servicio</string>
+  <string name="auth_cookie">Cookie de autentificación</string>
+  <string name="copy_cookie_to_clipboard">Copiar cookie al portapapeles</string>
+  <string name="auth_cookie_was_not_configured">La cookie de autentificación no fue configurada</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Por favor, reinicie Orbot para habilitar los cambios</string>
+  <string name="client_cookies">Cookies de cliente</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">Dirección .onion no válida</string>
+  <string name="cookie_from_QR">Leer desde QR</string>
+  <string name="backup_cookie">Realizar copia de seguridad de cookie</string>
+  <string name="delete_cookie">Borrar cookie</string>
+  <string name="confirm_cookie_deletion">Confirmar borrado de cookie</string>
+  <string name="hosted_services">Servicios alojados</string>
+  <string name="share_as_qr">Compartir como QR</string>
+  <string name="disable">Deshabilitar</string>
+  <string name="enable">Habilitar</string>
+  <string name="consider_disable_battery_optimizations">Considere deshabilitar las optimizaciones de batería</string>
+  <string name="consider_enable_battery_optimizations">Considere habilitar las optimizaciones de batería</string>
+  <string name="pref_isolate_dest">Aislar direcciones de destino</string>
+  <string name="pref_isolate_dest_summary">Usar un circuito diferente para cada dirección de destino</string>
+  <string name="no_transproxy_warning_short">ADVERTENCIA: El proxyficado transparente ya no está soportado</string>
+  <string name="no_transproxy_warning">ADVERTENCIA: El proxyficado transparente no está soportado. Use la VPN de aplicaciones de Orbot en su lugar.</string>
+  <string name="pref_connection_padding">Relleno de la conexión</string>
+  <string name="pref_connection_padding_summary">Habilita siempre el relleno de la conexión como defensa contra algunas formas de análisis de tráfico. Predeterminado: Automático</string>
+  <string name="pref_reduced_connection_padding">Relleno de la conexión reducido</string>
+  <string name="pref_reduced_connection_padding_summary">Cierra las conexiones de repetidor más pronto y envía menos paquetes de relleno para reducir el uso de datos y batería</string>
+    <string name="app_shortcuts">Aplicaciones habilitadas-para-Tor</string>
+    <string name="testing_bridges">Probando conexión de puente hacia Tor...</string>
+  <string name="testing_bridges_success">Exitosa. ¡La configuración del puente de red es buena!</string>
+  <string name="testing_bridges_fail">FALLIDA. Pruebe otra opción</string>
+  <string name="bridge_direct_connect">Conectar directamente a Tor (lo mejor)</string>
+  <string name="bridge_community">Conectar a través de servidores de la comunidad</string>
+  <string name="bridge_cloud">Conectar a través de servidores de la nube</string>
+  <string name="bridges_get_new">Solicitar nuevos puentes... (si todo lo demás falla)</string>
+  <string name="trouble_connecting">¿Problemas al conectar?</string>
+  <string name="full_device_vpn">VPN de dispositivo completo</string>
+  <string name="vpn_disabled">VPN deshabilitada</string>
+</resources>
diff --git a/app-mini/src/main/res/values-et/strings.xml b/app-mini/src/main/res/values-et/strings.xml
new file mode 100644
index 00000000..d986129a
--- /dev/null
+++ b/app-mini/src/main/res/values-et/strings.xml
@@ -0,0 +1,103 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot on vabalt kasutatav proxy rakendus, mis võimaldab teistel rakendustel Interneti turvalisemat kasutust. Orbot krüpteerib ja peidab teie Internetiliikluse Tor abil paljude maailma arvutite vahel põrgatades. Tor on vaba tarkvara ja vaba võrgustik mis aitab teil kaitsta oma privaatsust, vabadust, konfidentsiaalset äritegevust, suhteid ja riiklikku julgeolekut arvutivõrgus toimuva liikluse analüüsi eest.</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="status_shutting_down">Orbot lülitub välja</string>
+  <string name="tor_process_starting">Tor kliendi käivitamine...</string>
+  <string name="tor_process_complete">valmis.</string>
+    <string name="menu_settings">Seaded</string>
+  <string name="menu_log">Logi</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_about">Lähemalt</string>
+    <string name="menu_exit">Välja</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>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="couldn_t_start_tor_process_">Tor protsessi käivitamine ebaõnnestus:</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="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_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="third_party_software">Kolmanda osapoole tarkvara:</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="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_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="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="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>
+    <string name="save">Salvesta</string>
+  <string name="name">Name</string>
+  <string name="disable">Keela</string>
+  <string name="enable">Luba</string>
+</resources>
diff --git a/app-mini/src/main/res/values-eu/poestrings.xml b/app-mini/src/main/res/values-eu/poestrings.xml
new file mode 100644
index 00000000..3b5d7d92
--- /dev/null
+++ b/app-mini/src/main/res/values-eu/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">Batzuetan zubi bat behar duzu Tor sarera heltzeko</string>
+    <string name="action_more">KONTATU GEHIAGO</string>
+
+    <string name="vpn_setup">Edozein aplikazio Tor bidez pasatzea ahalbidetu dezakezu gure VPN-a erabiliz</string>
+    <string name="vpn_setup_sub">Honek ez zaitu anonimo bihurtuko, baina suebakietatik pasatzera lagunduko zaitu.</string>
+    <string name="action_vpn_choose">HAUTATU APLIKAZIOAK</string>
+
+    <string name="hello">Kaixo</string>
+    <string name="welcome">Ongi etorri mugikorreko Tor-era.</string>
+
+    <string name="browser_the_internet">Arakatu Internet zure ustez egin behar zenukeen erara.</string>
+    <string name="no_tracking">Jarraipenik ez. Zentsurarik ez.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-eu/strings.xml b/app-mini/src/main/res/values-eu/strings.xml
new file mode 100644
index 00000000..c0138fe6
--- /dev/null
+++ b/app-mini/src/main/res/values-eu/strings.xml
@@ -0,0 +1,206 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot proxy aplikazio aske bat da beste aplikazioei Interneten erabilera seguruago bat egitea ahalbidetzen diena. Orbot-ek Tor erabiltzen du zure Internet trafikoa zifratzeko eta mundu osoan barrena hainbat konputagailuetatik pasatuz ezkutatzeko. Tor software askea eta sare irekia da, askatasun eta pribatutasun pertsonala, aktibitate eta erlazio komertzial konfidentzialak erasotzen dituen sare analisi moten kontra eginez babesten zaituena.</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="status_shutting_down">TorService itzaltzen ari da</string>
+  <string name="tor_process_starting">Tor bezeroa hasten...</string>
+  <string name="tor_process_complete">eginda.</string>
+    <string name="menu_settings">Ezarpenak</string>
+  <string name="menu_log">Egunkaria</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">Jaitsiera</string>
+  <string name="main_layout_upload">Igoera</string>
+    <string name="button_about">Honi buruz</string>
+    <string name="menu_exit">Irten</string>
+  <string name="menu_scan">Eskaneatu BridgeQR</string>
+  <string name="menu_share_bridge">Partekatu BridgeQR</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_details_msg">Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent eta Polipo dituen kode irekiko aplikazio bat da Orbot. Tor sarera sartzeko HTTP proxya (8118) eta SOCKS proxya (9050) eskaintzen ditu. Rooteatutako gailuetan Orbot-ek interneteko trafiko guztia Tor bidez bidali dezake baita ere.</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <string name="pref_general_group">Orokorra</string>
+  <string name="pref_start_boot_title">Hasi Orbot abioan</string>
+  <string name="pref_start_boot_summary">Hasi Orbot automatikoki  eta konektatu Tor zure Android gailua abiarazterakoan</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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_allow_background_starts_title">Baimendu bigarren planoko abioak</string>
+  <string name="pref_allow_background_starts_summary">Baimendu edozein aplikaziok Orbot-i Tor eta dagozkion zerbitzuak abiaraztea agintzea</string>
+    <string name="pref_proxy_title">Irteera sareko proxya (Aukerazkoa)</string>
+  <string name="pref_proxy_type_title">Ireteera-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">Irteera-proxy ostalaria</string>
+  <string name="pref_proxy_host_summary">Proxy zerbitzariaren ostalari-izena</string>
+  <string name="pref_proxy_host_dialog">Sartu proxy-aren ostalaria</string>
+  <string name="pref_proxy_port_title">Irteera proxy-aren ataka</string>
+  <string name="pref_proxy_port_summary">Proxy zerbitzariaren ataka</string>
+  <string name="pref_proxy_port_dialog">Sartu Proxy-aren ataka</string>
+  <string name="pref_proxy_username_title">Irteerako proxyaren erabiltzaile-izena</string>
+  <string name="pref_proxy_username_summary">Proxyaren erabiltzaile-izena (aukerazkoa)</string>
+  <string name="pref_proxy_username_dialog">Sartu proxyaren erabiltzaile-izena</string>
+  <string name="pref_proxy_password_title">Irteerako proxyaren pasahitza</string>
+  <string name="pref_proxy_password_summary">Proxyaren pasahitza (Aukerazkoa)</string>
+  <string name="pref_proxy_password_dialog">Sartu proxyaren pasahitza</string>
+    <string name="couldn_t_start_tor_process_">Ezin izan da Tor prozesua hasi:</string>
+    <string name="error">Errorea</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">Sartu irteera nodoak</string>
+  <string name="exclude_nodes">Baztertu nodoak</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Baztertuko diren hatzmarkak, ezizenak, herrialdeak eta helbideak</string>
+  <string name="enter_exclude_nodes">Sartu baztertzeko nodoak</string>
+  <string name="strict_nodes">Nodo hertsiak</string>
+  <string name="use_only_these_specified_nodes">Erabili *bakarrik* zehaztutako nodo hauek</string>
+  <string name="bridges">Zubiak</string>
+  <string name="use_bridges">Erabili zubiak</string>
+    <string name="enable_alternate_entrance_nodes_into_the_tor_network">Gaitu ordezko sarrerak Tor sarera</string>
+    <string name="ip_address_and_port_of_bridges">Zubien IP helbidea eta ataka</string>
+  <string name="enter_bridge_addresses">Sartu zubien helbideak</string>
+  <string name="relays">Erreleak</string>
+  <string name="relaying">Erreleatzea</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Gaitu zure gailua ez-irteerako errelea izatea</string>
+  <string name="relay_port">Errele ataka</string>
+  <string name="listening_port_for_your_tor_relay">Zure Tor errelearentzako entzuteko portua</string>
+  <string name="enter_or_port">Sartu OR ataka</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 errele pertsonalaren ezizena</string>
+  <string name="reachable_addresses">Helbide atzigarriak</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Exekutatu politika murriztaileak dituen suebakiaren atzean dagoen bezero gisa</string>
+  <string name="reachable_ports">Ataka atzigarriak</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Suebaki murriztailearen atzetik atzigarri diren atakak</string>
+  <string name="enter_ports">Sartu atakak</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">gaitu arazketarako egunkariak (adb edo aLogCat erabili behar da ikusteko)</string>
+  <string name="project_home">Proiektuaren etxea(k):</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+    <string name="third_party_software">Hirugarrengoen 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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">Aplikazio batek ezkutuko zerbitzariko %1$s ataka ireki nau du Tor sarera. Segurua da aplikazioaz fidatzen bazara.</string>
+  <string name="found_existing_tor_process">aurreko Tor prozesu bat aurkitu da...</string>
+  <string name="something_bad_happened">Zerbait txarra gertatu da. Begiratu egunkarian</string>
+    <string name="unable_to_read_hidden_service_name">ezin izan da ezkutuko zerbitzuaren izena irakurri</string>
+  <string name="unable_to_start_tor">Ezin izan da Tor hasi:</string>
+    <string name="pref_use_persistent_notifications">Mantendu ikonoa tresna barran Orbot konektatuta dagoenean</string>
+  <string name="pref_use_persistent_notifications_title">Beti piztutako jakinarazpenak</string>
+  <string name="pref_use_expanded_notifications">Erakutsi hedatutako jakinarazpenak Tor irteera herrialde eta IP-arekin</string>
+  <string name="pref_use_expanded_notifications_title">Hedatutako jakinarazpenak</string>
+    <string name="set_locale_title">Hizkuntza</string>
+    <string name="no_internet_connection_tor">Ez dago Interneterako konexiorik; Tor egonean dago...</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">Tor identitate berri batera aldatu duzu!</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Sare konexiorik ez. Tor lotan jartzen...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Sare konexioa berreskuratu da. Tor esnatzen...</string>
+  <string name="updating_settings_in_tor_service">Tor zerbitzuaren ezarpenak eguneratzen</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Tor-ek bere SOCKS proxya eskaintzeko ataka (Lehenetsia: 9050 edo 0 desgaitzeko)</string>
+  <string name="pref_socks_dialog">SOCKS atakaren konfigurazioa</string>
+  <string name="pref_transport_title">Tor proxy gardenaren ataka</string>
+  <string name="pref_transport_summary">Tor-ek bere Proxy gardena eskaintzeko ataka (Lehenetsia: 9040 edo 0 desgaitzeko)</string>
+  <string name="pref_transport_dialog">Proxy gardenaren atakaren konfigurazioa</string>
+  <string name="pref_dnsport_title">Tor DNS ataka</string>
+  <string name="pref_dnsport_summary">Tor-ek bere DNS-a eskaintzeko ataka (Lehenetsia: 5400 edo 0 desgaitzeko)</string>
+  <string name="pref_dnsport_dialog">DNS atakaren konfigurazioa</string>
+  <string name="pref_torrc_title">Torrc konfigurazio pertsonala</string>
+  <string name="pref_torrc_summary">ADITUAK BESTERIK EZ: sartu torrc konfigurazio lerroak</string>
+  <string name="pref_torrc_dialog">Torrc pertsonalizatua</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">Zubiak eguneratuta</string>
+  <string name="restart_orbot_to_use_this_bridge_">Berrabiarazi Orbot aldaketak aplikatzeko</string>
+  <string name="menu_qr">QR Kodeak</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_">Zure sare mugikorrak Tor nahita blokeatzen badu, \'Zubi zerbitzaria\' erabili dezakezu ordezko sarbide gisa. HAUTATU konfiguratzeko aukera bat eta probatu...</string>
+  <string name="bridge_mode">Zubi modua</string>
+  <string name="get_bridges_email">E-mail</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Aktibatu</string>
+  <string name="apps_mode">VPN modua</string>
+    <string name="send_email">Bidali E-maila</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_">Zubi helbide bat lortu dezakezu e-mail eta web bidez edo QR kode bat eskaneatuz. Hautatu \'E-mail\' edo \'Web\' behean zubi helbide bat eskatzeko.\n\nBehin helbide bat duzula, kopiatu eta itsatsi ezazu Orbot ezarpenetako \"Zubiak\" atalean eta berrabiarazi.</string>
+    <string name="vpn_default_world">Orokorra (Automatikoa)</string>
+  <string name="hidden_services">Ezkutuko zerbitzuak</string>
+  <string name="title_activity_hidden_services">Ezkutuko zerbitzuak</string>
+  <string name="menu_hidden_services">Ezkutuko zerbitzuak</string>
+  <string name="save">Gorde</string>
+    <string name="local_port">Ataka lokala</string>
+  <string name="onion_port">Onion ataka</string>
+  <string name="name">Izena</string>
+  <string name="done">Egina!</string>
+  <string name="invalid_port">Ataka baliogabea</string>
+  <string name="copy_address_to_clipboard">Kopiatu helbidea arbelera</string>
+  <string name="show_auth_cookie">Erakutsi autentifikazio cookie-a</string>
+  <string name="backup_service">Egin zerbitzuaren babeskopia</string>
+  <string name="delete_service">Ezabatu zerbitzua</string>
+  <string name="backup_saved_at_external_storage">Babeskopia kanpo biltegiratzean gorde da</string>
+  <string name="backup_restored">Babeskopia berrezarri da</string>
+  <string name="filemanager_not_available">Fitxategi kudeatzailea ez dago eskuragarri</string>
+  <string name="please_grant_permissions_for_external_storage">Eman kanpo biltegiratzerako baimena</string>
+    <string name="restore_backup">Berrezarri babeskopia</string>
+  <string name="create_a_backup_first">Sortu babeskopia aurretik</string>
+  <string name="name_can_t_be_empty">Izena ezin da hutsik egon</string>
+  <string name="fields_can_t_be_empty">Eremuak ezin dira hutsik egon</string>
+  <string name="start_tor_again_for_finish_the_process">Hasi Tor berriro prozesua amaitzeko</string>
+  <string name="confirm_service_deletion">Berretsi zerbitzua ezabatzea</string>
+  <string name="click_again_for_backup">Egin klik berriro babeskopiarako</string>
+  <string name="service_type">Zerbitzu mota</string>
+  <string name="auth_cookie">Autentifikazio cookie-a</string>
+  <string name="copy_cookie_to_clipboard">Kopiatu cookie-a arbelera</string>
+  <string name="auth_cookie_was_not_configured">Ez da autentifikazio cookie-a konfiguratu</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Mesedez berrabiarazi Orbot aldaketak aktibatzeko</string>
+  <string name="client_cookies">Bezero-cookie-ak</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">.onion helbide baliogabea</string>
+  <string name="cookie_from_QR">Irakurri QR-tik</string>
+  <string name="backup_cookie">Egin cookie-aren babeskopia</string>
+  <string name="delete_cookie">Ezabatu cookie-a</string>
+  <string name="confirm_cookie_deletion">Berretsi cookie-a ezabatzea</string>
+  <string name="hosted_services">Ostatatutako zerbitzuak</string>
+  <string name="share_as_qr">Partekatu QR gisa</string>
+  <string name="disable">Desgaitu</string>
+  <string name="enable">Gaitu</string>
+  <string name="consider_disable_battery_optimizations">Aztertu bateria optimizazioak desgaitzea</string>
+  <string name="consider_enable_battery_optimizations">Aztertu bateria optimizazioak gaitzea</string>
+  <string name="pref_isolate_dest">Isolatu helbide helburuak</string>
+  <string name="pref_isolate_dest_summary">Erabili zirkuitu desberdin bat helbide helburu bakoitzeko</string>
+  <string name="no_transproxy_warning_short">ABISUA: Proxy gardenak ez du euskarria jada</string>
+  <string name="no_transproxy_warning">ABISUA: Proxy gardenak ez du euskarria jada. Erabili Orbot aplikazioen VPN-a ordez.</string>
+  <string name="pref_connection_padding">Konexioaren betegarria</string>
+  <string name="pref_connection_padding_summary">Beti gaitzen du konexioaren betegarria trafikoaren azterketa motza batzuetaz babesteko. Lehenetsita: automatikoa</string>
+  <string name="pref_reduced_connection_padding">Konexioaren betegarria gutxitua</string>
+  <string name="pref_reduced_connection_padding_summary">Errelearen konexioa azkarrago ixten du eta pakete betegarri gutxiago bidaltzen ditu datu eta bateria erabilera gutxiagotzeko</string>
+    <string name="app_shortcuts">Tor-gaitutako aplikazioak</string>
+    <string name="testing_bridges">Zubiaren Tor konexioa egiaztatzen...</string>
+  <string name="testing_bridges_success">Arrakasta. Zubiaren konfigurazioa egokia da!</string>
+  <string name="testing_bridges_fail">HUTSA. Saiatu beste aukera bat</string>
+  <string name="bridge_direct_connect">Konektatu zuzenean Tor sarera (Onena)</string>
+  <string name="bridge_community">Konektatu komunitatearen zerbitzarietatik</string>
+  <string name="bridge_cloud">Konektatu hodeiko zerbitzarietatik</string>
+  <string name="bridges_get_new">Eskatu zubi berriak... (Beste guztiak huts egiten badu)</string>
+  <string name="trouble_connecting">Arazoak konektatzeko?</string>
+  <string name="full_device_vpn">Gailu osoaren VPN-a</string>
+  <string name="vpn_disabled">VPN-a desgaituta</string>
+</resources>
diff --git a/app-mini/src/main/res/values-fa/poestrings.xml b/app-mini/src/main/res/values-fa/poestrings.xml
new file mode 100644
index 00000000..12445012
--- /dev/null
+++ b/app-mini/src/main/res/values-fa/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">گاهی اوقات برای اتصال به شبکه‌ تور نیاز به یک پل ارتباطی دارید.</string>
+    <string name="action_more">توضیح بیشتر</string>
+
+    <string name="vpn_setup">شما می‌توانید به کمک VPN ساخته شده درون اپلیکیشنِ ما، اتصال به شبکه‌ی تور را برای هر برنامه‌ای فعال کنید.</string>
+    <string name="vpn_setup_sub">این شما را بی نام و نشان نمی‌کند اما به شما در عبور از فایروال‌ها کمک می‌کند.</string>
+    <string name="action_vpn_choose">اپ‌ها را انتخاب کن</string>
+
+    <string name="hello">سلام</string>
+    <string name="welcome">به تور بر روی تلفن همراه خوش آمدید.</string>
+
+    <string name="browser_the_internet">همان‌طوری که دوست دارید اینترنت‌گردی کنید.</string>
+    <string name="no_tracking">بدون ردیابی. بدون سانسور.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-fa/strings.xml b/app-mini/src/main/res/values-fa/strings.xml
new file mode 100644
index 00000000..b92f338f
--- /dev/null
+++ b/app-mini/src/main/res/values-fa/strings.xml
@@ -0,0 +1,206 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">روبات پیازی</string>
+  <string name="app_description">اربت یک برنامه پروکسی مجانی است که دیگر برنامه ها را به استفاده امن از اینترنت توانمند می کند . اربوت از تور برای رمزگذاری کردن ترافیک اینترنت شما استفاده می کند و بعد آن ها را از طریق کامپیوترهای متفاوت در نقاط مختلف جهان مخفی می کند. تور یک برنامه مجانی و شبکه باز است که شما از شما در مقابل تحت نظر بودن در شبکه٬‌  تهدید آزادی های شخصی٬ خصوصی٬ فعالیت های کاری و رابطه های شخصی بطور امن محافظت می کند. </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="menu_settings">تنظیمات</string>
+  <string name="menu_log">ورود</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_about">درباره</string>
+    <string name="menu_exit">خروج</string>
+  <string name="menu_scan">اسکن BridgeQR</string>
+  <string name="menu_share_bridge">اشتراک BridgeQR</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">اوربات نرم‌افزاری آزاد است که شامل تور، Obfs4Proxy، BadVPN Tun2Socks، LibEvent و پولیپو می‌شود. این نرم‌افزار یک اچ‌تی‌تی‌پی پراکسی (8118) و ساکس (9050) محلی روی شبکه تور فراهم می‌کند. همچنین اوربات می‌تواند روی دستگاه‌های روت شده، تمام ترافیک اینترنت را ار تور عبور دهد.</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="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="couldn_t_start_tor_process_"> تور نتواست اجرا شود:</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="enable_alternate_entrance_nodes_into_the_tor_network">ورودی‌های جایگزین به شبکه تور را فعال کن</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_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="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="obfsproxy_version">Obfs4proxy نسخه‌ی 0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">اپلیکیشنی می‌خواهد پورت سرور %1$s را به شبکه تور بگشاید. در صورتی که به این برنامه اطمینان دارید، چنین کاری امن است.</string>
+  <string name="found_existing_tor_process">یک تور درحال اجرا پیدا شد...</string>
+  <string name="something_bad_happened">اتفاق بدی افتاد. وقایع ثبت شده را چک کنید</string>
+    <string name="unable_to_read_hidden_service_name">ناتوان در خواندن نام سرویس مخفی</string>
+  <string name="unable_to_start_tor">ناتوان در راه اندازی تور:</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="set_locale_title">زبان</string>
+    <string name="no_internet_connection_tor">ارتباط اینترنتی وجود ندارد; تور آماده کار است... </string>
+    <string name="pref_disable_network_title">خاموش کردن در صورت عدم وجود شبکه</string>
+  <string name="pref_disable_network_summary">در صورتی که شبکه وجود نداشته باشد خاموش شود</string>
+  <string name="newnym">شما به شناسه جدید تور منتقل شدید</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="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="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_">اگر شبکه همراهتان به صورت مرتب تور را مسدود می‌کند، می‌توانید از یک «کارساز پل» به عنوان راهی جایگزین برای ورود استفاده کنید. برای پیکربندی و تست، یکی از گزینه‌ها را انتخاب کنید…</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="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="vpn_default_world">جهانی (خودکار)</string>
+  <string name="hidden_services">سرویس‌های مخفی</string>
+  <string name="title_activity_hidden_services">سرویس‌های مخفی</string>
+  <string name="menu_hidden_services">سرویس‌های مخفی</string>
+  <string name="save">ذخيره</string>
+    <string name="local_port">درگاه محلی</string>
+  <string name="onion_port">درگاه پیازی</string>
+  <string name="name">نام</string>
+  <string name="done">انجام شد!</string>
+  <string name="invalid_port">درگاه نامعتبر</string>
+  <string name="copy_address_to_clipboard">رونوشت نشانی‌ها در حافظه موقت</string>
+  <string name="show_auth_cookie">نمایش کوکی احراز هویت</string>
+  <string name="backup_service">سرویس بک‌آپ</string>
+  <string name="delete_service">حذف سرویس</string>
+  <string name="backup_saved_at_external_storage">بک‌آپ در انباره خارجی ذخیره شد</string>
+  <string name="backup_restored">بک‌آپ بازگردانده شد</string>
+  <string name="filemanager_not_available">Filemanager موجود نیست</string>
+  <string name="please_grant_permissions_for_external_storage">لطفا به  انباره خارجی اجازه دسترسی بدهید</string>
+    <string name="restore_backup">برگرداندن بک‌آپ</string>
+  <string name="create_a_backup_first">اول یک نسخه بک‌آپ درست کنید</string>
+  <string name="name_can_t_be_empty">نام نباید خالی باشد</string>
+  <string name="fields_can_t_be_empty">زمینه‌ها نباید خالی باشند</string>
+  <string name="start_tor_again_for_finish_the_process">برای پایان روند کار ، دوباره تور را آغاز کنید</string>
+  <string name="confirm_service_deletion">حذف سرویس را تایید کنید</string>
+  <string name="click_again_for_backup">برای بک‌آپ، دوباره کلیک کنید</string>
+  <string name="service_type">نوع سرویس</string>
+  <string name="auth_cookie">کوکی Auth</string>
+  <string name="copy_cookie_to_clipboard">کپی کردن کوکی به کلیپ بورد</string>
+  <string name="auth_cookie_was_not_configured">کوکی احراز هویت پیکربندی نشده بود</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">برای دیدن تغییرات، اوربات  را دوباره راه اندازی کنید</string>
+  <string name="client_cookies">کوکی‌های Client</string>
+  <string name="onion">onion.</string>
+  <string name="invalid_onion_address">نشانی نامعتبر onion. </string>
+  <string name="cookie_from_QR">از QR بخوان</string>
+  <string name="backup_cookie">بک‌آپ از کوکی</string>
+  <string name="delete_cookie">حذف کوکی</string>
+  <string name="confirm_cookie_deletion">تایید حذف کوکی</string>
+  <string name="hosted_services">سرویس‌های میزبانی‌شده</string>
+  <string name="share_as_qr">هم‌رسانی با QR</string>
+  <string name="disable">غیرفعال کن</string>
+  <string name="enable">فعال کن</string>
+  <string name="consider_disable_battery_optimizations">غیرفعال کردن بهینه‌سازی باتری را مدنظر قرار دهید</string>
+  <string name="consider_enable_battery_optimizations">فعال کردن بهینه‌سازی باتری را مدنظر قرار دهید</string>
+  <string name="pref_isolate_dest">آدرس‌های مقصد را مجزا کن</string>
+  <string name="pref_isolate_dest_summary">برای هر آدرس مقصد از مداری متفاوت استفاده کن</string>
+  <string name="no_transproxy_warning_short">هشدار: پراکسی کردن شفاف دیگر پشتیبانی نمی‌شود</string>
+  <string name="no_transproxy_warning">هشدار: پراکسی کردن شفاف پشتیبانی نمی‌شود. از Orbot Apps VPN استفاده کنید.</string>
+  <string name="pref_connection_padding">پهنای ارتباط</string>
+  <string name="pref_connection_padding_summary">همیشه لایه‌گذاری ارتباط را فعال می‌کند تا با برخی از حالت‌های تحلیل ترافیک مقابله کند. پیش‌فرض: خودکار</string>
+  <string name="pref_reduced_connection_padding">پنهای ارتباط کاهش پیدا کرد</string>
+  <string name="pref_reduced_connection_padding_summary">اتصال بازپخش‌کننده‌های ارتباطی را زودتر قطع می‌کند و بسته‌های لایه‌گذاری کمتری ارسال می‌کند تا استفاده داده و مصرف باتری را کاهش دهد</string>
+    <string name="app_shortcuts">اپ‌های فعال شده توسط تور</string>
+    <string name="testing_bridges">تست اتصال پل به تور…</string>
+  <string name="testing_bridges_success">با موفقیت انجام شد. پیکربندی پل خوب است!</string>
+  <string name="testing_bridges_fail">انجام نشد. گزینه‌ی دیگری را انتخاب کنید </string>
+  <string name="bridge_direct_connect">اتصال مستقیم به تور (بهترین عملکرد)</string>
+  <string name="bridge_community">اتصال از طریق سرورهای جامعه</string>
+  <string name="bridge_cloud">اتصال از طریق سرورهای ابری</string>
+  <string name="bridges_get_new">درخواست پل‌های ارتباطی جدید... (اگر تمامی روش‌های دیگر کار نکردند)</string>
+  <string name="trouble_connecting">در اتصال مشکل دارید؟</string>
+  <string name="full_device_vpn">VPN برای تمام دستگاه</string>
+  <string name="vpn_disabled">VPN غیر فعال شد</string>
+</resources>
diff --git a/app-mini/src/main/res/values-fi/strings.xml b/app-mini/src/main/res/values-fi/strings.xml
new file mode 100644
index 00000000..53c47265
--- /dev/null
+++ b/app-mini/src/main/res/values-fi/strings.xml
@@ -0,0 +1,146 @@
+<?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="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="status_shutting_down">Tor-palvelua sammutetaan</string>
+  <string name="tor_process_starting">Käynnistetään Tor-ohjelmaa...</string>
+  <string name="tor_process_complete">valmis.</string>
+  <string name="menu_settings">Asetukset</string>
+  <string name="menu_log">Loki</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_about">Tietoa</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="btn_okay">Selvä</string>
+  <string name="btn_cancel">Peru</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Joitakin Orbotin lisätietoja</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <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-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <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, nimimerkit, maat ja osoitteet ensimmäiseen hyppyyn</string>
+  <string name="pref_entrance_node_dialog">Kirjoita sisääntulosolmujen nimet</string>
+  <string name="pref_allow_background_starts_title">Salli taustalla käynnistys</string>
+  <string name="pref_allow_background_starts_summary">Salli sovellusten pyytää Orbottia käynnistämään Tor ja siihen liittyvät palvelut</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 yhteyskäytäntö: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Kirjoita välityspalvelintyyppi</string>
+  <string name="pref_proxy_host_title">Lähtevän välityspalvelimen tietokone</string>
+  <string name="pref_proxy_host_summary">Välityspalvelimen tietokoneen nimi</string>
+  <string name="pref_proxy_host_dialog">Kirjoita välityspalvelimen tietokone</string>
+  <string name="pref_proxy_port_title">Lähtevän vä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">Lähtevän välityspalvelimen käyttäjätunnus</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">Lähtevän vä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="couldn_t_start_tor_process_">Tor-prosessin käynnistäminen epäonnistui:</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, nimimerkit, 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, nimimerkit, 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="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">Ota laitteesi käyttöön 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 oma 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_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ota käyttöön virheenjäljitysloki 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="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="found_existing_tor_process">löytyi olemassaoleva Tor-prosessi...</string>
+  <string name="something_bad_happened">Jotain pahaa tapahtui. Tarkista loki</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="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="set_locale_title">Kieli</string>
+  <string name="no_internet_connection_tor">Ei internet-yhteyttä; Tor on valmiustilassa...</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="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-välityspalvelin 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="kbps">kilobittiä per sekunti</string>
+  <string name="mbps">megabittiä per sekunti</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="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="hidden_services">Piilopalvelut</string>
+  <string name="title_activity_hidden_services">Piilopalvelut</string>
+  <string name="menu_hidden_services">Piilopalvelut</string>
+  <string name="save">Tallenna</string>
+  <string name="name">Nimi</string>
+  <string name="done">Valmis!</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Käynnistä Orbot uudelleen ottaaksesi muutokset käyttöön</string>
+  <string name="disable">Poista käytöstä</string>
+  <string name="enable">Ota käyttöön</string>
+</resources>
diff --git a/app-mini/src/main/res/values-fr-rFR/strings.xml b/app-mini/src/main/res/values-fr-rFR/strings.xml
new file mode 100644
index 00000000..ec082972
--- /dev/null
+++ b/app-mini/src/main/res/values-fr-rFR/strings.xml
@@ -0,0 +1,140 @@
+<?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="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="menu_settings">Paramètres</string>
+  <string name="menu_log">Journal</string>
+    <string name="menu_start">Démarrer</string>
+  <string name="menu_stop">Arrêter</string>
+  <string name="menu_about">À propos</string>
+    <string name="main_layout_download">Télchargement</string>
+  <string name="main_layout_upload">Téléversement</string>
+    <string name="button_about">À propos</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="btn_okay">OK</string>
+  <string name="btn_cancel">Annuler</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Quelques détails sur Orbot</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="pref_proxy_title">Mandataire pour le réseau sortant (facultatif)</string>
+  <string name="pref_proxy_type_title">Type de mandataire sortant</string>
+  <string name="pref_proxy_type_summary">Protocole à utiliser pour le 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 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 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 (facultatif)</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 (facultatif)</string>
+  <string name="pref_proxy_password_dialog">Saisir le mot de passe du mandataire</string>
+    <string name="couldn_t_start_tor_process_">Impossible de démarrer le processus Tor : </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="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">Relais</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_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="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="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="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="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">Notifications toujours actives</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="set_locale_title">Langue</string>
+    <string name="no_internet_connection_tor">Pas de connexion Internet ; Tor est en attente...</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="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="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="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="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="save">Enregistrer</string>
+  <string name="name">Name</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Veuillez redémarrer Orbot pour activer les changements</string>
+</resources>
diff --git a/app-mini/src/main/res/values-fr/poestrings.xml b/app-mini/src/main/res/values-fr/poestrings.xml
new file mode 100644
index 00000000..05d0d213
--- /dev/null
+++ b/app-mini/src/main/res/values-fr/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">Il vous faut parfois utiliser un pont pour accéder à Tor.</string>
+    <string name="action_more">M’EN DIRE DAVANTAGE</string>
+
+    <string name="vpn_setup">Vous pouvez permettre à n’importe quelle appli de passer par Tor en utilisant notre RPV intégré.</string>
+    <string name="vpn_setup_sub">Cette fonction ne vous rendra pas anonyme, mais elle vous aidera à traverser les pare-feu.</string>
+    <string name="action_vpn_choose">CHOISIR LES APPLIS</string>
+
+    <string name="hello">Bonjour</string>
+    <string name="welcome">Bienvenue sur Tor pour appareil mobile.</string>
+
+    <string name="browser_the_internet">Parcourez Internet comme vous vous attendez à le faire.</string>
+    <string name="no_tracking">Pas de suivi à la trace. Pas de censure.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-fr/strings.xml b/app-mini/src/main/res/values-fr/strings.xml
new file mode 100644
index 00000000..2c163e96
--- /dev/null
+++ b/app-mini/src/main/res/values-fr/strings.xml
@@ -0,0 +1,206 @@
+<?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="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="menu_settings">Paramètres</string>
+  <string name="menu_log">Journal</string>
+    <string name="menu_start">Démarrer</string>
+  <string name="menu_stop">Arrêter</string>
+  <string name="menu_about">À propos</string>
+    <string name="main_layout_download">Télchargement</string>
+  <string name="main_layout_upload">Téléversement</string>
+    <string name="button_about">À propos</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="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, Obfs4Proxy, BadVPN Tun2Socks, 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 débridé, d’envoyer tout le trafic Internet par Tor.</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="pref_proxy_title">Mandataire pour le réseau sortant (facultatif)</string>
+  <string name="pref_proxy_type_title">Type de mandataire sortant</string>
+  <string name="pref_proxy_type_summary">Protocole à utiliser pour le 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 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 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 (facultatif)</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 (facultatif)</string>
+  <string name="pref_proxy_password_dialog">Saisir le mot de passe du mandataire</string>
+    <string name="couldn_t_start_tor_process_">Impossible de démarrer le processus Tor : </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="enable_alternate_entrance_nodes_into_the_tor_network">Activer les entrées de remplacement vers le réseau Tor</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">Relais</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_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="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="obfsproxy_version">Obfs4proxy v0.0.8 : https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j : http://www.openssl.org</string>
+  <string name="hidden_service_request">Une appli veut ouvrir le port %1$s du serveur caché au réseau Tor. Cela 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="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="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">Notifications toujours actives</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="set_locale_title">Langue</string>
+    <string name="no_internet_connection_tor">Pas de connexion Internet ; Tor est en attente...</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="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="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 serveur-pont comme moyen de remplacement. CHOISIR une des options pour configurer et tester…</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</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="vpn_default_world">Mondial (Auto)</string>
+  <string name="hidden_services">Services cachés</string>
+  <string name="title_activity_hidden_services">Services cachés</string>
+  <string name="menu_hidden_services">Services cachés</string>
+  <string name="save">Enregistrer</string>
+    <string name="local_port">Port local</string>
+  <string name="onion_port">Port oignon</string>
+  <string name="name">Nom</string>
+  <string name="done">Fait !</string>
+  <string name="invalid_port">Port invalide</string>
+  <string name="copy_address_to_clipboard">Copier l’adresse vers le presse-papiers</string>
+  <string name="show_auth_cookie">Afficher le témoin auth</string>
+  <string name="backup_service">Service de sauvegarde</string>
+  <string name="delete_service">Supprimer le service</string>
+  <string name="backup_saved_at_external_storage">La sauvegarde a été enregistrée sur une mémoire externe</string>
+  <string name="backup_restored">La sauvegarde a été restaurée</string>
+  <string name="filemanager_not_available">Le gestionnaire de fichiers n’est pas disponible</string>
+  <string name="please_grant_permissions_for_external_storage">Veuillez accorder les droits vers la mémoire externe</string>
+    <string name="restore_backup">Restaurer la sauvegarde</string>
+  <string name="create_a_backup_first">Créer d’abord une sauvegarde</string>
+  <string name="name_can_t_be_empty">Le nom ne peut pas être vide</string>
+  <string name="fields_can_t_be_empty">Les champs ne peuvent pas être vides</string>
+  <string name="start_tor_again_for_finish_the_process">Redémarrer Tor pour terminer le processus</string>
+  <string name="confirm_service_deletion">Confirmer la suppression du service</string>
+  <string name="click_again_for_backup">Recliquer pour sauvegarder</string>
+  <string name="service_type">Type de service</string>
+  <string name="auth_cookie">Témoin auth</string>
+  <string name="copy_cookie_to_clipboard">Copier le témoin vers le presse-papiers</string>
+  <string name="auth_cookie_was_not_configured">Le témoin auth n’est pas configuré</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Veuillez redémarrer Orbot pour activer les changements</string>
+  <string name="client_cookies">Témoins du client</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">Adresse .onion invalide</string>
+  <string name="cookie_from_QR">Lire d’un code QR</string>
+  <string name="backup_cookie">Sauvegarder le témoin</string>
+  <string name="delete_cookie">Supprimer le témoin</string>
+  <string name="confirm_cookie_deletion">Confirmer la suppression du témoin</string>
+  <string name="hosted_services">Services hébergés</string>
+  <string name="share_as_qr">Partager comme code QR</string>
+  <string name="disable">Désactiver</string>
+  <string name="enable">Activer</string>
+  <string name="consider_disable_battery_optimizations">Envisagez de désactiver les optimisations de la pile</string>
+  <string name="consider_enable_battery_optimizations">Envisagez d’activer les optimisations de la pile</string>
+  <string name="pref_isolate_dest">Isoler les adresses de destination</string>
+  <string name="pref_isolate_dest_summary">Utiliser un circuit différent pour chaque adresse de destination</string>
+  <string name="no_transproxy_warning_short">AVERTISSEMENT : le transrelais n’est plus pris en charge</string>
+  <string name="no_transproxy_warning">AVERTISSEMENT : le relais transparent n’est plus pris en charge. Utiliser plutôt le RPV pour applis d’Orbot.</string>
+  <string name="pref_connection_padding">Bourrage de la connexion</string>
+  <string name="pref_connection_padding_summary">Toujours activer le bourrage de la connexion pour se défendre contre certaines formes d’analyse du trafic. Par défaut de : auto</string>
+  <string name="pref_reduced_connection_padding">Bourrage réduit de la connexion</string>
+  <string name="pref_reduced_connection_padding_summary">Ferme plus tôt les connexions de relais et envoie moins de paquets de bourrage pour réduire les données et l’utilisation de la pile</string>
+    <string name="app_shortcuts">Applis pouvant utiliser Tor</string>
+    <string name="testing_bridges">Test de la connexion-pont vers Tor…</string>
+  <string name="testing_bridges_success">Réussite. La configuration du pont est bonne !</string>
+  <string name="testing_bridges_fail">ÉCHEC. Essayer une autre option</string>
+  <string name="bridge_direct_connect">Se connecter directement à Tor (le mieux)</string>
+  <string name="bridge_community">Se connecter par des serveurs communautaires</string>
+  <string name="bridge_cloud">Se connecter par des serveurs nuagiques</string>
+  <string name="bridges_get_new">Demander de nouveaux ponts… (si tout échoue)</string>
+  <string name="trouble_connecting">Des problèmes de connexion ?</string>
+  <string name="full_device_vpn">RPV de l’appareil entier</string>
+  <string name="vpn_disabled">Le RPV est désactivé</string>
+</resources>
diff --git a/app-mini/src/main/res/values-gl/poestrings.xml b/app-mini/src/main/res/values-gl/poestrings.xml
new file mode 100644
index 00000000..82719775
--- /dev/null
+++ b/app-mini/src/main/res/values-gl/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">A veces precisa unha ponte para chegar a Tor.</string>
+    <string name="action_more">CÓNTAME MÁIS</string>
+
+    <string name="vpn_setup">Pode activar que calquer app pase a través de Tor utilizando a nosa VPN incluída.</string>
+    <string name="vpn_setup_sub">Esto non a fará anónima, pero axudaralle a pasar a través dos cortalumes.</string>
+    <string name="action_vpn_choose">ESCOLLA APPS</string>
+
+    <string name="hello">Ola</string>
+    <string name="welcome">Ben vida a Tor no móbil.</string>
+
+    <string name="browser_the_internet">Navegue por internet do xeito que debería ser.</string>
+    <string name="no_tracking">Sen rastrexos. Sen censura.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-gl/strings.xml b/app-mini/src/main/res/values-gl/strings.xml
new file mode 100644
index 00000000..28b1e619
--- /dev/null
+++ b/app-mini/src/main/res/values-gl/strings.xml
@@ -0,0 +1,206 @@
+<?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="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="status_shutting_down">O ServizoTor estase pechando</string>
+  <string name="tor_process_starting">Iniciando cliente Tor...</string>
+  <string name="tor_process_complete">completado.</string>
+    <string name="menu_settings">Axustes</string>
+  <string name="menu_log">Rexistro (log)</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_about">Sobre</string>
+    <string name="menu_exit">Saír </string>
+  <string name="menu_scan">Escanear BridgeQR</string>
+  <string name="menu_share_bridge">Compartir BridgeQR</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_details_msg">Orbot é unha aplicación de código-aberto que contén a Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent e Polipo. Proporciona un proxy HTTP (8118) e un proxy SOCKS (9050) na rede Tor. Orbot tamén pode, nun dispositivo con acceso root, enviar todo o tráfico de internet a través de Tor.</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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_allow_background_starts_title">Permitir inicio en segundo plano</string>
+  <string name="pref_allow_background_starts_summary">Permitir a calquera app dicirlle a Orbot que inicie Tor e os servizos relacionados</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="couldn_t_start_tor_process_">No se pudio inciar o proceso Tor:</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="enable_alternate_entrance_nodes_into_the_tor_network">Activar entradas alternativas a rede Tor</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_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="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">Unha aplicación quere abrir o porto oculto de servidor %1$s a rede Tor. Esto é seguro se vostede confía na app.</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="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_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="pref_use_expanded_notifications">Mostar notificación extendida co país de saída de Tor e IP</string>
+  <string name="pref_use_expanded_notifications_title">Notificacións extendidas</string>
+    <string name="set_locale_title">Idioma</string>
+    <string name="no_internet_connection_tor">Sen conexión a internet; Tor está a espera...</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="no_network_connectivity_putting_tor_to_sleep_">Sen conexión a rede. Tor agardando...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">A conexión a rede é boa. Espertando a Tor...</string>
+  <string name="updating_settings_in_tor_service">actualizando axustes no servizo Tor</string>
+  <string name="pref_socks_title">SOCKS de Tor</string>
+  <string name="pref_socks_summary">Porto no que Tor ofrece o seu proxy SOCKS (por omisión: 9050 ou 0 para desactivar)</string>
+  <string name="pref_socks_dialog">Axuste do porto SOCKS</string>
+  <string name="pref_transport_title">Porto TransProxy de Tor</string>
+  <string name="pref_transport_summary">Porto no que Tor proporciona o Proxy Transparente (por omisión: 9040 ou 0 para desactivar)</string>
+  <string name="pref_transport_dialog">Axuste do porto TransProxy</string>
+  <string name="pref_dnsport_title">Porto DNS de Tor</string>
+  <string name="pref_dnsport_summary">Porto no que Tor ofrece o seu DNS (por omisión: 5400 ou 0 para desactivar)</string>
+  <string name="pref_dnsport_dialog">Axuste do porto DNS</string>
+  <string name="pref_torrc_title">Axuste Torrc personalizado</string>
+  <string name="pref_torrc_summary">SO PARA EXPERTAS: introducir liñas de configuración directa torrc</string>
+  <string name="pref_torrc_dialog">Torrc personalizado</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 actualizadas</string>
+  <string name="restart_orbot_to_use_this_bridge_">Por favor, reinicie Orbot para activar os cambios</string>
+  <string name="menu_qr">Códigod 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 a súa rede móbil bloquea Tor de xeito activo, pode utilizar un \'Servidor Ponte\' como modo alternativo. ESCOLL unha das opcións para configurar e probar...</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">Activar</string>
+  <string name="apps_mode">Modo VPN</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_">Pode obter un enderezo de ponte a través de correo electrónico, na web ou escaneando o código QR de unha ponte. Escolla abaixo \'Correo-e\' ou \'Web\' para solicitar un enderezo de ponte.\n\nUnha vez teña un enderezo, cópieo e pégueo no axuste \"Pontes\" na configuración de Orbot e reinicie.</string>
+    <string name="vpn_default_world">Global (Auto)</string>
+  <string name="hidden_services">Servizos agochados</string>
+  <string name="title_activity_hidden_services">Servizos agochados</string>
+  <string name="menu_hidden_services">Servizos agochados</string>
+  <string name="save">Gardar</string>
+    <string name="local_port">Porto local</string>
+  <string name="onion_port">Porto Onion</string>
+  <string name="name">Nome</string>
+  <string name="done">Feito!</string>
+  <string name="invalid_port">Porto non válido</string>
+  <string name="copy_address_to_clipboard">Copiar enderezo ao portapapeis</string>
+  <string name="show_auth_cookie">Mostar testemuño de autorización</string>
+  <string name="backup_service">Servizo de respaldo</string>
+  <string name="delete_service">Eliminar servizo</string>
+  <string name="backup_saved_at_external_storage">Respaldo gardado en almacenamento externo</string>
+  <string name="backup_restored">Respaldo restaurado</string>
+  <string name="filemanager_not_available">Xestor de ficheiros non dispoñible</string>
+  <string name="please_grant_permissions_for_external_storage">Por favor, conceda permiso para o almacenamento externo</string>
+    <string name="restore_backup">Restaurar respaldo</string>
+  <string name="create_a_backup_first">Cree un respaldo primeiro</string>
+  <string name="name_can_t_be_empty">O nome non pode quedar baldeiro</string>
+  <string name="fields_can_t_be_empty">Os campos non poden estar baldeiros</string>
+  <string name="start_tor_again_for_finish_the_process">Inicie Tor de novo para rematar o proceso</string>
+  <string name="confirm_service_deletion">Confirme a eliminación do servizo</string>
+  <string name="click_again_for_backup">Pulse de novo para respaldar</string>
+  <string name="service_type">Tipo de servizo</string>
+  <string name="auth_cookie">Testemuño de autorización</string>
+  <string name="copy_cookie_to_clipboard">Copie o testemuño ao portapapeis</string>
+  <string name="auth_cookie_was_not_configured">Non estableceu un testemuño de autorización</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Por favor, reinicie Orbot para activar os cambios</string>
+  <string name="client_cookies">Testemuños do cliente</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">Enderezo .onion non válido</string>
+  <string name="cookie_from_QR">Ler desde QR</string>
+  <string name="backup_cookie">Testemuño de respaldo</string>
+  <string name="delete_cookie">Eliminar testemuño</string>
+  <string name="confirm_cookie_deletion">Confirme a eliminación do testemuño</string>
+  <string name="hosted_services">Servizos hospedados</string>
+  <string name="share_as_qr">Compartir como QR</string>
+  <string name="disable">Inhabilitar</string>
+  <string name="enable">Activar</string>
+  <string name="consider_disable_battery_optimizations">Considere desactivar as optimizacións da batería</string>
+  <string name="consider_enable_battery_optimizations">Considere activar as optimizacións da batería</string>
+  <string name="pref_isolate_dest">Illar enderezos de destino</string>
+  <string name="pref_isolate_dest_summary">Utilizar un circuito diferente para cada enderezo de destino</string>
+  <string name="no_transproxy_warning_short">AVISO: xa non está soportado o Proxy Transparente</string>
+  <string name="no_transproxy_warning">AVISO: o Proxy Transparente non está soportado. Utilice Orbot VPN Apps no seu lugar.</string>
+  <string name="pref_connection_padding">Espazado da conexión</string>
+  <string name="pref_connection_padding_summary">Activar sempre un espazado na conexión para defenderse contra algúns tipos de análise de tráfico. Por omisión: auto</string>
+  <string name="pref_reduced_connection_padding">Espazado limitado da conexión</string>
+  <string name="pref_reduced_connection_padding_summary">Pecha as conexións de repetidores máis axiña e envía menos paquetes de espazado para reducir os datos e o uso de batería</string>
+    <string name="app_shortcuts">Apps con Tor activado</string>
+    <string name="testing_bridges">Probando a conexión ponte a Tor...</string>
+  <string name="testing_bridges_success">Parabéns. A conexión da Ponte é boa!</string>
+  <string name="testing_bridges_fail">FALLO. Probe outra opción.</string>
+  <string name="bridge_direct_connect">Conectar directamente con Tor (preferido)</string>
+  <string name="bridge_community">Conectar a través de servidores da comunidade</string>
+  <string name="bridge_cloud">Conectar a través de servidores na nube</string>
+  <string name="bridges_get_new">Solicitar Novas Pontes... (si todo o anterior falla)</string>
+  <string name="trouble_connecting">Problemas ao conectar?</string>
+  <string name="full_device_vpn">VPN para todo o dispositivo</string>
+  <string name="vpn_disabled">VPN desactivada</string>
+</resources>
diff --git a/app-mini/src/main/res/values-gu-rIN/strings.xml b/app-mini/src/main/res/values-gu-rIN/strings.xml
new file mode 100644
index 00000000..67ff81c9
--- /dev/null
+++ b/app-mini/src/main/res/values-gu-rIN/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <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-->
+</resources>
diff --git a/app-mini/src/main/res/values-gu/strings.xml b/app-mini/src/main/res/values-gu/strings.xml
new file mode 100644
index 00000000..f04f4533
--- /dev/null
+++ b/app-mini/src/main/res/values-gu/strings.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="menu_settings">સેટિંગ્સ</string>
+  <string name="menu_log">નોંધણી</string>
+    <string name="btn_okay">બરાબર</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="activate">સક્રિય</string>
+  <string name="save">સંગ્રહો</string>
+  <string name="name">નામ</string>
+  <string name="disable">નિષ્ક્રિય કરો</string>
+</resources>
diff --git a/app-mini/src/main/res/values-he/strings.xml b/app-mini/src/main/res/values-he/strings.xml
new file mode 100644
index 00000000..8959f31c
--- /dev/null
+++ b/app-mini/src/main/res/values-he/strings.xml
@@ -0,0 +1,206 @@
+<?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="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="menu_settings">הגדרות</string>
+  <string name="menu_log">יומן</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_about">אודות</string>
+    <string name="menu_exit">יציאה</string>
+  <string name="menu_scan">סרוק BridgeQR</string>
+  <string name="menu_share_bridge">שתף BridgeQR</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, Obfs4Proxy, BadVPN Tun2Socks, LibEvent ו-Polipo. הוא מספק יפוי־כוח מקומי של HTTP (פתחה 8118) ויפוי־כוח SOCKS (פתחה 9050) לתוך רשת Tor. ל-Orbot יש גם את היכולת, במכשירים עם הרשאת שורש, לשלוח את כל תעבורת האינטרנט באמצעות Tor.</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="pref_allow_background_starts_title">אפשר הפעלה ברקע</string>
+  <string name="pref_allow_background_starts_summary">אפשר לכל אפליקציה להפעיל דרך Orbot את Tor ושאר השירותים הקשורים</string>
+    <string name="pref_proxy_title">רשת יפוי־כוח יוצאת (רשותי)</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</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="couldn_t_start_tor_process_">אין אפשרות להתחיל תהליך Tor:</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="enable_alternate_entrance_nodes_into_the_tor_network">אפשר כניסות חלופיות לתוך רשת Tor</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_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="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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">יישום רוצה לפתוח פתחה של שרת נסתר %1$s אל רשת Tor. זה בטוח אם אתה בוטח ביישום.</string>
+  <string name="found_existing_tor_process">נמצא תהליך Tor קיים…</string>
+  <string name="something_bad_happened">משהו רע התרחש. בדוק את היומן</string>
+    <string name="unable_to_read_hidden_service_name">לא היה ניתן לקרוא שם של שירות נסתר</string>
+  <string name="unable_to_start_tor">לא מסוגל להתחיל את Tor:</string>
+    <string name="pref_use_persistent_notifications">לשמור תמיד את האיקון בסרגל כלים כשאורבוט מחובר</string>
+  <string name="pref_use_persistent_notifications_title">התראות תמיד-פועל</string>
+  <string name="pref_use_expanded_notifications">הראה התראה מורחבת עם מדינת יציאה ו-IP יציאה של Tor</string>
+  <string name="pref_use_expanded_notifications_title">התראות מורחבות</string>
+    <string name="set_locale_title">שפה</string>
+    <string name="no_internet_connection_tor">אין חיבור לאינטרנט; תור ממתין...</string>
+    <string name="pref_disable_network_title">אין שינה אוטומטית של רשת</string>
+  <string name="pref_disable_network_summary">כבה את Tor כאשר אין חיבור לאינטרנט</string>
+  <string name="newnym">החלפת אל זהות Tor חדשה!</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">תצורת פתחות 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="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, אתה יכול להשתמש ב\'שרת גשר\' כדרך חלופית להיכנס. בחר אחת מאפשרויות כדי להגדיר ולבחון...</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="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="vpn_default_world">עולמי (אוטומטי)</string>
+  <string name="hidden_services">שירותים נסתרים</string>
+  <string name="title_activity_hidden_services">שירותים נסתרים</string>
+  <string name="menu_hidden_services">שירותים נסתרים</string>
+  <string name="save">שמור את</string>
+    <string name="local_port">פתחה מקומית</string>
+  <string name="onion_port">פתחת בצל</string>
+  <string name="name">שם</string>
+  <string name="done">הסתיים!</string>
+  <string name="invalid_port">פתחה לא תקפה</string>
+  <string name="copy_address_to_clipboard">העתק כתובת ללוח עריכה</string>
+  <string name="show_auth_cookie">הראה עוגיית אימות</string>
+  <string name="backup_service">גבה שירות</string>
+  <string name="delete_service">מחק שירות</string>
+  <string name="backup_saved_at_external_storage">גיבוי נשמר באחסון חיצוני</string>
+  <string name="backup_restored">גיבוי שוחזר</string>
+  <string name="filemanager_not_available">מנהל קבצים אינו זמין</string>
+  <string name="please_grant_permissions_for_external_storage">אנא הענק הרשאות עבור אחסון חיצוני</string>
+    <string name="restore_backup">שחזר גיבוי</string>
+  <string name="create_a_backup_first">צור גיבוי תחילה</string>
+  <string name="name_can_t_be_empty">שם אינו יכול להיות ריק</string>
+  <string name="fields_can_t_be_empty">שדות אינם יכולים להיות ריקים</string>
+  <string name="start_tor_again_for_finish_the_process">הפעל את Tor שוב כדי לסיים את התהליך</string>
+  <string name="confirm_service_deletion">אשר מחיקת שירות</string>
+  <string name="click_again_for_backup">לחץ שוב לגיבוי</string>
+  <string name="service_type">סוג שירות</string>
+  <string name="auth_cookie">עוגיית אימות</string>
+  <string name="copy_cookie_to_clipboard">העתק עוגייה ללוח עריכה</string>
+  <string name="auth_cookie_was_not_configured">עוגיית אימות לא הוגדרה</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">אנא הפעל מחדש את Orbot כדי לאפשר את השינויים</string>
+  <string name="client_cookies">עוגיות לקוח</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">כתובת .onion לא תקפה</string>
+  <string name="cookie_from_QR">קרא מתוך QR</string>
+  <string name="backup_cookie">גבה עוגייה</string>
+  <string name="delete_cookie">מחק עוגייה</string>
+  <string name="confirm_cookie_deletion">אשר מחיקת עוגייה</string>
+  <string name="hosted_services">שירותים מאורחים</string>
+  <string name="share_as_qr">שתף בתור QR</string>
+  <string name="disable">השבת</string>
+  <string name="enable">אפשר</string>
+  <string name="consider_disable_battery_optimizations">שקול להשבית מיטובי סוללה</string>
+  <string name="consider_enable_battery_optimizations">שקול לאפשר מיטובי סוללה</string>
+  <string name="pref_isolate_dest">בודד כתובות יעד</string>
+  <string name="pref_isolate_dest_summary">השתמש במעגל שונה לכל כתובת יעד</string>
+  <string name="no_transproxy_warning_short">אזהרה: יפוי־כוח שקוף אינו נתמך יותר</string>
+  <string name="no_transproxy_warning">אזהרה: יפוי־כוח שקוף אינו נתמך. השתמש ב-VPN של Orbot במקום.</string>
+  <string name="pref_connection_padding">ריפוד חיבור</string>
+  <string name="pref_connection_padding_summary">אפשר תמיד ריפוד חיבור כדי להגן מפני צורות מסוימות של ניתוח תעבורה. ברירת מחדל: אוטומטי</string>
+  <string name="pref_reduced_connection_padding">הופחת ריפוד חיבור</string>
+  <string name="pref_reduced_connection_padding_summary">סוגר חיבורי ממסר מוקדם יותר ושולח פחות חבילות מידע ריפוד כדי להפחית שימוש של נתונים וסוללה.</string>
+    <string name="app_shortcuts">יישומים מאופשרי־Tor</string>
+    <string name="testing_bridges">בוחן חיבור גשר אל Tor...</string>
+  <string name="testing_bridges_success">הצלחה. תצורת הגשר טובה!</string>
+  <string name="testing_bridges_fail">נכשל. נסה אפשרות אחרת</string>
+  <string name="bridge_direct_connect">התחבר ישירות אל Tor (הכי טוב)</string>
+  <string name="bridge_community">התחבר באמצעות שרתי קהילה</string>
+  <string name="bridge_cloud">התחבר באמצעות שרתי ענן</string>
+  <string name="bridges_get_new">בקש גשרים חדשים... (אם כל השאר נכשל)</string>
+  <string name="trouble_connecting">בעית התחברות?</string>
+  <string name="full_device_vpn">VPN מכשיר מלא</string>
+  <string name="vpn_disabled">VPN מושבת</string>
+</resources>
diff --git a/app-mini/src/main/res/values-hi/poestrings.xml b/app-mini/src/main/res/values-hi/poestrings.xml
new file mode 100644
index 00000000..894e1e4e
--- /dev/null
+++ b/app-mini/src/main/res/values-hi/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">कभी-कभी आपको Tor के लिए ब्रिज की जरूरत है</string>
+    <string name="action_more">मुझे और बताइए </string>
+
+    <string name="vpn_setup">आप किसी भी अप्प को टोर के ज़रिय सक्षम क्र सकतें हैं हमारे बिल्ट-इन वी.पी.ऐन द्वारा। </string>
+    <string name="vpn_setup_sub">यह आपको गुमनाम नहीं बना पाएगा, लेकिन इसे फायरवॉल के माध्यम से प्राप्त करने में मदद मिलेगी।</string>
+    <string name="action_vpn_choose">एप्लिकेशन चुनने</string>
+
+    <string name="hello">नमस्ते</string>
+    <string name="welcome">मोबाइल पर टोर में आपका स्वागत है। </string>
+
+    <string name="browser_the_internet">इंटरनेट ब्राउज़ करें कि आप की अपेक्षा कैसे करें</string>
+    <string name="no_tracking">ट्रैकिंग नहीं। कोई सेंसरशिप नहीं</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-hi/strings.xml b/app-mini/src/main/res/values-hi/strings.xml
new file mode 100644
index 00000000..e85f9f9c
--- /dev/null
+++ b/app-mini/src/main/res/values-hi/strings.xml
@@ -0,0 +1,207 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">औरबौट</string>
+  <string name="app_description">औरबोट  कि अन्य क्षुधा की शक्ति प्रदान अधिक सुरक्षित रूप से इंटरनेट का उपयोग करने के लिए एक मुक्त प्रॉक्सी app है। औरबोट अपने इंटरनेट यातायात एन्क्रिप्ट करने के लिए टो का उपयोग करता है और फिर दुनिया भर के कंप्यूटर की एक श्रृंखला के माध्यम से उछल द्वारा यह छुपाता है। टो मुफ्त सॉफ्टवेयर और एक खुला नेटवर्क में मदद करता है कि आप नेटवर्क निगरानी का एक रूप है कि व्यक्तिगत स्वतà¤
 ‚त्रता और गोपनीयता, गोपनीय व्यावसायिक गतिविधियों और रिश्ते, और राज्य सुरक्षा यातायात विश्लेषण के रूप में जाना जाता है के खिलाफ की रक्षा के लिए धमकाता है।</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="menu_settings">सेटिंग्स</string>
+  <string name="menu_log">यात्रा दैनिकी</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_about">बारे में</string>
+    <string name="menu_exit">निकास</string>
+  <string name="menu_scan">स्कैन ब्रिज क्यूआर</string>
+  <string name="menu_share_bridge">शेयर ब्रिज QR</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">ऑरबोट एक ओपन-सोर्स एप्लिकेशन है जिसमें टोर, ओबफ्स 4 प्रोक्सी, बैड वीपीएन टोन 2 एसॉक्स, लिबवेवेंट और पोलीपो शामिल हैं। यह टो नेट नेटवर्क में एक स्थानीय HTTP प्रॉक्सी (8118) और एक सॉक्स प्रॉक्सी (9050) प्रदान करता है। ऑरबोट की भी क्षमता है, रूट डिवाइस पर, टो के माध्यम से सभी इंटरनेट ट्रैफिक भेजने के लिए</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <string name="pref_general_group">समन्य </string>
+  <string name="pref_start_boot_title">बूट पर Orbot शुरू</string>
+  <string name="pref_start_boot_summary">स्वचालित रूप से ऑरबोट प्रारंभ करें और टॉर से कनेक्ट करें जब आपका एंड्रॉइड डिवाइस बूट करता है</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="pref_proxy_title">आउटबाउंड नेटवर्क प्रॉक्सी (वैकल्पिक)</string>
+  <string name="pref_proxy_type_title">आउटबाउंड प्रॉक्सी प्रकार</string>
+  <string name="pref_proxy_type_summary">प्रॉक्सी सर्वर के लिए उपयोग प्रोटोकॉल: एचटीटीपी, हत्तपः, सॉक्स४ , सोक्क५</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="couldn_t_start_tor_process_">तोर प्रक्रिया शुरू नहीं किया जा सका:</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="enable_alternate_entrance_nodes_into_the_tor_network">टोरी नेटवर्क में वैकल्पिक प्रवेश द्वार सक्षम करें</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">दर्ज करें या बंदरगाह</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_debug_log_to_output_must_use_adb_or_alogcat_to_view_">डीबग लॉग आउटपुट को सक्षम करें (देखने के लिए एडीबी या एओॉगटैट का उपयोग करना चाहिए)</string>
+  <string name="project_home">प्रोजेक्ट होम(एस)::</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+    <string name="third_party_software">तृतीय-पक्ष-सॉफ़्टवेयर:</string>
+  <string name="tor_version">तोर : https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+  <string name="polipo_version">पोलीपो v1.1.9: https://github.com/jech/polipo</string>
+  <string name="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">एक ऐप Tor नेटवर्क पर %1$sछिपा सर्वर पोर्ट खोलना चाहता है। यदि आप ऐप पर विश्वास करते हैं, तो यह सुरक्षित है</string>
+  <string name="found_existing_tor_process">मौजूदा तोर प्रक्रिया पाया ...</string>
+  <string name="something_bad_happened">कुछ बुरा हो गया। लॉग की जांच करें</string>
+    <string name="unable_to_read_hidden_service_name">छिपी हुई सेवा का नाम पढ़ने में असमर्थ</string>
+  <string name="unable_to_start_tor">टो शुरू करने में असमर्थ:</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="set_locale_title">भाषा</string>
+    <string name="no_internet_connection_tor">कोई इंटरनेट कनेक्शन नहीं; तोर स्टैंडबाय पर है ...</string>
+    <string name="pref_disable_network_title">कोई नेटवर्क ऑटो-स्लीप नहीं</string>
+  <string name="pref_disable_network_summary">जब कोई इंटरनेट उपलब्ध नहीं है तो तोर को सोएं</string>
+  <string name="newnym">आपने एक नई टोरी पहचान को बदल दिया है!</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="pref_torrc_title">टोररक कस्टम कॉन्फ़िग</string>
+  <string name="pref_torrc_summary">केवल विशेषज्ञ: प्रत्यक्ष टॉर्च कॉन्फ़िग लाइनें दर्ज करें</string>
+  <string name="pref_torrc_dialog">कस्टम टोररक</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_">यदि आपका मोबाइल नेटवर्क सक्रिय रूप से टो को ब्लॉक करता है, तो आप \'पुल सर्वर\' को एक वैकल्पिक तरीके से उपयोग कर सकते हैं। कॉन्फ़िगर और परीक्षण करने के लिए विकल्पों में से एक का चयन करें ..,।</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">वीपीएन मोड</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_">आप ईमेल, वेब के माध्यम से या एक पुल क्यूआर कोड को स्कैन करके एक पुल का पता मिल सकती है। एक पुल का पता अनुरोध करने के लिए \'ईमेल\' या \'वेब\' नीचे का चयन करें। एक बार जब आप एक पता है, कॉपी और यह Orbot की सेटिंग और पुनः आरंभ में \"पुल\" वरीयता में पेस्ट करें।</string>
+    <string name="vpn_default_world">ग्लोबल (ऑटो)</string>
+  <string name="hidden_services">हिडन सेवाएं</string>
+  <string name="title_activity_hidden_services">हिडन सेवाएं</string>
+  <string name="menu_hidden_services">हिडन सेवाएं</string>
+  <string name="save">बचाना</string>
+    <string name="local_port">स्थानीय पोर्ट</string>
+  <string name="onion_port">अनियन पोर्ट</string>
+  <string name="name">नाम</string>
+  <string name="done">किया हुआ!</string>
+  <string name="invalid_port">अमान्य पोर्ट</string>
+  <string name="copy_address_to_clipboard">क्लिपबोर्ड को पता कॉपी करें</string>
+  <string name="show_auth_cookie">Auth कुकी दिखाएं</string>
+  <string name="backup_service">बैकअप सेवा</string>
+  <string name="delete_service">सेवा हटाएँ</string>
+  <string name="backup_saved_at_external_storage">बाह्य संग्रहण में बैकअप सहेजा गया</string>
+  <string name="backup_restored">बैकअप को पुनर्स्थापित किया गया</string>
+  <string name="filemanager_not_available">फाइलमैनेजर उपलब्ध नहीं है</string>
+  <string name="please_grant_permissions_for_external_storage">कृपया बाहरी संग्रहण के लिए अनुमति दें</string>
+    <string name="restore_backup">बैकअप बहाल</string>
+  <string name="create_a_backup_first">पहले बैकअप बनाएं</string>
+  <string name="name_can_t_be_empty">नाम रिक्त नहीं हो सकता</string>
+  <string name="fields_can_t_be_empty">फ़ील्ड रिक्त नहीं हो सकते</string>
+  <string name="start_tor_again_for_finish_the_process">प्रक्रिया को खत्म करने के लिए Tor पुन: प्रारंभ करें</string>
+  <string name="confirm_service_deletion">सेवा हटाने की पुष्टि करें</string>
+  <string name="click_again_for_backup">बैकअप के लिए फिर से क्लिक करें</string>
+  <string name="service_type">सेवा प्रकार</string>
+  <string name="auth_cookie">Auth कुकी</string>
+  <string name="copy_cookie_to_clipboard">क्लिपबोर्ड पर कुकी कॉपी करें</string>
+  <string name="auth_cookie_was_not_configured">Auth कुकी कॉन्फ़िगर नहीं की गई थी</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">परिवर्तन सक्षम करने के लिए Orbot पुनः प्रारंभ करें</string>
+  <string name="client_cookies">क्लाइंट कुकीज़</string>
+  <string name="onion">.अनियन </string>
+  <string name="invalid_onion_address">अमान्य .अमान्य  पतापता</string>
+  <string name="cookie_from_QR">QR से पढ़ें</string>
+  <string name="backup_cookie">बैकअप कुकी</string>
+  <string name="delete_cookie">कुकी हटाएं</string>
+  <string name="confirm_cookie_deletion">कुकी हटाने की पुष्टि करें</string>
+  <string name="hosted_services">होस्टेड सर्विसेस</string>
+  <string name="share_as_qr">QR के रूप में शेयर करें</string>
+  <string name="disable">अक्षम</string>
+  <string name="enable">सक्षम करें</string>
+  <string name="consider_disable_battery_optimizations">बैटरी ऑप्टिमाइज़ेशन को अक्षम करने पर विचार करें</string>
+  <string name="consider_enable_battery_optimizations">बैटरी ऑप्टिमाइज़ेशन को सक्षम करने पर विचार करें</string>
+  <string name="pref_isolate_dest">गंतव्य पते अलग करें</string>
+  <string name="pref_isolate_dest_summary">प्रत्येक गंतव्य पते के लिए एक अलग सर्किट का उपयोग करें</string>
+  <string name="no_transproxy_warning_short">चेतावनी: ट्रांसप्रॉक्सिंग अब समर्थित नहीं है</string>
+  <string name="no_transproxy_warning">चेतावनी: पारदर्शी प्रॉक्सीिंग समर्थित नहीं है। Orbot Apps VPN का उपयोग इसके बजाय</string>
+  <string name="pref_connection_padding">कनेक्शन पैडिंग</string>
+  <string name="pref_connection_padding_summary">ट्रैफिक विश्लेषण के कुछ रूपों से बचाव के लिए हमेशा कनेक्शन पैडिंग सक्षम करता है। डिफ़ॉल्ट: ऑटो</string>
+  <string name="pref_reduced_connection_padding">कम कनेक्शन पैडिंग</string>
+  <string name="pref_reduced_connection_padding_summary">जल्द ही रिले कनेक्शन बंद कर देता है और डेटा और बैटरी उपयोग को कम करने के लिए कम पैडिंग पैकेट भेजता है</string>
+    <string name="app_shortcuts">Tor-सक्षम ऐप्स</string>
+    <string name="testing_bridges">Tor से ब्रिज कनेक्शन का परीक्षण ....</string>
+  <string name="testing_bridges_success">सफलता। पुल विन्यास अच्छा है!</string>
+  <string name="testing_bridges_fail">अनुत्तीर्ण होना। दूसरे विकल्प का प्रयास करें</string>
+  <string name="bridge_direct_connect">सीधे टॉर से कनेक्ट करें (सर्वश्रेष्ठ)</string>
+  <string name="bridge_community">सामुदायिक सर्वर के माध्यम से कनेक्ट करें</string>
+  <string name="bridge_cloud">क्लाउड सर्वर से जुड़ें</string>
+  <string name="bridges_get_new">नई ब्रिज का अनुरोध ... (यदि सब कुछ विफल रहता है)</string>
+  <string name="trouble_connecting">कनेक्ट करने में समस्या?</string>
+  <string name="full_device_vpn">पूर्ण डिवाइस VPN</string>
+  <string name="vpn_disabled">वीपीएन अक्षम किया गया</string>
+</resources>
diff --git a/app-mini/src/main/res/values-hr-rHR/strings.xml b/app-mini/src/main/res/values-hr-rHR/strings.xml
new file mode 100644
index 00000000..ab067581
--- /dev/null
+++ b/app-mini/src/main/res/values-hr-rHR/strings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="menu_settings">Postavke</string>
+    <string name="menu_about">O</string>
+    <string name="button_about">O</string>
+  <string name="menu_exit">Izlaz</string>
+    <string name="btn_cancel">Odustani</string>
+  <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Općenito</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+    <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+    <string name="error">Greška</string>
+</resources>
diff --git a/app-mini/src/main/res/values-hr/strings.xml b/app-mini/src/main/res/values-hr/strings.xml
new file mode 100644
index 00000000..deb23402
--- /dev/null
+++ b/app-mini/src/main/res/values-hr/strings.xml
@@ -0,0 +1,140 @@
+<?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="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="menu_settings">Postavke</string>
+  <string name="menu_log">Dnevnik</string>
+  <string name="menu_start">Početak</string>
+  <string name="menu_stop">Zaustavi</string>
+  <string name="menu_about">O</string>
+  <string name="main_layout_download">Preuzimanje</string>
+  <string name="main_layout_upload">Slanje</string>
+  <string name="button_about">O</string>
+  <string name="menu_exit">Izlaz</string>
+  <string name="menu_scan">Skeniraj BridgeQR</string>
+  <string name="menu_share_bridge">Podijeli BridgeQR</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>
+  <!--END Welcome Wizard strings (DJH)-->
+  <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-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <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="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="couldn_t_start_tor_process_">Nije moguće započeti Tor proces:</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="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_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="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="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="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="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="set_locale_title">Jezik</string>
+  <string name="no_internet_connection_tor">Nema internet veze; Tor je u stanju pripravnosti...</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="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="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="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="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="save">Spremi</string>
+  <string name="name">Ime</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Ponovno pokrenite Orbot da bi omogućili promjene</string>
+</resources>
diff --git a/app-mini/src/main/res/values-hu/poestrings.xml b/app-mini/src/main/res/values-hu/poestrings.xml
new file mode 100644
index 00000000..07b12111
--- /dev/null
+++ b/app-mini/src/main/res/values-hu/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">Néha szüksége lehet Hídra a Tor-hoz.</string>
+    <string name="action_more">SZERETNÉK TÖBBET TUDNI</string>
+
+    <string name="vpn_setup">Gyakorlatilag bármilyen alkalmazást keresztül vezethet a Tor-on a beépített VPN miatt.</string>
+    <string name="vpn_setup_sub">Ez nem teszi anonimmá, de segíthet átjutni a tűzfalakon.</string>
+    <string name="action_vpn_choose">ALKALMAZÁSOK VÁLASZTÁSA</string>
+
+    <string name="hello">Helló</string>
+    <string name="welcome">Üdvözli a Tor a mobilon.</string>
+
+    <string name="browser_the_internet">Böngésszen az interneten, ahogy szeretne.</string>
+    <string name="no_tracking">Nincs követés. Nincs cenzorálás.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-hu/strings.xml b/app-mini/src/main/res/values-hu/strings.xml
new file mode 100644
index 00000000..b7d126be
--- /dev/null
+++ b/app-mini/src/main/res/values-hu/strings.xml
@@ -0,0 +1,206 @@
+<?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="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="menu_settings">Beállítások</string>
+  <string name="menu_log">Log</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="main_layout_download">Letöltés</string>
+  <string name="main_layout_upload">Feltöltés</string>
+    <string name="button_about">Névjegy</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="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 nyilt forráskódú alkalmazás ami Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent és Polipo alkalmazásokat tartalmaz. Helyi  HTTP proxyt (8118) és  SOCKS proxyt (9050) biztosít a Tor hálózatba. Az Orbot továbbá képes arra, hogy rootolt eszközön a teljes internet forgalmat keresztül küldje a Tor-on.</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="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="couldn_t_start_tor_process_">Nem indítható el a Tor folyamat:</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="enable_alternate_entrance_nodes_into_the_tor_network">A Tor hálózat bejáratok váltogatásának engedélyezése </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_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="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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">Egy app egy rejtett szerver portot %1$s nyitna a Tor hálózatra. Ez biztonságos, ha megbízik az appban.</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="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="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="set_locale_title">Nyelv</string>
+    <string name="no_internet_connection_tor">Nincs internetkapcsolat; Tor készenlétben...</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="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="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 mobil hálózata aktívan blokkolja a Tor-t, akkor választhatja a \'Híd szerver\'-t, mint alternatív utat. VÁLASSZON egyet a lehetőségek közül és tesztelje....</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">VPN Mód</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="vpn_default_world">Globális (Auto)</string>
+  <string name="hidden_services">Rejtett szolgáltatások</string>
+  <string name="title_activity_hidden_services">Rejtett szolgáltatások</string>
+  <string name="menu_hidden_services">Rejtett szolgáltatások</string>
+  <string name="save">Mentés</string>
+    <string name="local_port">Helyi Port</string>
+  <string name="onion_port">Onion Port</string>
+  <string name="name">Név</string>
+  <string name="done">Kész!</string>
+  <string name="invalid_port">Érvénytelen Port</string>
+  <string name="copy_address_to_clipboard">Cím másolása vágólapra</string>
+  <string name="show_auth_cookie">Azonosító süti megjelenítése</string>
+  <string name="backup_service">Mentő szolgáltatás</string>
+  <string name="delete_service">Szolgáltatás Törlése</string>
+  <string name="backup_saved_at_external_storage">Külső tárhelyre mentve</string>
+  <string name="backup_restored">Mentés visszaállítva</string>
+  <string name="filemanager_not_available">Fájlkezelő nem elérhető</string>
+  <string name="please_grant_permissions_for_external_storage">Kérjük adjon jogosultságot a külső tárhelyhez</string>
+    <string name="restore_backup">Mentés visszaállítása</string>
+  <string name="create_a_backup_first">Készítsen előbb egy mentést</string>
+  <string name="name_can_t_be_empty">A név nem lehet üres</string>
+  <string name="fields_can_t_be_empty">A mezők nem lehetnek üresek</string>
+  <string name="start_tor_again_for_finish_the_process">Indítsa el a Tor-t még egyszer a befejezéshez</string>
+  <string name="confirm_service_deletion">Szolgáltatás törlés jóváhagyása</string>
+  <string name="click_again_for_backup">Kattintson még egyszer a mentéshez</string>
+  <string name="service_type">Szolgáltatás típus</string>
+  <string name="auth_cookie">Azonosító süti</string>
+  <string name="copy_cookie_to_clipboard">Süti másolása vágólapra</string>
+  <string name="auth_cookie_was_not_configured">Azonosító süti nem konfigurált</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Kérlek indítsd újra az Orbot-ot a változások engedélyezéséhez</string>
+  <string name="client_cookies">Kliens sütik</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">Érvénytelen .onion cím</string>
+  <string name="cookie_from_QR">Olvasás QR-ból</string>
+  <string name="backup_cookie">Süti mentése</string>
+  <string name="delete_cookie">Süti törlése</string>
+  <string name="confirm_cookie_deletion">Süti törlés jóváhagyása</string>
+  <string name="hosted_services">Futtatott szolgáltatások</string>
+  <string name="share_as_qr">Megosztás QR-ként</string>
+  <string name="disable">Kikapcsol</string>
+  <string name="enable">Engedélyezés</string>
+  <string name="consider_disable_battery_optimizations">Vegye fontolóra az akkumulátor optimalizálás tiltását</string>
+  <string name="consider_enable_battery_optimizations">Vegye fontolóra az akkumulátor optimalizálás engedélyezését</string>
+  <string name="pref_isolate_dest">Célcím elszigetelése</string>
+  <string name="pref_isolate_dest_summary">Másik áramkör használata minden célcímhez</string>
+  <string name="no_transproxy_warning_short">FIGYELEM: A Transproxying már nem támogatott</string>
+  <string name="no_transproxy_warning">FIGYELEM: A transzparens proxyzásmár nem támogatott. Használja az Orbot App VPN-t helyette.</string>
+  <string name="pref_connection_padding">Kapcsolat kitöltés</string>
+  <string name="pref_connection_padding_summary">Mindig engedélyezi a kapcsolat kitöltést, hogy megvédjen a hálózati analízistől. Alapértelmezés: auto </string>
+  <string name="pref_reduced_connection_padding">Csökkentett kapcsolat kitöltés</string>
+  <string name="pref_reduced_connection_padding_summary">Hamarabb lezárja a relé kapcsolatokat, és kevesebb kitöltő csomagot küld a csökkentett adat és akkumulátor használat érdekében</string>
+    <string name="app_shortcuts">Tor-engedélyezett Alkalmazások</string>
+    <string name="testing_bridges">A híd Tor-hoz csatlakozásának tesztelése....</string>
+  <string name="testing_bridges_success">Sikeres. A híd konfiguráció megfelelő!</string>
+  <string name="testing_bridges_fail">SIKERTELEN: Próbáljon meg másik beállítást</string>
+  <string name="bridge_direct_connect">Csatlakozás közvetlenül a Tor-hoz (Legjobb)</string>
+  <string name="bridge_community">Csatlakozás közösségi szervereken keresztül</string>
+  <string name="bridge_cloud">Csatlakozás felhőszervereken keresztül</string>
+  <string name="bridges_get_new">Új hidak kérése... (ha más nem segített)</string>
+  <string name="trouble_connecting">Probléma a csatlakozással?</string>
+  <string name="full_device_vpn">Teljes Készülék VPN</string>
+  <string name="vpn_disabled">VPN Letiltva</string>
+</resources>
diff --git a/app-mini/src/main/res/values-hy-rAM/strings.xml b/app-mini/src/main/res/values-hy-rAM/strings.xml
new file mode 100644
index 00000000..808f972e
--- /dev/null
+++ b/app-mini/src/main/res/values-hy-rAM/strings.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="menu_about">Մասին</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="error">Սխալ</string>
+    <string name="save">Պահել</string>
+  <string name="name">Անուն</string>
+</resources>
diff --git a/app-mini/src/main/res/values-ia/strings.xml b/app-mini/src/main/res/values-ia/strings.xml
new file mode 100644
index 00000000..c8208c36
--- /dev/null
+++ b/app-mini/src/main/res/values-ia/strings.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+    <string name="menu_settings">Configurationes</string>
+    <string name="menu_about">Circa</string>
+    <string name="button_about">Circa</string>
+  <string name="menu_exit">Sortir</string>
+    <string name="btn_cancel">Cancellar</string>
+  <!--Welcome Wizard strings (DJH)-->
+    <!--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="error">Error</string>
+    <string name="set_locale_title">Linguage</string>
+    <string name="save">Salveguardar</string>
+  <string name="name">Nomine</string>
+</resources>
diff --git a/app-mini/src/main/res/values-id/strings.xml b/app-mini/src/main/res/values-id/strings.xml
new file mode 100644
index 00000000..7dda908a
--- /dev/null
+++ b/app-mini/src/main/res/values-id/strings.xml
@@ -0,0 +1,143 @@
+<?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="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="menu_settings">Pengaturan</string>
+  <string name="menu_log">Log</string>
+    <string name="menu_start">Mulai</string>
+  <string name="menu_stop">Berhenti</string>
+  <string name="menu_about">Tentang</string>
+    <string name="main_layout_download">Unduh</string>
+  <string name="main_layout_upload">Unggah</string>
+    <string name="button_about">Tentang</string>
+    <string name="menu_exit">Keluar</string>
+  <string name="menu_scan">Pindai BridgeQR</string>
+  <string name="menu_share_bridge">Bagikan BridgeQR</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>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="pref_allow_background_starts_summary">Biarkan aplikasi apapun memberitahu Orbot untuk memulai Tor dan layanan yang terkait</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="couldn_t_start_tor_process_">Tidak dapat memulai proses Tor:</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="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_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="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="found_existing_tor_process">menemukan proses Tor yang ada...</string>
+  <string name="something_bad_happened">Sesuatu yang buruk terjadi. Periksa log</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="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="set_locale_title">Bahasa</string>
+    <string name="no_internet_connection_tor">Tidak ada koneksi internet; Tor sedang standby...</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="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="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="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="save">Simpan</string>
+  <string name="name">Nama</string>
+  <string name="done">Selesai!</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Silakan start ulang Orbot untuk mengaktifkan perubahan</string>
+  <string name="disable">Non Aktifkan</string>
+  <string name="enable">Aktifkan</string>
+</resources>
diff --git a/app-mini/src/main/res/values-in-rID/poestrings.xml b/app-mini/src/main/res/values-in-rID/poestrings.xml
new file mode 100644
index 00000000..25f89793
--- /dev/null
+++ b/app-mini/src/main/res/values-in-rID/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">Kadang Anda memerlukan sebuah bridge untuk dapat terhubung ke Tor. </string>
+    <string name="action_more">BERITAHU SAYA LEBIH BANYAK</string>
+
+    <string name="vpn_setup">Anda dapat membuat setiap app terhubung melalui Tor dengan memakai VPN terintegrasi dari kami. </string>
+    <string name="vpn_setup_sub">Ini tidak akan membuat Anda anonim, tapi akan membantu untuk dapat menembus firewall.</string>
+    <string name="action_vpn_choose">PILIH APPS</string>
+
+    <string name="hello">Halo</string>
+    <string name="welcome">Selamat datang ke Tor versi mobile.</string>
+
+    <string name="browser_the_internet">Jelajah Internet sesuai dengan keinginan Anda. </string>
+    <string name="no_tracking">Tidak terlacak. Tanpa sensor. </string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-in-rID/strings.xml b/app-mini/src/main/res/values-in-rID/strings.xml
new file mode 100644
index 00000000..02e0ecd9
--- /dev/null
+++ b/app-mini/src/main/res/values-in-rID/strings.xml
@@ -0,0 +1,138 @@
+<?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 layanan terbuka, yang membantu Anda menghindari pengawasan jaringan yang mengancam kebebasan pribadi dan privasi, aktivitas bisnis rahasia dan relasi, serta keamanan negara yang dikenal dengan analisis traffic.</string>
+    <string name="status_starting_up">Orbot sedang memulai...</string>
+  <string name="status_activated">Tersambung ke jaringan Tor</string>
+  <string name="status_disabled">Orbot telah dibatalkan</string>
+  <string name="status_shutting_down">TorService sedang dimatikan</string>
+  <string name="tor_process_starting">Memulai klien Tor...</string>
+  <string name="tor_process_complete">selesai.</string>
+    <string name="menu_settings">Pengaturan</string>
+  <string name="menu_log">Log</string>
+    <string name="menu_start">Mulai</string>
+  <string name="menu_stop">Berhenti</string>
+  <string name="menu_about">Tentang</string>
+    <string name="main_layout_download">Unduh</string>
+  <string name="main_layout_upload">Unggah</string>
+    <string name="button_about">Tentang</string>
+    <string name="menu_exit">Keluar</string>
+  <string name="menu_scan">Pindai BridgeQR</string>
+  <string name="menu_share_bridge">Bagikan BridgeQR</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>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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">Izinkan Memulai di Latar Belakang</string>
+  <string name="pref_allow_background_starts_summary">Biarkan aplikasi lain memberitahu Orbot untuk memulai Tor dan layanan terkait</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="couldn_t_start_tor_process_">Tidak dapat memulai proses Tor:</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="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_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="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="found_existing_tor_process">menemukan proses Tor yang ada...</string>
+  <string name="something_bad_happened">Sesuatu yang buruk terjadi. Periksa log</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="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="set_locale_title">Bahasa</string>
+    <string name="no_internet_connection_tor">Tidak ada koneksi internet; Tor sedang standby...</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="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="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="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="please_restart_Orbot_to_enable_the_changes">Silakan start ulang Orbot untuk mengaktifkan perubahan</string>
+</resources>
diff --git a/app-mini/src/main/res/values-in/strings.xml b/app-mini/src/main/res/values-in/strings.xml
new file mode 100644
index 00000000..2026ca19
--- /dev/null
+++ b/app-mini/src/main/res/values-in/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</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="menu_settings">Pengaturan</string>
+  <string name="menu_log">Log</string>
+    <string name="menu_about">Mengenai</string>
+    <string name="button_about">Mengenai</string>
+    <string name="menu_exit">Keluar</string>
+    <string name="btn_cancel">Batal</string>
+  <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Umum</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+    <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+    <string name="error">Kesalahan</string>
+</resources>
diff --git a/app-mini/src/main/res/values-is/poestrings.xml b/app-mini/src/main/res/values-is/poestrings.xml
new file mode 100644
index 00000000..ee298b25
--- /dev/null
+++ b/app-mini/src/main/res/values-is/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">Stundum eru brýr nauðsynlegar til að tengjast Tor.</string>
+    <string name="action_more">SEGIÐ MÉR MEIRA</string>
+
+    <string name="vpn_setup">Þú getur stillt hvaða forrit sem er á að fara í gegnum Tor með því að nota innbyggt VPN.</string>
+    <string name="vpn_setup_sub">Þetta mun ekki gera þig nafnlausan, en mun hjálpa til við að komast í gegnum eldveggi.</string>
+    <string name="action_vpn_choose">VELDU FORRIT</string>
+
+    <string name="hello">Halló</string>
+    <string name="welcome">Velkomin í Tor-vafrann á snjalltæki.</string>
+
+    <string name="browser_the_internet">Flakkaðu um internetið eins og þér finnst á þú ættir að gera.</string>
+    <string name="no_tracking">Engar njósnir. Engin ritskoðun.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-is/strings.xml b/app-mini/src/main/res/values-is/strings.xml
new file mode 100644
index 00000000..abc9b055
--- /dev/null
+++ b/app-mini/src/main/res/values-is/strings.xml
@@ -0,0 +1,206 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot er frjálst og ókeypis milliþjónsforrit (proxy) sem gerir öðrum 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 frjáls hugbúnaður og opið net sem aðstoðar þig við að verjast eftirliti á netinu sem vinnur gegn frelsi einkalífsins og friðhelgi; vinnur gegn viðkvæmum viðskiptamálum og samböndum og þeirri tegund ríkisöryggis sem þekkt er sem umferðargreining.</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 óvirkt</string>
+  <string name="status_shutting_down">TorService er að slökkva á sér</string>
+  <string name="tor_process_starting">Kveiki á Tor notandaforriti...</string>
+  <string name="tor_process_complete">lokið.</string>
+    <string name="menu_settings">Stillingar</string>
+  <string name="menu_log">Atvikaskráning</string>
+    <string name="menu_start">Ræsa</string>
+  <string name="menu_stop">Stöðva</string>
+  <string name="menu_about">Um hugbúnaðinn</string>
+    <string name="main_layout_download">Sótt gögn</string>
+  <string name="main_layout_upload">Send gögn</string>
+    <string name="button_about">Um hugbúnaðinn</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="btn_okay">Í lagi</string>
+  <string name="btn_cancel">Hætta við</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Fáein nánari atriði um Orbot</string>
+  <string name="wizard_details_msg">Orbot er opinn og frjáls hugbúnaður sem inniheldur Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent og Polipo. Það sér um að útbúa staðværan HTTP-milliþjón (8118) og SOCKS-milliþjón (9050) inn á Tor-netið. Orbot getur einnig, á tækjum með rótaraðgangi, sent alla internetumferð í gegnum Tor.</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <string name="pref_general_group">Almennt</string>
+  <string name="pref_start_boot_title">Virkja Orbot í ræsingu</string>
+  <string name="pref_start_boot_summary">Sjálfvirkt ræsa Orbot og tengja Tor þegar Android-tækið þitt ræsist</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="pref_node_configuration">Stillingar aðgangspunkts</string>
+  <string name="pref_node_configuration_summary">Þetta eru ítarlegri stillingar sem geta minnkað nafnleysið þitt</string>
+  <string name="pref_entrance_node">Inngangspunktar</string>
+  <string name="pref_entrance_node_summary">Fingraför, gælunöfn, lönd og heimilisföng fyrir fyrsta hoppið</string>
+  <string name="pref_entrance_node_dialog">Settu inn inngangspunkta</string>
+  <string name="pref_allow_background_starts_title">Leyfa ræsingu í bakgrunni</string>
+  <string name="pref_allow_background_starts_summary">Láta hvaða forrit sem er segja Orbot að ræsa Tor og skyldar þjónustur</string>
+    <string name="pref_proxy_title">Milliþjónn á útleið (valfrjálst)</string>
+  <string name="pref_proxy_type_title">Gerð milliþjóns á útleið</string>
+  <string name="pref_proxy_type_summary">Samskiptamáti til að nota fyrir milliþjón: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Settu inn gerð milliþjóns</string>
+  <string name="pref_proxy_host_title">Vélarheiti milliþjóns á útleið</string>
+  <string name="pref_proxy_host_summary">Vélarheiti milliþjóns</string>
+  <string name="pref_proxy_host_dialog">Settu inn vélarheiti milliþjóns</string>
+  <string name="pref_proxy_port_title">Gátt milliþjóns á útleið</string>
+  <string name="pref_proxy_port_summary">Gátt milliþjóns</string>
+  <string name="pref_proxy_port_dialog">Settu inn gátt á milliþjóni</string>
+  <string name="pref_proxy_username_title">Notandanafn fyrir milliþjón á útleið</string>
+  <string name="pref_proxy_username_summary">Notandanafn á milliþjóni (valfrjálst)</string>
+  <string name="pref_proxy_username_dialog">Settu inn notandanafn á milliþjóni</string>
+  <string name="pref_proxy_password_title">Lykilorð fyrir milliþjón á útleið</string>
+  <string name="pref_proxy_password_summary">Lykilorð á milliþjóni (valfrjálst)</string>
+  <string name="pref_proxy_password_dialog">Settu inn lykilorð á milliþjóni</string>
+    <string name="couldn_t_start_tor_process_">Gat ekki kveikt á Tor-ferli:</string>
+    <string name="error">Villa</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Stillingar þínar á ReachableAddresses framkölluðu kerfisfrávik!</string>
+  <string name="your_relay_settings_caused_an_exception_">Stillingar þínar á endurvarpi (relay) framkölluðu kerfisfrávik!</string>
+  <string name="exit_nodes">Útgangspunktar</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingraför, gælunöfn, lönd og heimilisföng fyrir síðasta hoppið</string>
+  <string name="enter_exit_nodes">Settu inn útgangspunkta</string>
+  <string name="exclude_nodes">Útiloka punkta</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingraför, gælunöfn, lönd og heimilisföng til að útiloka</string>
+  <string name="enter_exclude_nodes">Settu inn punkta sem á að útiloka</string>
+  <string name="strict_nodes">Ófrávíkjanlegir punktar</string>
+  <string name="use_only_these_specified_nodes">Nota *aðeins* þessa tilteknu punkta</string>
+  <string name="bridges">Brýr</string>
+  <string name="use_bridges">Nota brýr</string>
+    <string name="enable_alternate_entrance_nodes_into_the_tor_network">Virkjaðu varaleiðir inn á Tor-netið</string>
+    <string name="ip_address_and_port_of_bridges">IP-vistfang og brúargáttir</string>
+  <string name="enter_bridge_addresses">Settu inn vistföng fyrir brýr</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örpunargátt</string>
+  <string name="listening_port_for_your_tor_relay">Hlustunargátt fyrir Tor-endurvarpann þinn</string>
+  <string name="enter_or_port">Settu inn OR-gátt</string>
+  <string name="relay_nickname">Gælunafn endurvörpunar</string>
+  <string name="the_nickname_for_your_tor_relay">Viðurnefni fyrir Tor-endurvarpið þitt</string>
+  <string name="enter_a_custom_relay_nickname">Settu inn sérsniðið viðurnefni á endurvarp</string>
+  <string name="reachable_addresses">Vistföng sem næst í</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Keyra sem biðlari á bakvið eldvegg með hamlandi skilyrðum</string>
+  <string name="reachable_ports">Gáttir sem næst í</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Gáttir sem næst í á bakvið hamlandi eldvegg</string>
+  <string name="enter_ports">Settu inn gáttir</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">virkja gerð villuskráningar á úttaki (verður að nota adb eða aLogCat til að skoða)</string>
+  <string name="project_home">Heimili verkefnisins:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">Forrit vill opna földu vefgáttina %1$s inn á Tor-netið. Þetta er öruggt ef þú treystir forritinu.</string>
+  <string name="found_existing_tor_process">fann annað Tor-ferli...</string>
+  <string name="something_bad_happened">Eitthvað slæmt gerðist. Athugaðu atvikakráninguna</string>
+    <string name="unable_to_read_hidden_service_name">get ekki lesið heiti földu þjónustunnar</string>
+  <string name="unable_to_start_tor">Get ekki ræst Tor:</string>
+    <string name="pref_use_persistent_notifications">Alltaf hafa táknmynd í verkfærastiku þegar Orbot er tengt</string>
+  <string name="pref_use_persistent_notifications_title">Alltaf-á tilkynningar</string>
+  <string name="pref_use_expanded_notifications">Birta útflettar tilkynningar varðandi Tor-útgangsland og IP-vistfang</string>
+  <string name="pref_use_expanded_notifications_title">Útflettar tilkynningar</string>
+    <string name="set_locale_title">Tungumál</string>
+    <string name="no_internet_connection_tor">Engin tenging við netið; Tor er í biðstöðu...</string>
+    <string name="pref_disable_network_title">Engin sjálfvirk svæfing netkerfis</string>
+  <string name="pref_disable_network_summary">Svæfa Tor þegar engin internettenging er til staðar</string>
+  <string name="newnym">Þú ert komin með nýtt Tor-auðkenni!</string>
+  <string name="no_network_connectivity_putting_tor_to_sleep_">Engin tenging við netið. Tor verður svæft...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Tenging við netið er góð. Tor verður vakið upp...</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">Gátt sem Tor býður SOCKS milliþjón á (sjálfgefið: 9050 eða 0 til að gera óvirkt)</string>
+  <string name="pref_socks_dialog">Stilling á SOCKS-gátt</string>
+  <string name="pref_transport_title">Gátt fyrir Tor TransProxy</string>
+  <string name="pref_transport_summary">Gátt sem Tor býður gegnsæja milliþjónsbeiningu á (sjálfgefið: 9040 eða 0 til að gera óvirkt)</string>
+  <string name="pref_transport_dialog">Uppsetning gáttar fyrir gegnsæja milliþjónabeiningu (TransProxy)</string>
+  <string name="pref_dnsport_title">Tor DNS-gátt</string>
+  <string name="pref_dnsport_summary">Gátt sem Tor býður DNS á (sjálfgefið: 5400 eða 0 til að gera óvirkt)</string>
+  <string name="pref_dnsport_dialog">Stilling á DNS-gátt</string>
+  <string name="pref_torrc_title">Sérsniðnar stillingar Torrc</string>
+  <string name="pref_torrc_summary">AÐEINS SÉRFRÆÐINGAR: sláðu inn stillingarlínur beint í torrc</string>
+  <string name="pref_torrc_dialog">Sérsniðið Torrc</string>
+    <string name="kbps">kb/sek</string>
+  <string name="mbps">mb/sek</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_">Endurræstu Orbot til að breytingarnar taki gildi</string>
+  <string name="menu_qr">QR-kóðar</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_">Ef farsímanetið þitt er virkt í að loka á Tor, geturðu notað \'Brúarþjón\' sem varaleið inn. VELDU einn af valkostunum til að setja upp og prófa...</string>
+  <string name="bridge_mode">Brúar-hamur</string>
+  <string name="get_bridges_email">Tölvupóstur</string>
+  <string name="get_bridges_web">Vefur</string>
+  <string name="activate">Virkja</string>
+  <string name="apps_mode">VPN-hamur</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ð vistfang brúar sent í gegnum tölvupóst, vefinn eða með að skanna QR-kóða fyrir brú. Veldu \'Tölvupóstur\' eða \'Vefur\' fyrir neðan til að óska eftir vistfangi brúar.\n\nÞegar þú kominn með vistfang, afritaðu & límdu það inn í stillingar fyrir \'Brýr\' í kjörstillingum Orbot og endurræstu síðan.</string>
+    <string name="vpn_default_world">Víðvært (sjálfvirkt)</string>
+  <string name="hidden_services">Faldar þjónustur</string>
+  <string name="title_activity_hidden_services">Faldar þjónustur</string>
+  <string name="menu_hidden_services">Faldar þjónustur</string>
+  <string name="save">Vista</string>
+    <string name="local_port">Staðvær gátt</string>
+  <string name="onion_port">Onion-gátt</string>
+  <string name="name">Heiti</string>
+  <string name="done">Lokið!</string>
+  <string name="invalid_port">Ógild gátt</string>
+  <string name="copy_address_to_clipboard">Afrita vistfang yfir á klippispjald</string>
+  <string name="show_auth_cookie">Birta auðkenningar-vefköku</string>
+  <string name="backup_service">Öryggisafritunarþjónusta</string>
+  <string name="delete_service">Eyða þjónustu</string>
+  <string name="backup_saved_at_external_storage">Öryggisafrit var vistað í ytri gagnageymslu</string>
+  <string name="backup_restored">Öryggisafrit var endurheimt</string>
+  <string name="filemanager_not_available">Skráastjóri ekki tiltækur</string>
+  <string name="please_grant_permissions_for_external_storage">Gefðu heimild til að nota ytri gagnageymslu</string>
+    <string name="restore_backup">Endurheimta úr öryggisafriti</string>
+  <string name="create_a_backup_first">Gerðu fyrst öryggisafrit</string>
+  <string name="name_can_t_be_empty">Nafnið má ekki vera autt</string>
+  <string name="fields_can_t_be_empty">Gagnasvið mega ekki vera auð</string>
+  <string name="start_tor_again_for_finish_the_process">Ræstu Tor aftur til að ljúka ferlinu</string>
+  <string name="confirm_service_deletion">Staðfestu eyðingu á þjónustu</string>
+  <string name="click_again_for_backup">Smelltu aftur fyrir öryggisafrit</string>
+  <string name="service_type">Tegund þjónustu</string>
+  <string name="auth_cookie">Auðkenningar-vefkaka</string>
+  <string name="copy_cookie_to_clipboard">Afrita vefköku á klippispjald</string>
+  <string name="auth_cookie_was_not_configured">Auðkenningar-vefkaka var ekki stillt</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Endurræstu Orbot til að breytingarnar taki gildi</string>
+  <string name="client_cookies">Vefkökur forritsins</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">Ógilt .onion vistfang</string>
+  <string name="cookie_from_QR">Lesa úr QR-kóða</string>
+  <string name="backup_cookie">Öryggisafrit af vefköku</string>
+  <string name="delete_cookie">Eyða vefköku</string>
+  <string name="confirm_cookie_deletion">Staðfestu eyðingu vefköku</string>
+  <string name="hosted_services">Hýstar þjónustur</string>
+  <string name="share_as_qr">Deila sem QR-kóða</string>
+  <string name="disable">Gera óvirkt</string>
+  <string name="enable">Virkja</string>
+  <string name="consider_disable_battery_optimizations">Íhugaðu að gera bestun fyrir rafhlöðu óvirka</string>
+  <string name="consider_enable_battery_optimizations">Íhugaðu að virkja bestun fyrir rafhlöðu</string>
+  <string name="pref_isolate_dest">Einangra markvistfang</string>
+  <string name="pref_isolate_dest_summary">Nota mismunandi rás fyrir hvert markvistfang</string>
+  <string name="no_transproxy_warning_short">AÐVÖRUN: Gegnsæ milliþjónabeining er ekki lengur studd.</string>
+  <string name="no_transproxy_warning">AÐVÖRUN: Gegnsæ milliþjónabeining er ekki studd. Notaðu í staðinn VPN fyrir forrit í Orbot.</string>
+  <string name="pref_connection_padding">Bólstrun tengingar (padding)</string>
+  <string name="pref_connection_padding_summary">Virkjar alltaf bólstrun tengingar (padding) til varnar gegn ákveðnum gerðum umferðargreiningar. Sjálfgefið: sjálfvirkt</string>
+  <string name="pref_reduced_connection_padding">Minnkuð bólstrun tengingar (padding)</string>
+  <string name="pref_reduced_connection_padding_summary">Lokar tengingum við endurvarpa fyrr og sendir færri pakka til að bólstra tengingu (padding) svo gagnamagn og rafhlöðunotkun sé sem minnst</string>
+    <string name="app_shortcuts">Tor-virkjuð forrit</string>
+    <string name="testing_bridges">Prófa brúartengingu við Tor....</string>
+  <string name="testing_bridges_success">Tókst. Uppsetning brúar virkar!</string>
+  <string name="testing_bridges_fail">MISTÓKST. Reyndu annan valkost</string>
+  <string name="bridge_direct_connect">Tengjast beint við Tor (best)</string>
+  <string name="bridge_community">Tengjast í gegnum þjóna meðlima</string>
+  <string name="bridge_cloud">Tengjast í gegnum þjóna í tölvuskýjum</string>
+  <string name="bridges_get_new">Biðja um nýjar brýr... (ef allt annað bregst)</string>
+  <string name="trouble_connecting">Vandamál við tengingu?</string>
+  <string name="full_device_vpn">Fullt VPN á tækinu</string>
+  <string name="vpn_disabled">VPN óvirkt</string>
+</resources>
diff --git a/app-mini/src/main/res/values-it/poestrings.xml b/app-mini/src/main/res/values-it/poestrings.xml
new file mode 100644
index 00000000..594716c9
--- /dev/null
+++ b/app-mini/src/main/res/values-it/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">Talvolta è necessario un bridge per usare Tor.</string>
+    <string name="action_more">DIMMI DI PIÚ</string>
+
+    <string name="vpn_setup">Puoi permettere a qualsiasi app di usare Tor con la nostra VPN integrata.</string>
+    <string name="vpn_setup_sub">Ciò non ti renderà anonimo, ma ti aiuterà a superare i firewall.</string>
+    <string name="action_vpn_choose">SCEGLI LE APP</string>
+
+    <string name="hello">Ciao</string>
+    <string name="welcome">Benvenuto su Tor per smartphone</string>
+
+    <string name="browser_the_internet">Naviga in internet come ti aspetti che debba essere.</string>
+    <string name="no_tracking">Nessun tracciamento. Nessuna censura.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-it/strings.xml b/app-mini/src/main/res/values-it/strings.xml
new file mode 100644
index 00000000..ac115146
--- /dev/null
+++ b/app-mini/src/main/res/values-it/strings.xml
@@ -0,0 +1,206 @@
+<?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="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="menu_settings">Impostazioni</string>
+  <string name="menu_log">Log</string>
+    <string name="menu_start">Avvia</string>
+  <string name="menu_stop">Ferma</string>
+  <string name="menu_about">Info</string>
+    <string name="main_layout_download">Download</string>
+  <string name="main_layout_upload">Upload</string>
+    <string name="button_about">Info</string>
+    <string name="menu_exit">Esci</string>
+  <string name="menu_scan">Scansiona BridgeQR</string>
+  <string name="menu_share_bridge">Condividi BridgeQR</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\'applicazione open source che contiene Tor, Obfs4proxy, BadVPN, Tun2Socks, LibEvent e Polipo. Esso fornisce un proxy HTTP locale (8118) e un proxy SOCKS (9050) per la rete Tor. Orbot permette anche, nei dispositivi rootati, di inviare tutto il traffico tramite Tor.</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="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="couldn_t_start_tor_process_">Impossibile avviare il processo Tor:</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">Bridge</string>
+  <string name="use_bridges">Utilizza i bridge</string>
+    <string name="enable_alternate_entrance_nodes_into_the_tor_network">Attiva entrate alternate nella rete Tor</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_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="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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">Un\'app vuole aprire la porta %1$s del server nascosto alla rete Tor. È un\'azione sicura se ti fidi dell\'app.</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="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="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="set_locale_title">Lingua</string>
+    <string name="no_internet_connection_tor">Nessuna connessione ad internet; Tor è in standby...</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="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="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 mobile blocca attivamente Tor, puoi usare un \'Server Bridge\' come via alternativa. SELEZIONA una delle opzioni per configurare e testare...</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</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="vpn_default_world">Globale (Auto)</string>
+  <string name="hidden_services">Servizi nascosti</string>
+  <string name="title_activity_hidden_services">Servizi nascosti</string>
+  <string name="menu_hidden_services">Servizi nascosti</string>
+  <string name="save">Salva</string>
+    <string name="local_port">Porta locale</string>
+  <string name="onion_port">Porta onion</string>
+  <string name="name">Nome</string>
+  <string name="done">Fatto!</string>
+  <string name="invalid_port">Porta non valida</string>
+  <string name="copy_address_to_clipboard">Copia l\'indirizzo negli appunti</string>
+  <string name="show_auth_cookie">Mostra cookie di autenticazione</string>
+  <string name="backup_service">Servizio di backup</string>
+  <string name="delete_service">Elimina il servizio</string>
+  <string name="backup_saved_at_external_storage">Backup salvato nell\'archiviazione esterna</string>
+  <string name="backup_restored">Backup ripristinato</string>
+  <string name="filemanager_not_available">Filemanager non disponibile</string>
+  <string name="please_grant_permissions_for_external_storage">Consenti l\'autorizzazione per l\'archiviazione esterna</string>
+    <string name="restore_backup">Ripristina backup</string>
+  <string name="create_a_backup_first">Prima crea un backup</string>
+  <string name="name_can_t_be_empty">Il nome non può essere vuoto</string>
+  <string name="fields_can_t_be_empty">I campi non possono essere vuoti</string>
+  <string name="start_tor_again_for_finish_the_process">Riavvia Tor per finire il processo</string>
+  <string name="confirm_service_deletion">Conferma l\'eliminazione del servizio</string>
+  <string name="click_again_for_backup">Clicca ancora per eseguire il backup</string>
+  <string name="service_type">Tipo di servizio</string>
+  <string name="auth_cookie">Cookie autenticazione</string>
+  <string name="copy_cookie_to_clipboard">Copia cookie negli appunti</string>
+  <string name="auth_cookie_was_not_configured">Cookie di autenticazione non configurato</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Per favore riavvia Orbot per rendere effettive le modifiche</string>
+  <string name="client_cookies">Cookie del client</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">Indirizzo .onion non valido</string>
+  <string name="cookie_from_QR">Leggi da QR</string>
+  <string name="backup_cookie">Backup cookie</string>
+  <string name="delete_cookie">Elimina cookie</string>
+  <string name="confirm_cookie_deletion">Conferma eliminazione cookie</string>
+  <string name="hosted_services">Servizi ospitati</string>
+  <string name="share_as_qr">Condividi come QR</string>
+  <string name="disable">Disabilita</string>
+  <string name="enable">Abilità</string>
+  <string name="consider_disable_battery_optimizations">Considera la disattivazione dell\'ottimizzazione della batteria</string>
+  <string name="consider_enable_battery_optimizations">Considera l\'attivazione dell\'ottimizzazione della batteria</string>
+  <string name="pref_isolate_dest">Isola gli indirizzi di destinazione</string>
+  <string name="pref_isolate_dest_summary">Usa un circuito diverso per ogni indirizzo di destinazione</string>
+  <string name="no_transproxy_warning_short">ATTENZIONE: Transproxying non più supportato</string>
+  <string name="no_transproxy_warning">ATTENZIONE: proxy trasparenti non supportati. Usa la VPN App di Orbot piuttosto.</string>
+  <string name="pref_connection_padding">Connessione allungata (padding)</string>
+  <string name="pref_connection_padding_summary">Attiva sempre la \"connessione allungata\" per difesa contro alcune forme di analisi del traffico. Predefinito: auto</string>
+  <string name="pref_reduced_connection_padding">Connessione allungata ridotta</string>
+  <string name="pref_reduced_connection_padding_summary">Chiudi prima le connessioni dei relay e invia meno pacchetti allungati per ridurre utilizzo di dati e batteria</string>
+    <string name="app_shortcuts">App abilitate a Tor</string>
+    <string name="testing_bridges">Test della connessione bridge verso Tor...</string>
+  <string name="testing_bridges_success">Successo. La configurazione bridge è corretta!</string>
+  <string name="testing_bridges_fail">FALLITO. Prova un\'altra opzione</string>
+  <string name="bridge_direct_connect">Connettiti direttamente a Tor (Migliore)</string>
+  <string name="bridge_community">Connettiti tramite i server comunitari</string>
+  <string name="bridge_cloud">Connettiti tramite i server cloud</string>
+  <string name="bridges_get_new">Richiedi nuovi bridge... (se gli altri falliscono)</string>
+  <string name="trouble_connecting">Problemi nel connetterti?</string>
+  <string name="full_device_vpn">VPN intero dispositivo</string>
+  <string name="vpn_disabled">VPN Disabilitata</string>
+</resources>
diff --git a/app-mini/src/main/res/values-iw/poestrings.xml b/app-mini/src/main/res/values-iw/poestrings.xml
new file mode 100644
index 00000000..bd2a440e
--- /dev/null
+++ b/app-mini/src/main/res/values-iw/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">לפעמים אתה צריך גשר כדי להתחבר אל Tor.</string>
+    <string name="action_more">ספר לי עוד</string>
+
+    <string name="vpn_setup">אתה יכול לאפשר כל יישום שהוא לעבור דרך Tor ע\"י שימוש ב-VPN המובנה שלנו.</string>
+    <string name="vpn_setup_sub">זה לא יהפוך אותך לאלמוני, אבל זה יעזור לך לעבור דרך חומות אש.</string>
+    <string name="action_vpn_choose">בחר יישומים</string>
+
+    <string name="hello">שלום</string>
+    <string name="welcome">ברוך הבא אל Tor בנייד.</string>
+
+    <string name="browser_the_internet">דפדף באינטרנט כפי שאתה מצפה שאתה צריך.</string>
+    <string name="no_tracking">ללא מעקב. ללא צנזורה.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-iw/strings.xml b/app-mini/src/main/res/values-iw/strings.xml
new file mode 100644
index 00000000..5f5946ab
--- /dev/null
+++ b/app-mini/src/main/res/values-iw/strings.xml
@@ -0,0 +1,112 @@
+<?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="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="menu_settings">הגדרות</string>
+  <string name="menu_log">רישום</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_about">אודות</string>
+    <string name="menu_exit">יציאה</string>
+  <string name="menu_scan">סרוק BridgeQR</string>
+  <string name="menu_share_bridge">שתף BridgeQR</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>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="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="couldn_t_start_tor_process_">אין אפשרות להתחיל תהליך Tor:</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="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="project_home">אתרי הפרויקט:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</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="found_existing_tor_process">נמצא תהליך Tor קיים…</string>
+  <string name="something_bad_happened">משהו רע התרחש. בדוק את היומן</string>
+    <string name="unable_to_read_hidden_service_name">לא מסוגל לקרוא שם שירות נסתר</string>
+  <string name="unable_to_start_tor">לא מסוגל להתחיל את Tor:</string>
+    <string name="pref_use_persistent_notifications">לשמור תמיד את האיקון בסרגל כלים כשאורבוט מחובר</string>
+    <string name="set_locale_title">שפה</string>
+    <string name="no_internet_connection_tor">אין חיבור לאינטרנט; תור ממתין...</string>
+    <string name="pref_disable_network_summary">כבה את Tor כאשר אין חיבור לאינטרנט</string>
+  <string name="newnym">החלפת אל זהות Tor חדשה!</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="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>
+</resources>
diff --git a/app-mini/src/main/res/values-ja/poestrings.xml b/app-mini/src/main/res/values-ja/poestrings.xml
new file mode 100644
index 00000000..dd236cac
--- /dev/null
+++ b/app-mini/src/main/res/values-ja/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">Torと接続するには、ブリッジを使う必要があるかもしれない。</string>
+    <string name="action_more">もっと詳しく</string>
+
+    <string name="vpn_setup">内蔵VPNを利用して、全てのアプリはTorを介してネットにアクセスできます。</string>
+    <string name="vpn_setup_sub">完全な匿名性ではないが、ファイアウォールを擦り抜けるには役立ちます。</string>
+    <string name="action_vpn_choose">アプリを選択</string>
+
+    <string name="hello">こんにちは</string>
+    <string name="welcome">モバイル版 Tor へようこそ</string>
+
+    <string name="browser_the_internet">期待するとおりにインターネットをブラウズしましょう。</string>
+    <string name="no_tracking">追跡しません。検問しません。</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-ja/strings.xml b/app-mini/src/main/res/values-ja/strings.xml
new file mode 100644
index 00000000..1c77cf96
--- /dev/null
+++ b/app-mini/src/main/res/values-ja/strings.xml
@@ -0,0 +1,206 @@
+<?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="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="menu_settings">設定</string>
+  <string name="menu_log">履歴</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_about">について</string>
+    <string name="menu_exit">終了</string>
+  <string name="menu_scan">ブリッジQRをスキャン</string>
+  <string name="menu_share_bridge">ブリッジQRを共有</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、Obfs4Proxy、BadVPN Tun2Socks、LibEvent、Polipoを含むオープンソースアプリです。ローカルHTTPプロキシ (8118) と SOCKSプロキシ (9050) をTorネットワークに接続します。root化された端末ではOrbotは全ての通信をTorを通して行うこともできます。</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="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="couldn_t_start_tor_process_">Torプロセスの起動に失敗:</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="enable_alternate_entrance_nodes_into_the_tor_network">Torネットワークへの代替入口を有効化</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_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="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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">アプリが非公開サーバーポート %1$s をTorネットワークに開放しようとしています。信頼できるアプリであればこれは安全です。</string>
+  <string name="found_existing_tor_process">Torプロセスを発見</string>
+  <string name="something_bad_happened">何かが起こりました。ログを確認してください。</string>
+    <string name="unable_to_read_hidden_service_name">hidden serviceの名前読込不能</string>
+  <string name="unable_to_start_tor">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="set_locale_title">言語</string>
+    <string name="no_internet_connection_tor">インターネット接続なし。Torは待機中です...</string>
+    <string name="pref_disable_network_title">ネットワークなし時オートスリープ</string>
+  <string name="pref_disable_network_summary">ネット接続がない時 Tor をスリープさせる</string>
+  <string name="newnym">新たな Tor の身元に切り替えました。</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="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をブロックする場合、別の方法として \'ブリッジサーバー\'を使用することができます。オプションを1つ選択して、設定とテストを行ってください。</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="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="vpn_default_world">世界中 (自動)</string>
+  <string name="hidden_services">Hidden Services</string>
+  <string name="title_activity_hidden_services">Hidden Services</string>
+  <string name="menu_hidden_services">Hidden Services</string>
+  <string name="save">保存</string>
+    <string name="local_port">ローカルポート</string>
+  <string name="onion_port">Onion ポート</string>
+  <string name="name">名前</string>
+  <string name="done">完了</string>
+  <string name="invalid_port">無効なポート</string>
+  <string name="copy_address_to_clipboard">アドレスをクリップボードにコピー</string>
+  <string name="show_auth_cookie">Cookie 認証を非表示</string>
+  <string name="backup_service">バックアップサービス</string>
+  <string name="delete_service">サービスを削除</string>
+  <string name="backup_saved_at_external_storage">バックアップは外部記憶装置に保存されました</string>
+  <string name="backup_restored">バックアップから復元</string>
+  <string name="filemanager_not_available">該当ファイル・マネージャーなし</string>
+  <string name="please_grant_permissions_for_external_storage">外部記憶へのアクセス許可を与えて下さい。</string>
+    <string name="restore_backup">バックアップの復旧</string>
+  <string name="create_a_backup_first">最初に、バックアップを作成して下さい</string>
+  <string name="name_can_t_be_empty">名前はブランクのままにできません</string>
+  <string name="fields_can_t_be_empty">フィールドを空にしておくことはできません</string>
+  <string name="start_tor_again_for_finish_the_process">プロセスを完了するには、Torを再起動して下さい。</string>
+  <string name="confirm_service_deletion">サービス削除を確認</string>
+  <string name="click_again_for_backup">バックアップ作成に再クリック</string>
+  <string name="service_type">サービスタイプ</string>
+  <string name="auth_cookie">Cookie 認証</string>
+  <string name="copy_cookie_to_clipboard">Cookie をクリップボードにコピー</string>
+  <string name="auth_cookie_was_not_configured">Authクッキーは設定されませんでした</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">変更を有効にするにはOrbotを再起動してください</string>
+  <string name="client_cookies">クライアント Cookie</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">無効な .onion アドレス</string>
+  <string name="cookie_from_QR">QRコードから読み取り</string>
+  <string name="backup_cookie">Cookie をバックアップ</string>
+  <string name="delete_cookie">Cookie を削除</string>
+  <string name="confirm_cookie_deletion">クッキー削除を確認</string>
+  <string name="hosted_services">ホスト型サービス</string>
+  <string name="share_as_qr">QR でシェア</string>
+  <string name="disable">無効</string>
+  <string name="enable">有効</string>
+  <string name="consider_disable_battery_optimizations">電池最適化を無効にすることを考察する</string>
+  <string name="consider_enable_battery_optimizations">電池最適化を有効にすることを考察する</string>
+  <string name="pref_isolate_dest">宛先アドレスを分離する</string>
+  <string name="pref_isolate_dest_summary">宛先アドレスごとに別のサーキットを利用する</string>
+  <string name="no_transproxy_warning_short">警告:透過的プロキシはもはやサポートされていません。</string>
+  <string name="no_transproxy_warning">警告:透過的プロキシはサポートされていません。代わりにOrbotのアプリVPNを利用して下さい。</string>
+  <string name="pref_connection_padding">通信難読化</string>
+  <string name="pref_connection_padding_summary">ある種のトラヒック分析から防衛するために、常に通信難読化を有効にします。デフォルト:自動的</string>
+  <string name="pref_reduced_connection_padding">減らした通信難読化</string>
+  <string name="pref_reduced_connection_padding_summary">データと電力消費を減らすために、リレー接続を早めに閉じ通信難読化を少なめに利用します</string>
+    <string name="app_shortcuts">Torが有効化されたアプリ</string>
+    <string name="testing_bridges">Torへのブリッジ接続を検査中...</string>
+  <string name="testing_bridges_success">成功しました。ブリッジ設定は正しい。</string>
+  <string name="testing_bridges_fail">失敗しました。別のオプションを試してください</string>
+  <string name="bridge_direct_connect">Tor に直接接続する (ベスト)</string>
+  <string name="bridge_community">コミュニティーサーバーを介して接続する</string>
+  <string name="bridge_cloud">クラウドサーバーを介して接続する</string>
+  <string name="bridges_get_new">新しいブリッジをリクエストする...(最悪の場合に)</string>
+  <string name="trouble_connecting">接続に問題がありましたか?</string>
+  <string name="full_device_vpn">フルデバイス VPN</string>
+  <string name="vpn_disabled">VPN が無効</string>
+</resources>
diff --git a/app-mini/src/main/res/values-kn-rIN/strings.xml b/app-mini/src/main/res/values-kn-rIN/strings.xml
new file mode 100644
index 00000000..49c8dbc4
--- /dev/null
+++ b/app-mini/src/main/res/values-kn-rIN/strings.xml
@@ -0,0 +1,11 @@
+<?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-->
+</resources>
diff --git a/app-mini/src/main/res/values-kn/strings.xml b/app-mini/src/main/res/values-kn/strings.xml
new file mode 100644
index 00000000..5d222dbb
--- /dev/null
+++ b/app-mini/src/main/res/values-kn/strings.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">ಆರ್ಬೋಟ್</string>
+    <string name="menu_about">ಬಗ್ಗೆ</string>
+    <string name="button_about">ಬಗ್ಗೆ</string>
+    <string name="btn_cancel">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="set_locale_title">ಭಾಷೆ</string>
+  <string name="name">Name</string>
+</resources>
diff --git a/app-mini/src/main/res/values-ko/strings.xml b/app-mini/src/main/res/values-ko/strings.xml
new file mode 100644
index 00000000..2e4f3848
--- /dev/null
+++ b/app-mini/src/main/res/values-ko/strings.xml
@@ -0,0 +1,142 @@
+<?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="status_starting_up">Orbot 시작 중…</string>
+  <string name="status_activated">Tor 네트워크에 연결됨</string>
+  <string name="status_disabled">Orbot이 비활성화되어 있습니다</string>
+  <string name="status_shutting_down">토르 서비스가 종료되는 중입니다</string>
+  <string name="tor_process_starting">Tor 클라이언트 시작 중…</string>
+  <string name="tor_process_complete">완료.</string>
+    <string name="menu_settings">설정</string>
+  <string name="menu_log">로그</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_about">정보</string>
+    <string name="menu_exit">종료</string>
+  <string name="menu_scan">브릿지 QR코드 스캔하기</string>
+  <string name="menu_share_bridge">브릿지 QR코드 공유하기</string>
+    <string name="btn_okay">확인</string>
+  <string name="btn_cancel">취소</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Orbot에 대한 몇몇 상세사항</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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_allow_background_starts_title">백그라운드에서 시작 허용</string>
+  <string name="pref_allow_background_starts_summary">모든 어플리케이션이 Orbot에 Tor를 시작하고 관련 서비스를 시작할 수 있도록 지시하는것을 허락합니다.</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="couldn_t_start_tor_process_">Tor 프로세스 시작 불가능:  </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="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_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="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="found_existing_tor_process">존재하고 있는 Tor 프로세스 발견</string>
+  <string name="something_bad_happened">어떤 나쁜 것이 발생. 로그 확인하세요.</string>
+    <string name="unable_to_read_hidden_service_name">히든 서비스 이름을 읽을 수 없음</string>
+  <string name="unable_to_start_tor">Tor 시작 불가능</string>
+    <string name="pref_use_persistent_notifications">Orbot이 연결되었을 때 툴바에 아이콘 보이기</string>
+  <string name="pref_use_persistent_notifications_title">항상 켜진 알림</string>
+  <string name="pref_use_expanded_notifications">출구 및 IP 정보알림 보이기</string>
+  <string name="pref_use_expanded_notifications_title">확장 알림</string>
+    <string name="set_locale_title">언어</string>
+    <string name="no_internet_connection_tor">인터넷 연결안됨; 대기중입니다...</string>
+    <string name="pref_disable_network_title">네트워크가 없을 때의 자동 슬립</string>
+  <string name="pref_disable_network_summary">인터넷이 불가능하다면 Tor를 슬립 모드로 두십시오</string>
+  <string name="newnym">새로운 Tor 신원으로 전환되었습니다!</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">토르 SOCKS</string>
+  <string name="pref_socks_summary">SOCKS 프록시를 받을 포트 (기본: 9050 / 0은 비활성화)</string>
+  <string name="pref_socks_dialog">SOCKS 포트 설정</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">토르 DNS 포트</string>
+  <string name="pref_dnsport_summary">토르 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="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="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="save">저장</string>
+  <string name="name">Name</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">변경을 완료하려면 Orbot을 재시작하세요</string>
+  <string name="disable">비활성화</string>
+  <string name="enable">활성화</string>
+</resources>
diff --git a/app-mini/src/main/res/values-ky/strings.xml b/app-mini/src/main/res/values-ky/strings.xml
new file mode 100644
index 00000000..f63feabf
--- /dev/null
+++ b/app-mini/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_stop">Токтоо</string>
+  <string name="menu_about">Программа жөнүндө</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="error">Ката</string>
+    <string name="set_locale_title">Тил</string>
+  <string name="save">Сактоо</string>
+  <string name="name">Аты-жөнү</string>
+</resources>
diff --git a/app-mini/src/main/res/values-lt-rLT/strings.xml b/app-mini/src/main/res/values-lt-rLT/strings.xml
new file mode 100644
index 00000000..49c8dbc4
--- /dev/null
+++ b/app-mini/src/main/res/values-lt-rLT/strings.xml
@@ -0,0 +1,11 @@
+<?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-->
+</resources>
diff --git a/app-mini/src/main/res/values-lt/poestrings.xml b/app-mini/src/main/res/values-lt/poestrings.xml
new file mode 100644
index 00000000..46d57c84
--- /dev/null
+++ b/app-mini/src/main/res/values-lt/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">Kartais reikia tilto, kad prieiti prie Tor.</string>
+    <string name="action_more">SUŽINOTI DAUGIAU</string>
+
+    <string name="vpn_setup">Galite leisti bet kokiai programėlei siųsti duomenis per Tor besinaudojant mūsų VPN.</string>
+    <string name="vpn_setup_sub">Tai nepadarys jūsų anonimu/-e, bet padės apeiti ugniasienes.</string>
+    <string name="action_vpn_choose">PASIRINKTI PROGRAMĖLES</string>
+
+    <string name="hello">Sveiki</string>
+    <string name="welcome">Sveiki atvykę į Tor ant mobiliųjų prietaisų.</string>
+
+    <string name="browser_the_internet">Naršykite internetą, kaip jūs tikitės, kad turėtumėte.</string>
+    <string name="no_tracking">Jokio sekimo. Jokios cenzūros.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-lt/strings.xml b/app-mini/src/main/res/values-lt/strings.xml
new file mode 100644
index 00000000..24ffde66
--- /dev/null
+++ b/app-mini/src/main/res/values-lt/strings.xml
@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot yra tarpinė (proxy) programėlė, kuri leidžia kitoms programėlėms naudotis internetu žymiai saugiau. Orbot naudoja Tor, taip užšifruodama interneto srautą ir jį paslepia šokinėdama tarp daugybės kompiuterių adresų iš viso pasaulio. Tor yra nemokama programa bei atviras tinklas, kuris leidžia apsisaugoti nuo tinklo stebėjimų, kurie kelia grėsmę asmeninei laisvei ir privatumui, konfidencialumui, taip leidžianti išvengti tinklo srauto analizavimo.</string>
+    <string name="status_starting_up">Paleidžiama Orbot…</string>
+  <string name="status_activated">Prisijungta prie Tor tinklo</string>
+  <string name="status_disabled">Orbot išjungtas</string>
+  <string name="status_shutting_down">TorService išjungiamas</string>
+  <string name="tor_process_starting">Paleidžiamas Tor klientas...</string>
+  <string name="tor_process_complete">baigta.</string>
+    <string name="menu_settings">Nustatymai</string>
+  <string name="menu_log">Žurnalas</string>
+    <string name="menu_start">Pradėti</string>
+  <string name="menu_stop">Baigti</string>
+  <string name="menu_about">Apie</string>
+    <string name="main_layout_download">Parsiuntimas</string>
+  <string name="main_layout_upload">Išsiuntimas</string>
+    <string name="button_about">Apie</string>
+    <string name="menu_exit">Išeiti</string>
+  <string name="menu_scan">Nuskaityti tilto QR kodą</string>
+  <string name="menu_share_bridge">Dalintis tilto QR kodu</string>
+    <string name="btn_okay">Gerai</string>
+  <string name="btn_cancel">Atsisakyti</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Orbot detalės</string>
+  <string name="wizard_details_msg">Orbot yra atviro kodo programėlė, kuri susideda iš Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent ir Polipo. Ji leidžia jungtis prie Tor tinklo per HTTP (8118) ir SOCKS (9050) tarpinius serverius. Orbot taip pat leidžia perkelti visą tinklo srautą per Tor tinklą, jeigu turite root/supernaudotojo privilegijas.</string>
+    <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Bendra</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+    <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+    <string name="error">Klaida</string>
+  <string name="bridges">Tinklų tiltai</string>
+    <string name="set_locale_title">Kalba</string>
+    <string name="get_bridges_email">El. paštas</string>
+  <string name="activate">Aktyvuoti</string>
+  <string name="save">Įrašyti</string>
+  <string name="name">Vardas</string>
+  <string name="backup_restored">Atsarginė kopija atkurta</string>
+  <string name="disable">Išjungti</string>
+  <string name="enable">Įjungti</string>
+</resources>
diff --git a/app-mini/src/main/res/values-lv/strings.xml b/app-mini/src/main/res/values-lv/strings.xml
new file mode 100644
index 00000000..5196b05e
--- /dev/null
+++ b/app-mini/src/main/res/values-lv/strings.xml
@@ -0,0 +1,144 @@
+<?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="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="status_shutting_down">TorService izslēdzas</string>
+  <string name="tor_process_starting">Startē Tor klientu...</string>
+  <string name="tor_process_complete">pabeidz.</string>
+    <string name="menu_settings">Iestatījumi</string>
+  <string name="menu_log">Žurnāls</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_about">Par</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="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>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="pref_allow_background_starts_title">Ļaut sākšanos fonā</string>
+  <string name="pref_allow_background_starts_summary">Norādīt visām lietotnēm uzdot Orbot palaist Tor un saistītos pakalpojumus.</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="couldn_t_start_tor_process_">Neizdevās palaist Tor\'a procesu:</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="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_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="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="found_existing_tor_process">Atrada esošu Tor procesu...</string>
+  <string name="something_bad_happened">Nav labi. Pārbaudiet žurnālu</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="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="set_locale_title">Valoda</string>
+    <string name="no_internet_connection_tor">Nav interneta savienojuma; Tor ir gaidstāvē...</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="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="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="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="hidden_services">Slēptie pakalpojumi</string>
+  <string name="title_activity_hidden_services">Slēptie pakalpojumi</string>
+  <string name="menu_hidden_services">Slēptie pakalpojumi</string>
+  <string name="save">Saglabāt</string>
+  <string name="name">Vārds</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Lūdzu pārstartējiet Orbot, lai iespējotu izmaiņas</string>
+  <string name="disable">Atspējot</string>
+</resources>
diff --git a/app-mini/src/main/res/values-mk/poestrings.xml b/app-mini/src/main/res/values-mk/poestrings.xml
new file mode 100644
index 00000000..d553557e
--- /dev/null
+++ b/app-mini/src/main/res/values-mk/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">Понекогаш е потребен мост да дојдете до Tor.</string>
+    <string name="action_more">КАЖИ МИ ПОВЕЌЕ</string>
+
+    <string name="vpn_setup">Можете да овозможите секоја апликација да комуницира преку Tor користејќи го вградениот VPN.</string>
+    <string name="vpn_setup_sub">Ова нема да ве направи анонимни, но ќе ви помогне да поминете низ заштитните ѕидови.</string>
+    <string name="action_vpn_choose">ОДБЕРИ АПЛИКАЦИИ</string>
+
+    <string name="hello">Здраво</string>
+    <string name="welcome">Добредојдовте на Tor на мобилен.</string>
+
+    <string name="browser_the_internet">Прелистувајте на Интернет онака како што очекувате дека треба.</string>
+    <string name="no_tracking">Нема следење. Нема цензура.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-mk/strings.xml b/app-mini/src/main/res/values-mk/strings.xml
new file mode 100644
index 00000000..9f28c462
--- /dev/null
+++ b/app-mini/src/main/res/values-mk/strings.xml
@@ -0,0 +1,206 @@
+<?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="status_starting_up">Орбот се стартува...</string>
+  <string name="status_activated">Поврзан на мрежата на Tor</string>
+  <string name="status_disabled">Орбот е деактивиран</string>
+  <string name="status_shutting_down">Tor-Сервисот се исклучува</string>
+  <string name="tor_process_starting">Стартување на Tor клиентот...</string>
+  <string name="tor_process_complete">завршено.</string>
+  <string name="menu_settings">Поставки</string>
+  <string name="menu_log">Дневник</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_about">За</string>
+  <string name="menu_exit">Излез</string>
+  <string name="menu_scan">Скенирај QR на мост</string>
+  <string name="menu_share_bridge">Сподели QR на мост</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 e апликација со отворен код која содржи Tor Obfs4Proxy, BadVPN Tun2Socks, LibEvent и Polipo. Овозможува локален HTTP прокси (8118) и SOCKS прокси (9050) во Tor мрежата. Orbot исто така има можност, на уред со root пристап, да го испраќа целиот интернет сообраќај преку Tor.</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <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-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <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="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="couldn_t_start_tor_process_">Не може да започне Tor-процесот:</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="enable_alternate_entrance_nodes_into_the_tor_network">Овозможи алтернативен влезови на Tor мрежата</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_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="third_party_software">Софтвер од производител од 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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">Апликација сака да отвори сокриена серверска порта %1$s кон Tor мрежата. Ова е безбедно доколку и верувате на апликацијата.</string>
+  <string name="found_existing_tor_process">Пронајден постоечки Tor-процес ...</string>
+  <string name="something_bad_happened">Се случи грешка. Проверете го дневникот</string>
+  <string name="unable_to_read_hidden_service_name">не може да се прочита името на скриениот сервис</string>
+  <string name="unable_to_start_tor">Tor не може да се стартува:</string>
+  <string name="pref_use_persistent_notifications">Секогаш чувајте ја иконата во лентата со алатки кога Orbot е поврзан</string>
+  <string name="pref_use_persistent_notifications_title">Известувања секогаш вклучени</string>
+  <string name="pref_use_expanded_notifications">Прикажи проширено известување со излезната држава и IP на Tor</string>
+  <string name="pref_use_expanded_notifications_title">Проширени известувања</string>
+  <string name="set_locale_title">Јазик</string>
+  <string name="no_internet_connection_tor">Нема интернет врска; Tor е во мирување...</string>
+  <string name="pref_disable_network_title">Нема Автоматско-спиење на мрежата</string>
+  <string name="pref_disable_network_summary">Ставете го Тор на режим на спиење кога Интернетот не е достапен</string>
+  <string name="newnym">Се префрливте на нов идентитет на Tor!</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">Порта на која Тор и го нуди својот 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">Поставување на портата за 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="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="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="vpn_default_world">Глобално (Автоматски)</string>
+  <string name="hidden_services">Скриени сервиси</string>
+  <string name="title_activity_hidden_services">Скриени сервиси</string>
+  <string name="menu_hidden_services">Скриени сервиси</string>
+  <string name="save">Зачувај</string>
+  <string name="local_port">Локална порта</string>
+  <string name="onion_port">Onion порта</string>
+  <string name="name">Име</string>
+  <string name="done">Завршено!</string>
+  <string name="invalid_port">Невалидна порта</string>
+  <string name="copy_address_to_clipboard">Копирај ја адресата за залепување</string>
+  <string name="show_auth_cookie">Покажи автентично колаче</string>
+  <string name="backup_service">Резервна копија</string>
+  <string name="delete_service">Избриши услуга</string>
+  <string name="backup_saved_at_external_storage">Резервната копија е снимена на надворешна меморија</string>
+  <string name="backup_restored">Вратено од резервна копија</string>
+  <string name="filemanager_not_available">Менаџерот на датотеки не е достапен</string>
+  <string name="please_grant_permissions_for_external_storage">Ве молиме дадете дозволи за надворешна меморија</string>
+  <string name="restore_backup">Врати резервна копија</string>
+  <string name="create_a_backup_first">Создади резервна копија</string>
+  <string name="name_can_t_be_empty">Името не може да биде празно</string>
+  <string name="fields_can_t_be_empty">Полињата не можат да бидат празни</string>
+  <string name="start_tor_again_for_finish_the_process">Стартувај го Tor повторно да го заврши процесот</string>
+  <string name="confirm_service_deletion">Потврди бришење на услугата</string>
+  <string name="click_again_for_backup">Кликни повторно за резервна копија</string>
+  <string name="service_type">Тип на услуга</string>
+  <string name="auth_cookie">Автентично колаче</string>
+  <string name="copy_cookie_to_clipboard">Копирај колаче за залепување</string>
+  <string name="auth_cookie_was_not_configured">Автентичното колаче не е прилагодено</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Ве молиме стартувајте го повторно Orbot за да се овозможат промените</string>
+  <string name="client_cookies">Клиентски колачиња</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">Невалидна .onion адреса</string>
+  <string name="cookie_from_QR">Прочитај од QR</string>
+  <string name="backup_cookie">Направи резервна копија на колаче</string>
+  <string name="delete_cookie">Избриши колаче</string>
+  <string name="confirm_cookie_deletion">Потврди бришење на колаче</string>
+  <string name="hosted_services">Хостирани услуги</string>
+  <string name="share_as_qr">Сподели како QR</string>
+  <string name="disable">Оневозможи</string>
+  <string name="enable">Овозможи</string>
+  <string name="consider_disable_battery_optimizations">Размислете за оневозможување на оптимизациите на батеријата</string>
+  <string name="consider_enable_battery_optimizations">Размислете за овозможување на оптимизациите на батеријата</string>
+  <string name="pref_isolate_dest">Изолирај адреси на дестинација</string>
+  <string name="pref_isolate_dest_summary">Користи различен круг за секоја адреса на дестинација</string>
+  <string name="no_transproxy_warning_short">ВНИМАНИЕ: Транспроксирањето повеќе не е поддржано</string>
+  <string name="no_transproxy_warning">ВНИМАНИЕ: Транспарентното пренасочувањее не е поддржано. Наместо тоа користите Orbot Apps VPN.</string>
+  <string name="pref_connection_padding">Камуфлирано поврзување</string>
+  <string name="pref_connection_padding_summary">Секогаш овозможи поврзување со камуфлажа против некои форми на анализирање на интернет сообраќајот. Стандардно: Автоматски</string>
+  <string name="pref_reduced_connection_padding">Редуцирај поврзување со камуфлажа</string>
+  <string name="pref_reduced_connection_padding_summary">Исклучете ги врските на релеата поскоро и испраќањето на камуфлирани пакети за да го намалите користењето на податоци и потрошувачката на батеријата</string>
+  <string name="app_shortcuts">Tor-овозможени апликации</string>
+  <string name="testing_bridges">Тестирање на мост поврзувањето кон Tor...</string>
+  <string name="testing_bridges_success">Успешно. Мост поставките се добри!</string>
+  <string name="testing_bridges_fail">НЕУСПЕШНО. Пробајте друга опција</string>
+  <string name="bridge_direct_connect">Поврзи директно на Tor (Најдобро)</string>
+  <string name="bridge_community">Поврзи преку сервери на заедницата</string>
+  <string name="bridge_cloud">Поврзи преку облак-сервери</string>
+  <string name="bridges_get_new">Бара нови мостови... (ако сите други не успеале)</string>
+  <string name="trouble_connecting">Проблеми со поврзувањето?</string>
+  <string name="full_device_vpn">Целосен VPN  уред</string>
+  <string name="vpn_disabled">VPN оневозможен</string>
+</resources>
diff --git a/app-mini/src/main/res/values-ml/strings.xml b/app-mini/src/main/res/values-ml/strings.xml
new file mode 100644
index 00000000..0a582739
--- /dev/null
+++ b/app-mini/src/main/res/values-ml/strings.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+    <string name="menu_start">ആരംഭിക്കുക</string>
+  <string name="menu_stop">നിര്‍ത്തുക</string>
+  <string name="menu_about">വിവരം</string>
+    <string name="button_about">വിവരം</string>
+    <string name="btn_cancel">റദ്ദാക്കുക </string>
+  <!--Welcome Wizard strings (DJH)-->
+    <!--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="error">പിശക്</string>
+    <string name="save">സംരക്ഷിക്കുക</string>
+  <string name="name">Name</string>
+  <string name="disable">പ്രവർത്തനരഹിതമാക്കു </string>
+</resources>
diff --git a/app-mini/src/main/res/values-mn/strings.xml b/app-mini/src/main/res/values-mn/strings.xml
new file mode 100644
index 00000000..29345090
--- /dev/null
+++ b/app-mini/src/main/res/values-mn/strings.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+    <string name="menu_about">Тухай</string>
+    <string name="button_about">Тухай</string>
+  <string name="btn_cancel">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="name">Нэр</string>
+</resources>
diff --git a/app-mini/src/main/res/values-mr-rIN/strings.xml b/app-mini/src/main/res/values-mr-rIN/strings.xml
new file mode 100644
index 00000000..af3eee19
--- /dev/null
+++ b/app-mini/src/main/res/values-mr-rIN/strings.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">ऑर्बॉट एक विनामूल्य प्रॉक्सी अॅप आहे जो इतर अॅप्सना इंटरनेटचा अधिक सुरक्षितपणे वापर करण्यास सक्षम करते. ऑर्बॉट आपल्या इंटरनेट रहदारीची एन्क्रिप्ट करण्यासाठी टोरचा वापर करते आणि नंतर जगभरातील संगणकांच्या मालिकेद्वारे उडी मारून लपवते. टोर हा एक विनामूल्य सॉफ्टवेअर आणि एक खुला नेटवर्क आहे जो आपल्याला नेटवर्क स्वतंत्रता आणि गोपनीयता, गोपनीय व्यवसाय क्रियाकलाप 
 आणि नातेसंबंध आणि रहदारी विश्लेषणास म्हणून ओळखल्या जाणार्या राज्य सुरक्षेस धमकी देणार्या नेटवर्क निरीक्षणाचे रक्षण करण्यास मदत करते.</string>
+    <!--Welcome Wizard strings (DJH)-->
+  <!--END Welcome Wizard strings (DJH)-->
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+</resources>
diff --git a/app-mini/src/main/res/values-ms-rMY/strings.xml b/app-mini/src/main/res/values-ms-rMY/strings.xml
new file mode 100644
index 00000000..8b0fff9d
--- /dev/null
+++ b/app-mini/src/main/res/values-ms-rMY/strings.xml
@@ -0,0 +1,98 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</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="menu_settings">Tetapan</string>
+  <string name="menu_log">Log</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_about">Tentang</string>
+    <string name="menu_exit">Keluar</string>
+    <string name="btn_okay">Okay</string>
+  <string name="btn_cancel">Batal</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Maklumat Orbot</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="couldn_t_start_tor_process_">Tidak boleh memulakan proses Tor:</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="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_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="third_party_software">3rd-Party-Software: </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="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_persistent_notifications">Sentiasa biar ikon pada toolbar apabila Orbot bersambung</string>
+  <string name="pref_use_persistent_notifications_title">Sentiasa On Notifikasi</string>
+    <string name="set_locale_title">Bahasa</string>
+    <string name="hidden_services">Perkhidmatan tersembunyi</string>
+  <string name="title_activity_hidden_services">Perkhidmatan tersembunyi</string>
+  <string name="menu_hidden_services">Perkhidmatan tersembunyi</string>
+  <string name="save">Simpan</string>
+  <string name="name">Nama</string>
+</resources>
diff --git a/app-mini/src/main/res/values-ms/strings.xml b/app-mini/src/main/res/values-ms/strings.xml
new file mode 100644
index 00000000..f9169742
--- /dev/null
+++ b/app-mini/src/main/res/values-ms/strings.xml
@@ -0,0 +1,88 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</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="menu_settings">Tetapan</string>
+  <string name="menu_log">Log</string>
+    <string name="menu_start">Mula</string>
+  <string name="menu_stop">Henti</string>
+  <string name="menu_about">Tentang</string>
+    <string name="button_about">Tentang</string>
+    <string name="menu_exit">Keluar</string>
+    <string name="btn_okay">Okay</string>
+  <string name="btn_cancel">Batal</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Maklumat Orbot</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="couldn_t_start_tor_process_">Tidak boleh memulakan proses Tor:</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="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_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="third_party_software">3rd-Party-Software: </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="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_persistent_notifications">Sentiasa biar ikon pada toolbar apabila Orbot bersambung</string>
+  <string name="pref_use_persistent_notifications_title">Sentiasa On Notifikasi</string>
+    <string name="set_locale_title">Tetapan Tempatan</string>
+    <string name="save">Simpan</string>
+  <string name="name">Nama</string>
+</resources>
diff --git a/app-mini/src/main/res/values-my/strings.xml b/app-mini/src/main/res/values-my/strings.xml
new file mode 100644
index 00000000..6f1e25b9
--- /dev/null
+++ b/app-mini/src/main/res/values-my/strings.xml
@@ -0,0 +1,31 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+    <string name="menu_settings">ချိန်ညှိချက်များ</string>
+    <string name="menu_start">စတင်ရန်</string>
+  <string name="menu_stop">ရပ်ရန်</string>
+  <string name="menu_about">အကြောင်း</string>
+  <string name="main_layout_download">ဒေါင်းလုဒ်</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)-->
+  <string name="pref_general_group">ယေဘုယျ</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+    <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+    <string name="error">ချို့ယွင်းချက်</string>
+    <string name="set_locale_title">ဘာသာစကား</string>
+    <string name="kb">ကီလိုဘိုက်</string>
+  <string name="mb">မဂ္ဂါဘိုက်</string>
+  <string name="get_bridges_email">အီးေမးလ္</string>
+  <string name="activate">Activate</string>
+  <string name="hidden_services">Hidden Services</string>
+  <string name="title_activity_hidden_services">Hidden Services</string>
+  <string name="menu_hidden_services">Hidden Services</string>
+  <string name="save">သိမ္းဆည္းပါ</string>
+  <string name="name">အမည်</string>
+</resources>
diff --git a/app-mini/src/main/res/values-nb/poestrings.xml b/app-mini/src/main/res/values-nb/poestrings.xml
new file mode 100644
index 00000000..1805065d
--- /dev/null
+++ b/app-mini/src/main/res/values-nb/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">"Noen ganger trenger du en bro for å komme til Tor."</string>
+    <string name="action_more">"FORTELL MEG MER"</string>
+
+    <string name="vpn_setup">"Du kan sende ethvert program gjennom Tor ved bruk av vår innebygde VPN."</string>
+    <string name="vpn_setup_sub">"Dette vil ikke gjøre deg anonym, men det vil hjelpe deg gjennom brannmurer."</string>
+    <string name="action_vpn_choose">"VELG PROGRAMMER"</string>
+
+    <string name="hello">"Hei"</string>
+    <string name="welcome">"Velkommen til Tor på Mobilen."</string>
+
+    <string name="browser_the_internet">Surf på Internett sånn som du forventer det.</string>
+    <string name="no_tracking">"Ingen sporing. Ingen sensur."</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-nb/strings.xml b/app-mini/src/main/res/values-nb/strings.xml
new file mode 100644
index 00000000..3e6e390c
--- /dev/null
+++ b/app-mini/src/main/res/values-nb/strings.xml
@@ -0,0 +1,178 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot er et friprog-mellomtjeningsprogram som gjør det mulig for andre programmer å bruke Internett sikrere. 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 fri programvare, 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 snoking kjent som trafikkanalyse.</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="status_shutting_down">Tor-tjenesten avsluttes</string>
+  <string name="tor_process_starting">Starter Tor-klient…</string>
+  <string name="tor_process_complete">fullført.</string>
+    <string name="menu_settings">Innstillinger</string>
+  <string name="menu_log">Logg</string>
+    <string name="menu_start">Start</string>
+  <string name="menu_stop">Stopp</string>
+  <string name="menu_about">Om</string>
+    <string name="main_layout_download">Nedlasting</string>
+  <string name="main_layout_upload">Opplasting</string>
+    <string name="button_about">Om</string>
+    <string name="menu_exit">Avslutt</string>
+  <string name="menu_scan">Skann BridgeQR</string>
+  <string name="menu_share_bridge">Del BridgeQR</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>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="pref_node_configuration">Node-oppsett</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 hoppet</string>
+  <string name="pref_entrance_node_dialog">Skriv inn inngangsnoder</string>
+  <string name="pref_allow_background_starts_title">Tillat bakgrunnsstarter</string>
+  <string name="pref_allow_background_starts_summary">La alle program gi beskjed til Orbot om å starte Tor og tilknyttede tjenester</string>
+    <string name="pref_proxy_title">Utgående nettverksmellomtjener (valgfritt)</string>
+  <string name="pref_proxy_type_title">Utgående mellomtjenertype</string>
+  <string name="pref_proxy_type_summary">Protokoll for mellomtjener: HTTP, HTTPS, SOCKS4, SOCKS5</string>
+  <string name="pref_proxy_type_dialog">Skriv inn mellomtjenertype</string>
+  <string name="pref_proxy_host_title">Utgående mellomtjenervert</string>
+  <string name="pref_proxy_host_summary">Vertsnavn for mellomtjener</string>
+  <string name="pref_proxy_host_dialog">Skriv inn vertsnavn for mellomtjener</string>
+  <string name="pref_proxy_port_title">Utgående mellomtjenerport</string>
+  <string name="pref_proxy_port_summary">Port for mellomtjener</string>
+  <string name="pref_proxy_port_dialog">Skriv inn port for mellomtjener</string>
+  <string name="pref_proxy_username_title">Brukernavn for utgående mellomtjener</string>
+  <string name="pref_proxy_username_summary">Mellomtjener-brukernavn (valgfritt)</string>
+  <string name="pref_proxy_username_dialog">Skriv inn brukernavn for mellomtjener</string>
+  <string name="pref_proxy_password_title">Passord for utgående mellomtjener</string>
+  <string name="pref_proxy_password_summary">Passord for mellomtjener (valgfritt)</string>
+  <string name="pref_proxy_password_dialog">Skriv inn passord for mellomtjener</string>
+    <string name="couldn_t_start_tor_process_">Kunne ikke starte Tor prosessen:</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="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 ELLER-port</string>
+  <string name="relay_nickname">Reléets kallenavn</string>
+  <string name="the_nickname_for_your_tor_relay">Kallenavnet for 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_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="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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: https://www.openssl.org</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="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="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">Vis utvidede merknader med land og IP for utgangstrafikk fra Tor</string>
+  <string name="pref_use_expanded_notifications_title">Utvidede varsler</string>
+    <string name="set_locale_title">Språk</string>
+    <string name="no_internet_connection_tor">Ingen Internett-tilkobling; Tor er i ventemodus…</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="no_network_connectivity_putting_tor_to_sleep_">Ingen nettverkstilkobling. Tor går i dvale…</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Nettverkstilkoblingen er bra. Vekker opp Tor…</string>
+  <string name="updating_settings_in_tor_service">Oppdaterer innstillinger i Tor service</string>
+  <string name="pref_socks_title">Tor-SOCKS</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">Portoppsett for SOCKS</string>
+  <string name="pref_transport_title">Tor TransProxy-port</string>
+  <string name="pref_transport_summary">Porten Tor tilbyr transparent mellomtjening på (forvalg: 9040 eller 0 for å skru av)</string>
+  <string name="pref_transport_dialog">Portoppsett for TransProxy</string>
+  <string name="pref_dnsport_title">Tor DNS-port</string>
+  <string name="pref_dnsport_summary">Porten Tor tilbyr sin DNS-tjeneste på (forvalg: 5400 eller 0 for å skru av)</string>
+  <string name="pref_dnsport_dialog">DNS-portoppsett</string>
+  <string name="pref_torrc_title">Egendefinert torrc-oppsett</string>
+  <string name="pref_torrc_summary">BARE FOR EKSPERTER: skriv inn direkte torrc-oppsettslinjer</string>
+  <string name="pref_torrc_dialog">Egendefinert torrc</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="bridge_mode">Bro-modus</string>
+  <string name="get_bridges_email">E-post</string>
+  <string name="get_bridges_web">Vev</string>
+  <string name="activate">Aktiver</string>
+  <string name="apps_mode">VPN-modus</string>
+  <string name="send_email">Send 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 bro-adresse på e-post, gjennom nettet eller ved å skanne en bro-QR-kode. Velg \'E-post\' eller \'Nett\' nedenfor for å forespørre en broadresse.\n\nNår du har en adresse, kopier og lim den inn i \"Broer\" i Orbots innstillinger og start på ny.</string>
+    <string name="hidden_services">Hidden Services</string>
+  <string name="title_activity_hidden_services">Hidden Services</string>
+  <string name="menu_hidden_services">Hidden Services</string>
+  <string name="save">Lagre</string>
+    <string name="local_port">Lokalt port</string>
+  <string name="onion_port">Løk-port</string>
+  <string name="name">Navn</string>
+  <string name="done">Ferdig!</string>
+  <string name="invalid_port">Ugyldig port</string>
+  <string name="copy_address_to_clipboard">Kopier adresse til utklippstavle</string>
+  <string name="backup_service">Sikkerhetskopieringstjeneste</string>
+  <string name="delete_service">Slett tjeneste</string>
+  <string name="backup_restored">Sikkerhetskopi gjenopprettet</string>
+    <string name="restore_backup">Gjenopprett sikkerhetskopi</string>
+  <string name="create_a_backup_first">Opprett en sikkerhetskopi først</string>
+  <string name="name_can_t_be_empty">Navnet kan ikke være tomt</string>
+  <string name="fields_can_t_be_empty">Felter kan ikke stå tomme</string>
+  <string name="start_tor_again_for_finish_the_process">Start Tor igjen for å fullføre prosessen</string>
+  <string name="confirm_service_deletion">Bekreft sletting av tjeneste</string>
+  <string name="click_again_for_backup">Klikk igjen for å sikkerhetskopiere</string>
+  <string name="service_type">Tjenestetype</string>
+  <string name="copy_cookie_to_clipboard">Kopier kake til utklippstavle</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Gjør omstart av Orbot før endringer trer i kraft</string>
+  <string name="client_cookies">Klientinformasjonskapsler</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">Ugyldig .onion-adresse</string>
+  <string name="cookie_from_QR">Les fra QR</string>
+  <string name="backup_cookie">Sikkerhetskopier informasjonskapsel</string>
+  <string name="delete_cookie">Slett informasjonskapsel</string>
+  <string name="confirm_cookie_deletion">Bekreft sletting av informasjonskapsel</string>
+  <string name="hosted_services">Vertstjenester</string>
+  <string name="share_as_qr">Del som QR</string>
+  <string name="disable">Skru av</string>
+  <string name="enable">Slå på</string>
+  <string name="bridge_direct_connect">Direkte tilkobling til Tor (best)</string>
+  <string name="trouble_connecting">Tilkoblingsproblemer?</string>
+  <string name="full_device_vpn">VPN for hele enheten</string>
+  <string name="vpn_disabled">VPN Deaktivert</string>
+</resources>
diff --git a/app-mini/src/main/res/values-nl/poestrings.xml b/app-mini/src/main/res/values-nl/poestrings.xml
new file mode 100644
index 00000000..113ba126
--- /dev/null
+++ b/app-mini/src/main/res/values-nl/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">Soms heb je een bridge nodig om Tor te gebruiken.</string>
+    <string name="action_more">VERTEL ME MEER</string>
+
+    <string name="vpn_setup">Je kan gelijk welke app door Tor laten gaan met onze ingebouwde VPN.</string>
+    <string name="vpn_setup_sub">Dit zal je niet anoniem maken, maar het zal je wel helpen firewalls te omzeilen.</string>
+    <string name="action_vpn_choose">APPS KIEZEN</string>
+
+    <string name="hello">Hallo</string>
+    <string name="welcome">Welkom bij de mobiele versie van Tor.</string>
+
+    <string name="browser_the_internet">Surf op het internet zoals je het verwacht.</string>
+    <string name="no_tracking">Niet worden gevolgd. Geen censuur.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-nl/strings.xml b/app-mini/src/main/res/values-nl/strings.xml
new file mode 100644
index 00000000..900b6bd7
--- /dev/null
+++ b/app-mini/src/main/res/values-nl/strings.xml
@@ -0,0 +1,206 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot is een vrije proxy-app die het andere apps mogelijk maakt het internet veiliger te gebruiken. Orbot gebruikt Tor om je internetverkeer te versleutelen 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, genaamd \'verkeersanalyse\', die persoonlijke vrijheid en privacy, vertrouwelijke bedrijfsactiviteiten en relaties en staatsveiligheid bedreigt.</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-cliënt starten…</string>
+  <string name="tor_process_complete">klaar.</string>
+    <string name="menu_settings">Instellingen</string>
+  <string name="menu_log">Logboek</string>
+    <string name="menu_start">Start</string>
+  <string name="menu_stop">Stop</string>
+  <string name="menu_about">Over</string>
+    <string name="main_layout_download">Download</string>
+  <string name="main_layout_upload">Upload</string>
+    <string name="button_about">Over</string>
+    <string name="menu_exit">Sluiten</string>
+  <string name="menu_scan">BridgeQR scannen</string>
+  <string name="menu_share_bridge">BridgeQR delen</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 openbronapplicatie die Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent en Polipo bevat. Het creëert een lokale HTTP-proxy (8118) en een SOCKS-proxy (9050) naar het Tor-netwerk. Orbot heeft ook de mogelijkheid om al het internetverkeer over het Tor-netwerk te sturen.</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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 applicatie toe om Orbot de Torverbinding en -diensten te laten starten </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="couldn_t_start_tor_process_">Kon Tor-proces niet starten: </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="enable_alternate_entrance_nodes_into_the_tor_network">Alternatieve toegangen tot het Tor-netwerk inschakelen</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_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="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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">Een app wil de verborgenserverpoort %1$s tot het Tor-netwerk openen. Dit is veilig als je de app 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="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="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="set_locale_title">Taal</string>
+    <string name="no_internet_connection_tor">Geen internetverbinding; Tor is in de slaapstand...</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="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="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="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_">Als je mobiele netwerk Tor actief blokkeert, kan je een \'bridge-server\' gebruiken als alternatieve toegang. SELECTEER een van de opties om te configureren en te testen..,.</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">VPN-modus</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="vpn_default_world">Algemeen (automatisch)</string>
+  <string name="hidden_services">Verborgen diensten</string>
+  <string name="title_activity_hidden_services">Verborgen diensten</string>
+  <string name="menu_hidden_services">Verborgen diensten</string>
+  <string name="save">Opslaan</string>
+    <string name="local_port">Lokale poort</string>
+  <string name="onion_port">Onion-poort</string>
+  <string name="name">Naam</string>
+  <string name="done">Klaar!</string>
+  <string name="invalid_port">Ongeldige poort</string>
+  <string name="copy_address_to_clipboard">Adres kopiëren naar klembord</string>
+  <string name="show_auth_cookie">Authenticatiecookie tonen</string>
+  <string name="backup_service">Back-updienst</string>
+  <string name="delete_service">Dienst verwijderen</string>
+  <string name="backup_saved_at_external_storage">Back-up opgeslagen op externe opslag</string>
+  <string name="backup_restored">Back-up hersteld</string>
+  <string name="filemanager_not_available">Bestandsbeheerder niet beschikbaar</string>
+  <string name="please_grant_permissions_for_external_storage">Verleen toestemmingen voor externe opslag</string>
+    <string name="restore_backup">Back-up herstellen</string>
+  <string name="create_a_backup_first">Maak eerst een back-up aan</string>
+  <string name="name_can_t_be_empty">Naam kan niet leeg zijn</string>
+  <string name="fields_can_t_be_empty">Velden kunnen niet leeg zijn</string>
+  <string name="start_tor_again_for_finish_the_process">Start Tor opnieuw om het proces te voltooien</string>
+  <string name="confirm_service_deletion">Bevestig verwijderen van dienst</string>
+  <string name="click_again_for_backup">Klik opnieuw voor back-up</string>
+  <string name="service_type">Diensttype</string>
+  <string name="auth_cookie">Authenticatiecookie</string>
+  <string name="copy_cookie_to_clipboard">Cookie kopiëren naar klembord</string>
+  <string name="auth_cookie_was_not_configured">Authenticatiecookie is niet ingesteld</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Herstart Orbot om de wijzigingen in te schakelen</string>
+  <string name="client_cookies">Cliëntcookies</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">Ongeldig .onion-adres</string>
+  <string name="cookie_from_QR">Lezen van QR-code</string>
+  <string name="backup_cookie">Back-up maken van cookie</string>
+  <string name="delete_cookie">Cookie verwijderen</string>
+  <string name="confirm_cookie_deletion">Bevestig verwijderen van cookie</string>
+  <string name="hosted_services">Gehoste diensten</string>
+  <string name="share_as_qr">Delen als QR-code</string>
+  <string name="disable">Uitschakelen</string>
+  <string name="enable">Inschakelen</string>
+  <string name="consider_disable_battery_optimizations">Overweeg accubesparing uit te schakelen</string>
+  <string name="consider_enable_battery_optimizations">Overweeg accubesparing in te schakelen</string>
+  <string name="pref_isolate_dest">Geïsoleerde bestemmingsadressen</string>
+  <string name="pref_isolate_dest_summary">Gebruik een ander circuit voor elk bestemmingsadres</string>
+  <string name="no_transproxy_warning_short">WAARSCHUWING: transproxyen wordt niet meer ondersteund</string>
+  <string name="no_transproxy_warning">WAARSCHUWING: transproxyen wordt niet meer ondersteund. Gebruik de Orbot-VPN.</string>
+  <string name="pref_connection_padding">Verbindingsopvulling</string>
+  <string name="pref_connection_padding_summary">Schakelt verbindingsopvulling altijd in om te verdedigen tegen krachtiger vormen van verkeersanalyse. Standaard: automatisch</string>
+  <string name="pref_reduced_connection_padding">Beperkte verbindingsopvulling</string>
+  <string name="pref_reduced_connection_padding_summary">Sluit relayverbindingen sneller en stuurt minder opvullingspakketten om gegevens- en accuverbruik te verminderen</string>
+    <string name="app_shortcuts">Tor-gebruikende apps</string>
+    <string name="testing_bridges">Bridgeverbinding met Tor testen....</string>
+  <string name="testing_bridges_success">Voltooid. Bridgeconfiguratie is in orde!</string>
+  <string name="testing_bridges_fail">MISLUKT. Probeer een andere optie</string>
+  <string name="bridge_direct_connect">Rechtstreeks verbinden met Tor (best)</string>
+  <string name="bridge_community">Verbinden via gemeenschapsservers</string>
+  <string name="bridge_cloud">Verbinden via cloudservers</string>
+  <string name="bridges_get_new">Nieuwe bridges opvragen... (als alle andere opties mislukken)</string>
+  <string name="trouble_connecting">Problemen met verbinden?</string>
+  <string name="full_device_vpn">Volledigapparaats-VPN</string>
+  <string name="vpn_disabled">VPN uitgeschakeld</string>
+</resources>
diff --git a/app-mini/src/main/res/values-pa/strings.xml b/app-mini/src/main/res/values-pa/strings.xml
new file mode 100644
index 00000000..8b163418
--- /dev/null
+++ b/app-mini/src/main/res/values-pa/strings.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+    <string name="menu_settings">ਪਰਿਸਥਿਤੀ</string>
+    <string name="menu_about">ਇਸ ਬਾਰੇ</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="error">ਗਲਤੀ:</string>
+    <string name="set_locale_title">ਭਾਸ਼ਾ</string>
+  <string name="save">ਸੰਭਾਲੋ</string>
+  <string name="name">ਨਾਂ</string>
+</resources>
diff --git a/app-mini/src/main/res/values-pl/strings.xml b/app-mini/src/main/res/values-pl/strings.xml
new file mode 100644
index 00000000..ae138544
--- /dev/null
+++ b/app-mini/src/main/res/values-pl/strings.xml
@@ -0,0 +1,150 @@
+<?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="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="menu_settings">Ustawienia</string>
+  <string name="menu_log">Logi</string>
+    <string name="menu_start">Start</string>
+  <string name="menu_stop">Stop</string>
+  <string name="menu_about">O programie</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_about">O programie</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="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>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="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="couldn_t_start_tor_process_">Nie można było zainicjować procesu Tora:</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="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_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="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="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="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="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="set_locale_title">Język</string>
+    <string name="no_internet_connection_tor">Brak połączenia internetowego; Tor jest w trybie oczekiwania...</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="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="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="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</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="hidden_services">Ukryte Usługi</string>
+  <string name="title_activity_hidden_services">Ukryte Usługi</string>
+  <string name="menu_hidden_services">Ukryte Usługi</string>
+  <string name="save">Zapisz</string>
+    <string name="local_port">Lokalne Porty</string>
+  <string name="name">Nazwa</string>
+  <string name="done">Zrobiono!</string>
+  <string name="invalid_port">Nieprawidłowy Port</string>
+  <string name="copy_address_to_clipboard">Skopiuj adres do schowka</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Proszę zrestartować Orbot, aby zmiany mogły wejść w życie</string>
+  <string name="disable">Wyłącz</string>
+  <string name="enable">Włącz</string>
+</resources>
diff --git a/app-mini/src/main/res/values-ps/strings.xml b/app-mini/src/main/res/values-ps/strings.xml
new file mode 100644
index 00000000..e832af24
--- /dev/null
+++ b/app-mini/src/main/res/values-ps/strings.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+    <string name="btn_cancel">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="name">Name</string>
+</resources>
diff --git a/app-mini/src/main/res/values-pt-rBR/poestrings.xml b/app-mini/src/main/res/values-pt-rBR/poestrings.xml
new file mode 100644
index 00000000..a6d12ea3
--- /dev/null
+++ b/app-mini/src/main/res/values-pt-rBR/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">Em alguns momentos você precisa de um bridge para poder chegar ao Tor.</string>
+    <string name="action_more">FALE MAIS SOBRE</string>
+
+    <string name="vpn_setup">Você pode habilitar qualquer aplicativo para passar pela rede Tor utilizando a nossa VPN integrada.</string>
+    <string name="vpn_setup_sub">Isso não te faz anônimo, mas irá te ajudar a transpassar firewalls.</string>
+    <string name="action_vpn_choose">ESCOLHA OS APLICATIVOS</string>
+
+    <string name="hello">Olá</string>
+    <string name="welcome">Seja bem vindo ao Tor para dispositivos móveis.</string>
+
+    <string name="browser_the_internet">Navegue na Internet como você espera.</string>
+    <string name="no_tracking">Sem rastreamento. Sem censura.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-pt-rBR/strings.xml b/app-mini/src/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 00000000..1528f42d
--- /dev/null
+++ b/app-mini/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,185 @@
+<?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="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="menu_settings">Configurações</string>
+  <string name="menu_log">Log</string>
+    <string name="menu_start">Iniciar</string>
+  <string name="menu_stop">Parar</string>
+  <string name="menu_about">Sobre</string>
+    <string name="main_layout_download">Download</string>
+  <string name="main_layout_upload">Upload</string>
+    <string name="button_about">Sobre</string>
+    <string name="menu_exit">Sair</string>
+  <string name="menu_scan">Escanear BridgeQR</string>
+  <string name="menu_share_bridge">Compartilhar BridgeQR</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 é um software de código aberto que contem Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent e Polipo. Ele fornece um proxy local HTTP (8118) e um proxy SOCKS (9050) como acesso a rede Tor. Orbot também tem a habilidade, em dispositivos com acesso root, de enviar todo o trafego de Internet via rede Tor.</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="pref_allow_background_starts_summary">Deixar um aplicativo dizer Orbot para iniciar o Tor e seus serviços relacionados</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="couldn_t_start_tor_process_">Não foi possível iniciar o processo Tor: </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="enable_alternate_entrance_nodes_into_the_tor_network">Habilite entradas alternativas para a Rede Tor.</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_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="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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">Um aplicativo precisa abrir uma porta tipo servidor escondida %1$spara a Rede Tor. Isso é seguro se você confiar nesta aplicação.</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="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="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="set_locale_title">Idioma</string>
+    <string name="no_internet_connection_tor">Sem conexão na internet; Tor está na espera...</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="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_summary">SOMENTE EXPERIENTES: adicione sua própria linha de configuração torrc</string>
+  <string name="pref_torrc_dialog">Torrc Personalizado</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 sua rede de dados bloqueia o Tor, você pode utilizar um \'Servidor Bridge\' como alternativa contra o bloqueio. SELECIONE umas das opções para configurar e testar..,.</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 VPN</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="vpn_default_world">Global (Automático)</string>
+  <string name="hidden_services">Serviços Ocultos</string>
+  <string name="title_activity_hidden_services">Serviços Ocultos</string>
+  <string name="menu_hidden_services">Serviços Ocultos</string>
+  <string name="save">Salvar</string>
+    <string name="local_port">Porta Local</string>
+  <string name="onion_port">Porta Onion</string>
+  <string name="name">Nome</string>
+  <string name="done">Feito!</string>
+  <string name="invalid_port">Porta Invalida</string>
+  <string name="copy_address_to_clipboard">Copiar para a area de transferência </string>
+  <string name="show_auth_cookie">Mostre cookie de autenticação</string>
+  <string name="backup_service">Serviço de Backup</string>
+  <string name="delete_service">Remover Serviço</string>
+  <string name="backup_saved_at_external_storage">Backup salvo em mídia externa</string>
+  <string name="backup_restored">Backup Restaurado</string>
+  <string name="filemanager_not_available">Gerenciador de arquivos não está disponível</string>
+  <string name="please_grant_permissions_for_external_storage">Por favor dê permissões ao armazenamento externo</string>
+    <string name="restore_backup">Restaurar Backup</string>
+  <string name="create_a_backup_first">Criar primeiro backup</string>
+  <string name="name_can_t_be_empty">O campo Nome não pode ser vazio</string>
+  <string name="fields_can_t_be_empty">Campos não podem ser vazios</string>
+  <string name="confirm_service_deletion">Confirmar a remoção do serviço</string>
+  <string name="click_again_for_backup">Clique novamente para backup</string>
+  <string name="service_type">Tipo do Serviço</string>
+  <string name="auth_cookie">Cookie de autenticação</string>
+  <string name="copy_cookie_to_clipboard">Copiar cookie para a area de transferência</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Por favor reinicie Orbot para habilitar as mundanças</string>
+  <string name="share_as_qr">Compartilhar como QR</string>
+  <string name="disable">Desabilitar</string>
+  <string name="enable">Ativar</string>
+    <string name="app_shortcuts">Aplicações habilitadas para o Tor</string>
+    <string name="testing_bridges">Testando conexão bridge com o Tor</string>
+  <string name="testing_bridges_success">Sucesso. A configuração da Bride é válida.</string>
+  <string name="testing_bridges_fail">Falha. Tente outra opção</string>
+  <string name="bridge_direct_connect">Conecte-se diretamente ao Tor (Melhor forma)</string>
+  <string name="bridge_community">Conecte-se através de servidores da comunidade</string>
+  <string name="bridge_cloud">Conecte-se através de servidores em nuvem</string>
+  <string name="bridges_get_new">Solicitar nova Bridge... (Se todas falharem)</string>
+  <string name="trouble_connecting">Problemas na conexão ? </string>
+  <string name="full_device_vpn">VPN PARA TODO O DISPOSITIVO</string>
+</resources>
diff --git a/app-mini/src/main/res/values-pt-rPT/strings.xml b/app-mini/src/main/res/values-pt-rPT/strings.xml
new file mode 100644
index 00000000..94275288
--- /dev/null
+++ b/app-mini/src/main/res/values-pt-rPT/strings.xml
@@ -0,0 +1,67 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot é uma app proxy gratuita que fortifica outras apps para utilizar a internet mais seguramente. Orbot usa Tor para encriptar o seu tráfego de Internet e ocultá-lo saltando entre uma série de computadores no mundo todo. Tor é um software gratuito e uma rede aberta que ajuda-lhe a defender contra uma forma de rede de vigilância que ameaça a liberdade pessoal e privacidade, actividades de negócios confidenciais e parentesco, e segurança de estado conhecido como análise de tráfego.
+
+</string>
+    <string name="status_starting_up">Orbot está a iniciar…</string>
+  <string name="status_activated">Ligado à rede Tor</string>
+  <string name="status_disabled">Orbot está desativado</string>
+  <string name="status_shutting_down">TorService está a encerrar</string>
+  <string name="tor_process_starting">A iniciar o cliente Tor...</string>
+  <string name="tor_process_complete">completo.</string>
+    <string name="menu_settings">Definições</string>
+  <string name="menu_log">Registo</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_about">Sobre</string>
+    <string name="menu_exit">Sair</string>
+  <string name="menu_scan">Digitalizar BridgeQR</string>
+  <string name="menu_share_bridge">Partilhar BridgeQR</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>
+    <!--END Welcome Wizard strings (DJH)-->
+    <string name="pref_general_group">Geral</string>
+  <string name="pref_start_boot_title">Iniciar Orbot ao Arranque</string>
+  <string name="pref_start_boot_summary">Iniciar Orbot e conectar Tor automaticamente quando o dispositivo é iniciado.</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+    <string name="pref_node_configuration">Configuração do Nodo</string>
+    <string name="error">Erro</string>
+  <string name="exit_nodes">Nodos de Saída</string>
+  <string name="enter_exit_nodes">Inserir Nodos de Saída</string>
+  <string name="exclude_nodes">Excluir Nodos</string>
+  <string name="enter_exclude_nodes">Inserir Nodos Excluídos</string>
+  <string name="enter_ports">Insira portas</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</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="set_locale_title">idioma</string>
+    <string name="pref_socks_title">SOCKS do Tor</string>
+  <string name="pref_dnsport_title">Porta DNS do Tor</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">Códigos QR</string>
+  <string name="get_bridges_email">E-mail</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Ativar</string>
+  <string name="send_email">Enviar Mensagem</string>
+    <string name="save">Guardar</string>
+  <string name="name">Nome</string>
+  <string name="done">Concluído!</string>
+  <string name="disable">Desativar</string>
+  <string name="enable">Ativar</string>
+</resources>
diff --git a/app-mini/src/main/res/values-pt/strings.xml b/app-mini/src/main/res/values-pt/strings.xml
new file mode 100644
index 00000000..78dd464c
--- /dev/null
+++ b/app-mini/src/main/res/values-pt/strings.xml
@@ -0,0 +1,96 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</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="menu_settings">Configurações</string>
+  <string name="menu_log">Registo</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_about">Sobre</string>
+    <string name="menu_exit">Sair</string>
+  <string name="menu_scan">Digitalizar BridgeQR</string>
+  <string name="menu_share_bridge">Compartilhar BridgeQR</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>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="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="project_home">Projeto Home(s): </string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</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="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="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="pref_use_persistent_notifications_title">Notificações Sempre Ativadas</string>
+  <string name="pref_use_expanded_notifications_title">Notificações Estendidas</string>
+    <string name="set_locale_title">Idioma</string>
+    <string name="newnym">Mudou para uma nova identidade do Tor!</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="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="hidden_services">Serviços ocultos</string>
+  <string name="title_activity_hidden_services">Serviços ocultos</string>
+  <string name="menu_hidden_services">Serviços ocultos</string>
+  <string name="save">Guardar</string>
+  <string name="name">Nome</string>
+  <string name="done">Concluído!</string>
+  <string name="disable">Desativar</string>
+  <string name="enable">Ativar</string>
+</resources>
diff --git a/app-mini/src/main/res/values-ro-rRO/strings.xml b/app-mini/src/main/res/values-ro-rRO/strings.xml
new file mode 100644
index 00000000..dc8ae0d6
--- /dev/null
+++ b/app-mini/src/main/res/values-ro-rRO/strings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="menu_settings">Setări</string>
+    <string name="menu_about">Despre</string>
+    <string name="button_about">Despre</string>
+  <string name="menu_exit">Ieşire</string>
+    <string name="btn_cancel">Revocare</string>
+  <!--Welcome Wizard strings (DJH)-->
+    <!--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="error">Eroare</string>
+</resources>
diff --git a/app-mini/src/main/res/values-ro/strings.xml b/app-mini/src/main/res/values-ro/strings.xml
new file mode 100644
index 00000000..c763c809
--- /dev/null
+++ b/app-mini/src/main/res/values-ro/strings.xml
@@ -0,0 +1,146 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot este o aplicaţie gratuită de proxy care permite altor aplicaţii să folosească internetul în siguranţă. Orbot foloseşte Tor pentru a cripta traficul de internet după care îl ascunde printr-o serie de calculatoare din întreaga lume. Tor este un program gratuit si o reţea deschisă care te ajută să te aperi de monitorizarea reţelelor, lucru care ameninţă libertatea personală şi intimitatea, activităţi confidenţiale legate de afaceri si relaţii personale şi de analiza traficului.</string>
+    <string name="status_starting_up">Orbot porneşte...</string>
+  <string name="status_activated">Conectat la reţeaua Tor</string>
+  <string name="status_disabled">Orbot este dezactivat</string>
+  <string name="status_shutting_down">ServiciulTor se opreşte</string>
+  <string name="tor_process_starting">Porneşte clientul Tor...</string>
+  <string name="tor_process_complete">terminat.</string>
+    <string name="menu_settings">Setări</string>
+  <string name="menu_log">log</string>
+    <string name="menu_start">Start</string>
+  <string name="menu_stop">Stop</string>
+  <string name="menu_about">Despre</string>
+    <string name="main_layout_download">Descarcă</string>
+  <string name="main_layout_upload">Incarcă</string>
+    <string name="button_about">Despre</string>
+    <string name="menu_exit">Ieşire</string>
+  <string name="menu_scan">Scanează BridgeQR</string>
+  <string name="menu_share_bridge">Distribuie BridgeQR</string>
+    <string name="btn_okay">Ok</string>
+  <string name="btn_cancel">Revocare</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Detalii Orbot</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <string name="pref_general_group">General</string>
+  <string name="pref_start_boot_title">Porneşte 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-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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_allow_background_starts_title">Permite pornirile din fundal</string>
+  <string name="pref_allow_background_starts_summary">Permite oricărei aplicaţie să anunţe Orbot că porneşti Tor şi serviciile asociate</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="couldn_t_start_tor_process_">Nu am putut porni procesul Tor:</string>
+    <string name="error">Eroare</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Setările tale pentru adrese accesibile au cauzat o exceptie!</string>
+  <string name="your_relay_settings_caused_an_exception_">Setările tale de relay au cauzat o excepţie!</string>
+  <string name="exit_nodes">Noduri de ieşire</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 ieşire</string>
+  <string name="exclude_nodes">Noduri de exclus</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Amprente, nume, ţări şi 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">Punţi</string>
+  <string name="use_bridges">Foloseşte punţi</string>
+    <string name="ip_address_and_port_of_bridges">Adresa IP şi port pentru punţi</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 tău Tor</string>
+  <string name="enter_or_port">Introdu portul OR</string>
+  <string name="relay_nickname">Utilizatorul comutatorului</string>
+  <string name="the_nickname_for_your_tor_relay">Numele utilizatorului pentru comutatorul tău Tor</string>
+  <string name="enter_a_custom_relay_nickname">Introdu un nume de utilizator 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_debug_log_to_output_must_use_adb_or_alogcat_to_view_">activează exportul log-ului (trebuie folosit adb sau LogCat pentru vizualizare)</string>
+  <string name="project_home">Casa(le) proiectului:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</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="found_existing_tor_process">găsit proces Tor existent...</string>
+  <string name="something_bad_happened">Ceva rău s-a întâmplat. Verifică log-ul</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 reuşit să pornesc Tor:</string>
+    <string name="pref_use_persistent_notifications">Arată tot timpul icoana în bară când Orbot este conectat</string>
+  <string name="pref_use_persistent_notifications_title">Notificări active tot timpul</string>
+  <string name="pref_use_expanded_notifications">Arată notificări extinse cu Tor exit country şi IP</string>
+  <string name="pref_use_expanded_notifications_title">Notificare Extinsă</string>
+    <string name="set_locale_title">Limbă</string>
+    <string name="no_internet_connection_tor">Nu este conexiune la internet; Tor este în așteptare...</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="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="pref_socks_summary">Porturi pe care Tor oferă SOCKurile proxy active (principal:9050 sau 0 pentru dezactivare)</string>
+  <string name="pref_socks_dialog">Configurare SOCKuri la Port</string>
+  <string name="pref_transport_title">Portul Tor TransProxy </string>
+  <string name="pref_transport_summary">Porturi pe care Tor oferă Proxy-ul Transparent activ (principal:9040 sau 0 pentru dezactivare)</string>
+  <string name="pref_transport_dialog">Portul Tor TransProxy </string>
+  <string name="pref_dnsport_title">Portul DNS Tor</string>
+  <string name="pref_dnsport_summary">Porturi pe care Tor oferă DNS-ul activ (principal:5400 sau 0 pentru dezactivare)</string>
+  <string name="pref_dnsport_dialog">Configurare Port DNS</string>
+  <string name="pref_torrc_title">Configurare personalizată Torrc</string>
+  <string name="pref_torrc_summary">PENTRU EXPERŢI: introdu direct liniile de configurare ale torrc</string>
+  <string name="pref_torrc_dialog">Torrc Personalizat</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">Punţi activate</string>
+  <string name="restart_orbot_to_use_this_bridge_">Vă rugăm reporniţi Orbot pentru a aplica modificările</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="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_">Poţi primi o adresă de punte prin email,web sau prin scanarea codului de punte QR.Selectează  ”Email” sau ”Web” de mai jos pentru a primi adresa de punte.\n\nCând ai primit adresa,copiaz-o şi introdu-o în preferinţele de PUNŢI din setările Orbot şi mai apoi reporniţi. </string>
+    <string name="hidden_services">Servicii ascunse</string>
+  <string name="title_activity_hidden_services">Servicii ascunse</string>
+  <string name="menu_hidden_services">Servicii ascunse</string>
+  <string name="save">Salvează</string>
+  <string name="name">Nume</string>
+  <string name="done">Gata!</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Vă rugăm reporniţi Orbot pentru a aplica modificările</string>
+  <string name="disable">Dezactivează</string>
+  <string name="enable">Activează:</string>
+</resources>
diff --git a/app-mini/src/main/res/values-rs-rAR/strings.xml b/app-mini/src/main/res/values-rs-rAR/strings.xml
new file mode 100644
index 00000000..8955187a
--- /dev/null
+++ b/app-mini/src/main/res/values-rs-rAR/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Orbot</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="menu_settings">Configuración</string>
+  <string name="menu_log">Registro</string>
+    <string name="menu_start">Iniciar</string>
+  <string name="menu_stop">Detener</string>
+  <string name="menu_about">Acerca de</string>
+    <string name="button_about">Acerca de</string>
+    <string name="menu_exit">Salir</string>
+    <string name="btn_cancel">Cancelar</string>
+  <!--Welcome Wizard strings (DJH)-->
+    <!--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>-->
+</resources>
diff --git a/app-mini/src/main/res/values-ru/poestrings.xml b/app-mini/src/main/res/values-ru/poestrings.xml
new file mode 100644
index 00000000..eef54f0d
--- /dev/null
+++ b/app-mini/src/main/res/values-ru/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">Иногда вам будет нужен мост, чтобы добраться до Tor.</string>
+    <string name="action_more">РАССКАЖИТЕ ПОДРОБНЕЕ</string>
+
+    <string name="vpn_setup">Вы можете настроить любое приложение, чтобы оно проходило через через Tor, используя наш встроенный VPN.</string>
+    <string name="vpn_setup_sub">Это не сделает вас анонимным, но это поможет пройти через брандмауэры.</string>
+    <string name="action_vpn_choose">ВЫБРАТЬ ПРИЛОЖЕНИЯ</string>
+
+    <string name="hello">Привет</string>
+    <string name="welcome">Добро пожаловать в Tor для мобильных устройств.</string>
+
+    <string name="browser_the_internet">Просматривайте интернет так, как считаете нужным вы.</string>
+    <string name="no_tracking">Нет отслеживания. Никакой цензуры.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-ru/strings.xml b/app-mini/src/main/res/values-ru/strings.xml
new file mode 100644
index 00000000..549387d0
--- /dev/null
+++ b/app-mini/src/main/res/values-ru/strings.xml
@@ -0,0 +1,206 @@
+<?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="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="menu_settings">Настройки</string>
+  <string name="menu_log">Журнал</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_about">О приложении</string>
+    <string name="menu_exit">Выход</string>
+  <string name="menu_scan">Сканировать QR-код моста</string>
+  <string name="menu_share_bridge">Опубликовать QR-код моста</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, Obfs4Proxy, BadVPN Tun2Socks, LibEvent и Polipo. Оно предоставляет локальный HTTP- (8118) и SOCKS-прокси (9050) в сеть Tor. Orbot также позволяет на устройствах с правами root пересылать весь интернет-трафик через Tor.</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="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="couldn_t_start_tor_process_">Невозможно запустить Tor: </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="enable_alternate_entrance_nodes_into_the_tor_network">Включить альтернативные входные узлы в сеть Tor</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_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="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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">Приложение хочет открыть скрытый порт сервера %1$s сети Tor. Это безопасно, если вы доверяете данному приложению.</string>
+  <string name="found_existing_tor_process">найден существующий процесс Tor...</string>
+  <string name="something_bad_happened">Произошла какая-то ошибка. Проверьте журнал.</string>
+    <string name="unable_to_read_hidden_service_name">невозможно прочитать имя скрытой службы</string>
+  <string name="unable_to_start_tor">Невозможно запустить 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="set_locale_title">Язык</string>
+    <string name="no_internet_connection_tor">Отсутствует подключение к интернету, Tor находится в режиме ожидания…</string>
+    <string name="pref_disable_network_title">Автозасыпание без сети</string>
+  <string name="pref_disable_network_summary">Переводить Tor в спящий режим при отсутствии интернета</string>
+  <string name="newnym">Вы переключились на новый идентификатор Tor!</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="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="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="vpn_default_world">Мир (авто)</string>
+  <string name="hidden_services">Скрытые службы</string>
+  <string name="title_activity_hidden_services">Скрытые службы</string>
+  <string name="menu_hidden_services">Скрытые службы</string>
+  <string name="save">Сохранить</string>
+    <string name="local_port">Локальный порт</string>
+  <string name="onion_port">Onion-порт</string>
+  <string name="name">Имя</string>
+  <string name="done">Готово!</string>
+  <string name="invalid_port">Некорректный порт</string>
+  <string name="copy_address_to_clipboard">Скопировать адрес в буфер обмена</string>
+  <string name="show_auth_cookie">Показать авторизирующие cookie</string>
+  <string name="backup_service">Резервировать службу</string>
+  <string name="delete_service">Удалить службу</string>
+  <string name="backup_saved_at_external_storage">Резервная копия сохранена на внешнем хранилище</string>
+  <string name="backup_restored">Восстановлено из резервной копии</string>
+  <string name="filemanager_not_available">Файловый менеджер недоступен</string>
+  <string name="please_grant_permissions_for_external_storage">Предоставьте разрешения для доступа к внешнему хранилищу</string>
+    <string name="restore_backup">Восстановить из копии</string>
+  <string name="create_a_backup_first">Сначала создайте резервную копию</string>
+  <string name="name_can_t_be_empty">Имя не может быть пустым</string>
+  <string name="fields_can_t_be_empty">Поля не могут быть пустыми</string>
+  <string name="start_tor_again_for_finish_the_process">Запустите Tor снова для завершения процесса</string>
+  <string name="confirm_service_deletion">Подтверждение удаления службы</string>
+  <string name="click_again_for_backup">Нажмите ещё раз для резервирования</string>
+  <string name="service_type">Тип службы</string>
+  <string name="auth_cookie">Авторизирующие cookie</string>
+  <string name="copy_cookie_to_clipboard">Копировать cookie в буфер обмена</string>
+  <string name="auth_cookie_was_not_configured">Авторизирующие cookie не настроены</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Пожалуйста, перезапустите Orbot для вступления изменения в силу</string>
+  <string name="client_cookies">Cookies клиента</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">Недействительный .onion-адрес</string>
+  <string name="cookie_from_QR">Прочитать из QR-кода</string>
+  <string name="backup_cookie">Резервировать cookie</string>
+  <string name="delete_cookie">Удалить cookies</string>
+  <string name="confirm_cookie_deletion">Подтвердите удаление cookie</string>
+  <string name="hosted_services">Размещённые службы</string>
+  <string name="share_as_qr">Поделиться через QR-код</string>
+  <string name="disable">Отключить</string>
+  <string name="enable">Включить</string>
+  <string name="consider_disable_battery_optimizations">Рассмотрите возможность отключения оптимизации батареи</string>
+  <string name="consider_enable_battery_optimizations">Рассмотрите возможность включения оптимизации батареи</string>
+  <string name="pref_isolate_dest">Изолировать адреса назначения</string>
+  <string name="pref_isolate_dest_summary">Использовать разные цепи для каждого адреса назначения</string>
+  <string name="no_transproxy_warning_short">ПРЕДУПРЕЖДЕНИЕ: прозрачный прокси больше не поддерживается</string>
+  <string name="no_transproxy_warning">ПРЕДУПРЕЖДЕНИЕ: прозрачный прокси больше не поддерживается. Вместо этого используйте VPN-режим Orbot.</string>
+  <string name="pref_connection_padding">Прокладка соединения</string>
+  <string name="pref_connection_padding_summary">Всегда включает прокладку соединения для защиты от некоторых форм анализа трафика. По умолчанию: авто</string>
+  <string name="pref_reduced_connection_padding">Сокращённая прокладка соединения</string>
+  <string name="pref_reduced_connection_padding_summary">Раньше закрывает ретранслированные соединения и отправляет меньше пакетов заполнения для уменьшения объёма передаваемых данных и использования батареи</string>
+    <string name="app_shortcuts">Приложения с поддержкой Tor</string>
+    <string name="testing_bridges">Тестирование соединения с Tor через мост…</string>
+  <string name="testing_bridges_success">Успешно! Мост настроен правильно.</string>
+  <string name="testing_bridges_fail">НЕУДАЧНО. Попробуйте другой вариант.</string>
+  <string name="bridge_direct_connect">Подключение непосредственно к Tor (лучше всего)</string>
+  <string name="bridge_community">Подключение через серверы сообщества</string>
+  <string name="bridge_cloud">Подключение через облачные серверы</string>
+  <string name="bridges_get_new">Запросить новые мосты… (если всё остальное не удалось)</string>
+  <string name="trouble_connecting">Проблема с подключением?</string>
+  <string name="full_device_vpn">VPN для всего устройства</string>
+  <string name="vpn_disabled">VPN отключён</string>
+</resources>
diff --git a/app-mini/src/main/res/values-si-rLK/strings.xml b/app-mini/src/main/res/values-si-rLK/strings.xml
new file mode 100644
index 00000000..fa116ecb
--- /dev/null
+++ b/app-mini/src/main/res/values-si-rLK/strings.xml
@@ -0,0 +1,96 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot යනු අනෙකුත් අැප්ස් හට වඩා අාරක්ෂාකාරීව අන්තර්ජාලෙය් සැරිසැරීමට ඉඩ සලසාදෙන  නොමිලේ ලබාදෙන්නාවූ ප්රොක්සි සේවාවකි. එය Tor යොදාගනිමින් ඔබගේ අන්තර්ජාල ගනුදෙනු ඛේතනය කරයි එමෙන්ම එය ලොව වටා වූ අනෙකුත් සමාන්තර පරිගනක හරහා ගෙනයමින්  ඔබගේ අන්තර්ජාල ගනුදෙනු සඟවා තබාගනී. 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="menu_settings">සිටවුම්</string>
+  <string name="menu_log">ලොගය </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_about">පිළිබද</string>
+    <string name="menu_exit">ඉවත් වන්න</string>
+    <string name="btn_okay">එකගයි</string>
+  <string name="btn_cancel">අවලංගු කරන්න</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Orbot පිළිබද ඇතැම් විස්තර </string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="couldn_t_start_tor_process_">Tor ක්‍රියාවලින් ආරම්භ කිරීමට නොහැකි විය:</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="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_debug_log_to_output_must_use_adb_or_alogcat_to_view_">නිදොස් කිරීමේ ලොගය ප්‍රතිදානය සදහා සබල කරන්න (නැරඹීම සදහා adb or aLogCat භාවිතා කරන්න)</string>
+  <string name="project_home">ව්‍යාපෘති නිවහන(න්):</string>
+    <string name="third_party_software">3 වන පාර්ශව මෘදුකාංග</string>
+  <string name="found_existing_tor_process">පවතින Tor ක්‍රියාවලි හමුවිය...</string>
+  <string name="something_bad_happened">යම් නොමනා දෙයක් සිදුවිය. ලොගය පරික්ෂා කර බලන්න </string>
+    <string name="unable_to_read_hidden_service_name">සැගවුණු සේවා නාමය කියවීමට නොහැකිය </string>
+  <string name="unable_to_start_tor">Tor ආරම්භ කිරීමට නොහැකිය:</string>
+    <string name="pref_use_persistent_notifications">Orbot සම්බන්ධ වී ඇති සැමවිටම විට මෙවලම් තීරුවේ නිරූපකය තබාගන්න</string>
+  <string name="pref_use_persistent_notifications_title">නිවේදන ලැබීමට සලස්වන්න </string>
+    <string name="set_locale_title">භාෂාව</string>
+    <string name="kb">KB</string>
+  <string name="mb">MB</string>
+  <string name="activate">ක්‍රියාකරවන්න</string>
+  <string name="hidden_services">සැගවුණු සේවා </string>
+  <string name="title_activity_hidden_services">සැගවුණු සේවා </string>
+  <string name="menu_hidden_services">සැගවුණු සේවා </string>
+  <string name="save">සුරකින්න</string>
+  <string name="name">නම</string>
+</resources>
diff --git a/app-mini/src/main/res/values-sk-rSK/strings.xml b/app-mini/src/main/res/values-sk-rSK/strings.xml
new file mode 100644
index 00000000..0fe1e9e1
--- /dev/null
+++ b/app-mini/src/main/res/values-sk-rSK/strings.xml
@@ -0,0 +1,11 @@
+<?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-->
+</resources>
diff --git a/app-mini/src/main/res/values-sk/strings.xml b/app-mini/src/main/res/values-sk/strings.xml
new file mode 100644
index 00000000..8877c736
--- /dev/null
+++ b/app-mini/src/main/res/values-sk/strings.xml
@@ -0,0 +1,142 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot je bezplatná proxy aplikácia, ktorá umožňuje ostatným aplikáciam používať internet bezpečnejšie. Orbot používa Tor pre šifrovanie vašej internetovej komunikácie, ktorú následne schová za sériu náhodných počítačov z celého sveta. Tor je bezplatný software a otvorená sieť, ktorá pomáha chrániť proti sledovaniu sietí, ktoré ohrozuje osobnú slobodu a súkromie, dôverné pracovné aktivity a vzťahy a tiež bezpečnosť štátov známu ako analýza prevádzky.</string>
+    <string name="status_starting_up">Orbot sa spúšťa…</string>
+  <string name="status_activated">Pripojený do siete Tor</string>
+  <string name="status_disabled">Orbot je deaktivovaný</string>
+  <string name="status_shutting_down">TorService sa vypína</string>
+  <string name="tor_process_starting">Štartujem Tor klienta...</string>
+  <string name="tor_process_complete">hotovo.</string>
+    <string name="menu_settings">Nastavenia</string>
+  <string name="menu_log">Podrobnosti</string>
+    <string name="menu_start">Štart</string>
+  <string name="menu_stop">Stop</string>
+  <string name="menu_about">O aplikácií</string>
+    <string name="main_layout_download">Stiahnuť</string>
+  <string name="main_layout_upload">Nahrať</string>
+    <string name="button_about">O aplikácií</string>
+    <string name="menu_exit">Ukončiť</string>
+  <string name="menu_scan">Zoskenovať BridgeQR</string>
+  <string name="menu_share_bridge">Zdielať BridgeQR</string>
+    <string name="btn_okay">OK</string>
+  <string name="btn_cancel">Zrušiť</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Niekoľko detailov o Orbot</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <string name="pref_general_group">Všeobecné</string>
+  <string name="pref_start_boot_title">Spustiť Orbot pri štarte</string>
+  <string name="pref_start_boot_summary">Automaticky spustiť Orbot a pripojiť k Tor, pri štarte vašeho Android zariadenia</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="pref_node_configuration">Konfigurácia uzlu</string>
+  <string name="pref_node_configuration_summary">Toto sú pokročilé nastavenia, ktorá môžu znížiť vašu anonymitu</string>
+  <string name="pref_entrance_node">Vstupné uzly</string>
+  <string name="pref_entrance_node_summary">Otlačky, prezývky, krajiny a adresy pre prvý skok</string>
+  <string name="pref_entrance_node_dialog">Zadajte vstupné uzly</string>
+  <string name="pref_allow_background_starts_title">Povoliť spustenie v pozadí</string>
+  <string name="pref_allow_background_starts_summary">Všetky aplikácie oznámia Orbot, aby spustil Tor a súvisiace služby</string>
+    <string name="pref_proxy_title">Odchádzajúce sieťové proxy (voliteľné)</string>
+  <string name="pref_proxy_type_title">Typ odchádzajúcich proxy</string>
+  <string name="pref_proxy_type_summary">Protokol použitý pre proxy server: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Zadajte typ proxy</string>
+  <string name="pref_proxy_host_title">Hostiteľ odchádzajúceho proxy</string>
+  <string name="pref_proxy_host_summary">Meno hostiteľa proxy servera</string>
+  <string name="pref_proxy_host_dialog">Zadajte hostiteľa proxy</string>
+  <string name="pref_proxy_port_title">Port odchádzajúceho proxy</string>
+  <string name="pref_proxy_port_summary">Port proxy servera</string>
+  <string name="pref_proxy_port_dialog">Zadajte port proxy</string>
+  <string name="pref_proxy_username_title">Používateľské meno odchádzajúceho proxy</string>
+  <string name="pref_proxy_username_summary">Používateľské meno proxy (voliteľné)</string>
+  <string name="pref_proxy_username_dialog">Zadajte používateľské meno proxy</string>
+  <string name="pref_proxy_password_title">Heslo odchádzajúcej proxy</string>
+  <string name="pref_proxy_password_summary">Heslo proxy (voliteľné)</string>
+  <string name="pref_proxy_password_dialog">Zadajte heslo proxy</string>
+    <string name="couldn_t_start_tor_process_">Nebolo možné spustiť Tor proces:</string>
+    <string name="error">Chyba</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Vaše nastavenie dostupných adries ReachableAddresses spôsobilo chybu!</string>
+  <string name="your_relay_settings_caused_an_exception_">Vaše nastavenie relácií spôsobilo chybu!</string>
+  <string name="exit_nodes">Výstupné uzly</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Otlačky, prezývky, krajiny a adresy pre posledný skok</string>
+  <string name="enter_exit_nodes">Zadajte výstupné uzly</string>
+  <string name="exclude_nodes">Vylúčené uzly</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Otlačky, prezývky, krajiny a adresy pre vylúčenie</string>
+  <string name="enter_exclude_nodes">Zadajte vylúčené uzly</string>
+  <string name="strict_nodes">Striktné uzly</string>
+  <string name="use_only_these_specified_nodes">Použiť *len* tieto špecifikované uzly</string>
+  <string name="bridges">Premostenia</string>
+  <string name="use_bridges">Použiť premostenia</string>
+    <string name="ip_address_and_port_of_bridges">IP adresy a porty premostení</string>
+  <string name="enter_bridge_addresses">Vložiť adresy premostení</string>
+  <string name="relays">Relé</string>
+  <string name="relaying">Postúpenie relé</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Povoliť, aby nebolo vaše zariadenie východiskovým relé / non-exit</string>
+  <string name="relay_port">Port relé</string>
+  <string name="listening_port_for_your_tor_relay">Port používaný pre vaše Tor relé</string>
+  <string name="enter_or_port">Zadajte OR port</string>
+  <string name="relay_nickname">Prezývka relé</string>
+  <string name="the_nickname_for_your_tor_relay">Prezývka pre vaše Tor relé</string>
+  <string name="enter_a_custom_relay_nickname">Zadajte vlastnú prezývku pre relé</string>
+  <string name="reachable_addresses">Dostupné adresy</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Spustiť ako klient za firewallom s obmedzujúcimi zásadami</string>
+  <string name="reachable_ports">Dostupné porty</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Dostupné porty za obmedzujúcim firewallom</string>
+  <string name="enter_ports">Zadajte porty</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">povoliť záznam výstupu diagnostiky (pre prehliadanie je potrebný adb alebo aLogCat)</string>
+  <string name="project_home">Domovské stránky projektov:</string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+    <string name="third_party_software">Software tretích strán:</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="found_existing_tor_process">nájdený iný proces Tor...</string>
+  <string name="something_bad_happened">Deje sa niečo zlé. Skontrolujte podrobnosti.</string>
+    <string name="unable_to_read_hidden_service_name">nemožné prečítať názov skrytej služby</string>
+  <string name="unable_to_start_tor">Nemožné spustiť Tor:</string>
+    <string name="pref_use_persistent_notifications">Vždy ponechať ikonu v stavovom riadku, keď je Orbot pripojený</string>
+  <string name="pref_use_persistent_notifications_title">Vždy zapnuté upozornenia</string>
+  <string name="pref_use_expanded_notifications">Zobraziť rozšírené upozornenie s výstupnou krajinou a IP adresou siete Tor</string>
+  <string name="pref_use_expanded_notifications_title">Rozšírené upozornenia</string>
+    <string name="set_locale_title">Jazyk</string>
+    <string name="no_internet_connection_tor">Žiadne pripojenie k internetu. Tor je v pohotovostnom režime...</string>
+    <string name="pref_disable_network_title">Automatický spánok</string>
+  <string name="pref_disable_network_summary">Uspať Tor, keď internet nie je dostupný</string>
+  <string name="newnym">Prepli ste na novú Tor identitu!</string>
+    <string name="no_network_connectivity_putting_tor_to_sleep_">Žiadna možnosť pripojenia do siete. Uspávam Tor...</string>
+  <string name="network_connectivity_is_good_waking_tor_up_">Pripojenie do siete je dobré. Aktivujem Tor...</string>
+  <string name="updating_settings_in_tor_service">aktualizujem nastavenie v službe Tor</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Port, na ktorom Tor poskytuje SOCKS proxy (prednastavené 9050 alebo 0 pre deaktiváciu)</string>
+  <string name="pref_socks_dialog">Nastavenia portu SOCKS</string>
+  <string name="pref_transport_title">Tor TransProxy port</string>
+  <string name="pref_transport_summary">Port, na ktorom Tor poskytuje transparentné proxy (prednastavené 9040 alebo 0 pre deaktiváciu)</string>
+  <string name="pref_transport_dialog">Nastavenia portu TransProxy</string>
+  <string name="pref_dnsport_title">Tor DNS port</string>
+  <string name="pref_dnsport_summary">Port, na ktorom Tor poskytuje DNS (prednastavené 5400 alebo 0 pre deaktiváciu)</string>
+  <string name="pref_dnsport_dialog">Nastavenie portu DNS</string>
+  <string name="pref_torrc_title">Vlastné nastavenie Torrc</string>
+  <string name="pref_torrc_summary">LEN PRE EXPERTOV: vložiť priamo riadky nastavenia torrc</string>
+  <string name="pref_torrc_dialog">Vlasné Torrc</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">Premostenia aktualizované</string>
+  <string name="restart_orbot_to_use_this_bridge_">Prosím reštartujte Orbot, aby sa aktivovali zmeny</string>
+  <string name="menu_qr">QR kódy</string>
+  <string name="bridge_mode">Mod premostení</string>
+  <string name="get_bridges_email">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Aktivovať</string>
+  <string name="send_email">Poslať 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_">Môžete získať adresu premostenia cez email, web, alebo naskenovaním QR kódu premostenia. Vyberte \'Email\' alebo \'Web\' nižšie pre vyžiadanie adresy premostenia.\n\nAkonáhle budete mať adresu, skopírujte a vložte ju do nastavení \"Premostenia\" v nastaveniach Orbot a reštartujte ho.</string>
+    <string name="save">Uložiť</string>
+  <string name="name">Meno</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Prosím reštartujte Orbot, aby sa aktivovali zmeny</string>
+  <string name="disable">Zakázať</string>
+  <string name="enable">Povoliť</string>
+</resources>
diff --git a/app-mini/src/main/res/values-sl/strings.xml b/app-mini/src/main/res/values-sl/strings.xml
new file mode 100644
index 00000000..dfde7d65
--- /dev/null
+++ b/app-mini/src/main/res/values-sl/strings.xml
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</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="menu_settings">Nastavitve</string>
+  <string name="menu_log">Dnevnik</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_about">O programu</string>
+    <string name="menu_exit">Izhod</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>
+    <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Splošno</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+    <string name="error">Napaka</string>
+    <string name="set_locale_title">Jezik</string>
+    <string name="activate">Aktiviraj</string>
+  <string name="save">Shrani</string>
+  <string name="name">ime</string>
+</resources>
diff --git a/app-mini/src/main/res/values-sn/strings.xml b/app-mini/src/main/res/values-sn/strings.xml
new file mode 100644
index 00000000..247cd012
--- /dev/null
+++ b/app-mini/src/main/res/values-sn/strings.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+    <string name="menu_settings">Zvamada</string>
+  <string name="menu_stop">Mira</string>
+  <string name="menu_about">Maererano</string>
+    <string name="button_about">Maererano</string>
+  <string name="menu_exit">Buda</string>
+    <string name="btn_cancel">Kanzura</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="error">Paita kanganiso</string>
+    <string name="set_locale_title">Mutauro</string>
+  <string name="name">Zita</string>
+  <string name="disable">Rambidza</string>
+  <string name="enable">Bvumidza</string>
+</resources>
diff --git a/app-mini/src/main/res/values-sq/strings.xml b/app-mini/src/main/res/values-sq/strings.xml
new file mode 100644
index 00000000..a54bdc79
--- /dev/null
+++ b/app-mini/src/main/res/values-sq/strings.xml
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot eshte nje perfaqesues falas per internetin i cili ndihmon programet e tjera te perdori internetin ne menyre me te sigurte. Orbot perdor Tor per te shifruar trafikun tuaj te internetit nepermjet nje serie me kompjutere perqark botes. Tor eshte nje softwere pa pagese dhe nje rrjet i hapur qe ju ndihmon juve te mbroheni nga cdo forme mbikqyrjeje ne rrjet qe cenon lirine dhe privatesine personale, aktivitetet konfidenciale te lidhjeve dhe bizneseve, dhe siqurine e gjendjes te njohur si analiza e trafikut.</string>
+    <string name="menu_settings">Zgjedhjet</string>
+    <string name="menu_start">Nisje</string>
+  <string name="menu_stop">Ndale</string>
+  <string name="menu_about">Informacione</string>
+  <string name="main_layout_download">Shkarkim</string>
+    <string name="button_about">Informacione</string>
+  <string name="menu_exit">Dil</string>
+    <string name="btn_okay">Ne rregul</string>
+  <string name="btn_cancel">Anullo</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Disa detaje te Orbot</string>
+    <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Të Përgjithshme</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+    <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+    <string name="error">Gabim</string>
+  <string name="bridges">Urat</string>
+    <string name="set_locale_title">Gjuhë</string>
+    <string name="get_bridges_email">Email</string>
+  <string name="activate">Aktivizo</string>
+  <string name="save">Ruaje</string>
+  <string name="name">Emër</string>
+  <string name="backup_restored">Kopjeruajtja u rikthye</string>
+  <string name="disable">Çaktivizoje</string>
+  <string name="enable">Mundëso</string>
+</resources>
diff --git a/app-mini/src/main/res/values-sr/strings.xml b/app-mini/src/main/res/values-sr/strings.xml
new file mode 100644
index 00000000..bc373863
--- /dev/null
+++ b/app-mini/src/main/res/values-sr/strings.xml
@@ -0,0 +1,186 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Орбот</string>
+  <string name="app_description">Орбот је бесплатна прокси апликација која даје моћ другим апликацијама да безбедније користе интернет. Орбот користи Тор за шифровање вашег интернет саобраћаја и онда га скрива слањем кроз низ рачунара широм света. Тор је слободан софтвер и отворена мрежа која помаже да се одбраните од разних облика надзора мрежа који угрожавају личну слободу и приватност, поверљиве пословне активности и личне односе и државне безбедности познате као анализа саобраћаја.</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="menu_settings">Подешавања</string>
+  <string name="menu_log">Логови</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_about">О нама</string>
+    <string name="menu_exit">Излаз</string>
+  <string name="menu_scan">Скенирај BridgeQR</string>
+  <string name="menu_share_bridge">Подели BridgeQR</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">Орбот је апликација отвореног кода која садржи Тор, Obfs4Proxy, BadVPN Tun2Socks, LibEvent и Polipo. Омогућава локални HTTP proxy (8118) и SOCKS proxy (9050) у Тор мрежу. Орбот такође има могућност да на рутованом уређају шаље сав интернет саобраћај преко Тор-а.</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="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="couldn_t_start_tor_process_">Није могуће покренути Тор процес:</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="enable_alternate_entrance_nodes_into_the_tor_network">Омогућите алтернативне улазе у Тор мрежу</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_debug_log_to_output_must_use_adb_or_alogcat_to_view_">омогућите debug логовоање (мора се користити 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="third_party_software">Софтвер од стране неслужбених издавача:</string>
+  <string name="tor_version">Toр: 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="hidden_service_request">Апликација жели да отвори сакривен порт%1$s на серверу за Тор мрежу. Ово је сигуран потез уколико верујете апликацији.</string>
+  <string name="found_existing_tor_process">нађен покренути Тор процес...</string>
+  <string name="something_bad_happened">Нешто лоше се догодило. Прегледајте логове</string>
+    <string name="unable_to_read_hidden_service_name">нисам у могућности да прочитам име сакривеног сервиса</string>
+  <string name="unable_to_start_tor">Тор није у могућности да се покрене:</string>
+    <string name="pref_use_persistent_notifications">Увек прикажи икону у тулбару када је Орбот конектован</string>
+  <string name="pref_use_persistent_notifications_title">Стално укључене нотификације</string>
+  <string name="pref_use_expanded_notifications">Прикажи опширно обавештење Тор излаза државе и IP-ја</string>
+  <string name="pref_use_expanded_notifications_title">Опширно Обавештење</string>
+    <string name="set_locale_title">Језик</string>
+    <string name="no_internet_connection_tor">Нема интернет конекције; Тор је у мировању...</string>
+    <string name="pref_disable_network_title">Без Мреже Auto-Sleep</string>
+  <string name="pref_disable_network_summary">Умири Тор када је недоступан интернет</string>
+  <string name="newnym">Прешли сте на нови Тор идентитет!</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">Toр SOCKS</string>
+  <string name="pref_socks_summary">Port који Тор нуди је SOCKS прокси укључен (уобичајено: 9050 или 0 за искључивање)</string>
+  <string name="pref_socks_dialog">SOCKS Port Подешавања</string>
+  <string name="pref_transport_title">Toр TransProxy Port</string>
+  <string name="pref_transport_summary">Port који Тор нуди је Transparent Proxy укључен (уобичајено: 9040 или 0 за искључивање)</string>
+  <string name="pref_transport_dialog">TransProxy Port Подешавања</string>
+  <string name="pref_dnsport_title">Toр DNS Port</string>
+  <string name="pref_dnsport_summary">Port који Тор нуди је DNS укључен (уобичајено: 5400 или 0 за искључивање)</string>
+  <string name="pref_dnsport_dialog">DNS Port Подешавања</string>
+  <string name="pref_torrc_title">Torrc Прерађена Подешавања</string>
+  <string name="pref_torrc_summary">САМО ЗА ЕКСПЕРТЕ: унети директно torrc линије подешавања</string>
+  <string name="pref_torrc_dialog">Подеси Torrc</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_">Молимо покрените поново Орбот ради примењивања промена</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_">Ако ваша мобилна мрежа активно блокира Тор, можете премошћивати сервером као алтернативни начин уласка.ОДАБЕРИ једну од опција за конфигурацију и тестирање....</string>
+  <string name="bridge_mode">Bridge Режим</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="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 адресу преко е-поште. на web-у или скенирањем bridge QR кода. Одабери \'E-пошта\' или \'Web\' испод да би сте затражили bridge адресу.\n\nЈедном када добијете адресу. копирај& налепи је у \"Bridges\" преференцији у Орбот подешавањима и поново покрените.</string>
+    <string name="vpn_default_world">Глобално (Аутоматски)</string>
+  <string name="hidden_services">Скривени Сервиси</string>
+  <string name="title_activity_hidden_services">Скривени Сервиси</string>
+  <string name="menu_hidden_services">Скривени Сервиси</string>
+  <string name="save">Сачувај</string>
+    <string name="local_port">Локални Порт</string>
+  <string name="onion_port">Onion Порт</string>
+  <string name="name">Име</string>
+  <string name="done">Готово !</string>
+  <string name="invalid_port">Неисправан Порт</string>
+  <string name="copy_address_to_clipboard">Копирај адреса у clipboard</string>
+  <string name="show_auth_cookie">Покажите ауторизовани колачић</string>
+  <string name="backup_service">Услуга за резервне копије</string>
+  <string name="delete_service">Обриши Услугу</string>
+  <string name="backup_saved_at_external_storage">Резербна копија је сачувана на спољној меморији</string>
+  <string name="backup_restored">Резервна копија је обновљена</string>
+  <string name="filemanager_not_available">Менаџер фајлова није доступан</string>
+  <string name="please_grant_permissions_for_external_storage">Молимо да дате дозволе за екстерно складиштење</string>
+    <string name="restore_backup">Обнови резервну копију</string>
+  <string name="create_a_backup_first">Направи резервну копију прво</string>
+  <string name="name_can_t_be_empty">Име не може бити празно</string>
+  <string name="fields_can_t_be_empty">Поља не могу бити празна</string>
+  <string name="start_tor_again_for_finish_the_process">Поново покрените Тор да бисте довршили процес</string>
+  <string name="confirm_service_deletion">Потрврди брисанје услуге</string>
+  <string name="click_again_for_backup">Кликните поново за резервну копију</string>
+  <string name="service_type">Тип Услуге</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Молимо покрените поново Орбот ради примењивања промена</string>
+  <string name="client_cookies">Колачићи клијента</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">Неважећа .onion адреса</string>
+  <string name="cookie_from_QR">Прочитај са QR кода</string>
+  <string name="backup_cookie">Резервна копија колачића</string>
+  <string name="delete_cookie">Избриши колачић</string>
+  <string name="confirm_cookie_deletion">Потрврди брисање колачића</string>
+  <string name="hosted_services">Хостоване Услуге</string>
+  <string name="share_as_qr">Дели као QR код</string>
+  <string name="disable">Онемогући</string>
+  <string name="enable">Омогући</string>
+  <string name="consider_disable_battery_optimizations">Размотрите онемогућавање оптимизације батерије</string>
+  <string name="consider_enable_battery_optimizations">Размотрите омогућавање оптимизације батерије</string>
+  <string name="pref_isolate_dest">Изолуј одредишну адресу</string>
+  <string name="pref_isolate_dest_summary">Користи другачији круг за сваку одредишну адресу</string>
+  <string name="pref_connection_padding">Прикључак за повезивање</string>
+  <string name="pref_connection_padding_summary">Увек омогућава прикључак за повезивање због заштитите од неких облика анализе саобраћаја. Подразумевано: ауто</string>
+</resources>
diff --git a/app-mini/src/main/res/values-sv/poestrings.xml b/app-mini/src/main/res/values-sv/poestrings.xml
new file mode 100644
index 00000000..ed6bb5e0
--- /dev/null
+++ b/app-mini/src/main/res/values-sv/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">Ibland behöver du en bro för att komma åt Tor.</string>
+    <string name="action_more">BERÄTTA MERA</string>
+
+    <string name="vpn_setup">Du kan aktivera vilken app som helst som ska gå genom Tor med hjälp av vår inbyggda VPN.</string>
+    <string name="vpn_setup_sub">Detta kommer inte att göra dig anonym, men det hjälper dig att komma igenom brandväggar.</string>
+    <string name="action_vpn_choose">VÄLJ APPAR</string>
+
+    <string name="hello">Hej</string>
+    <string name="welcome">Välkommen till Tor på mobilen.</string>
+
+    <string name="browser_the_internet">Bläddra på internet hur du förväntar dig att du ska.</string>
+    <string name="no_tracking">Ingen spårning. Ingen censur.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-sv/strings.xml b/app-mini/src/main/res/values-sv/strings.xml
new file mode 100644
index 00000000..350da961
--- /dev/null
+++ b/app-mini/src/main/res/values-sv/strings.xml
@@ -0,0 +1,206 @@
+<?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="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="menu_settings">Inställningar</string>
+  <string name="menu_log">Logg</string>
+    <string name="menu_start">Start</string>
+  <string name="menu_stop">Stopp</string>
+  <string name="menu_about">Om</string>
+    <string name="main_layout_download">Nedladdat</string>
+  <string name="main_layout_upload">Uppladdat</string>
+    <string name="button_about">Om</string>
+    <string name="menu_exit">Avsluta</string>
+  <string name="menu_scan">Skanna BridgeQR</string>
+  <string name="menu_share_bridge">Dela BridgeQR</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 ett program med öppen källkod som innehåller Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent och Polipo. Den tillhandahåller en lokal HTTP-proxy (8118) och en SOCKS-proxy (9050) i Tor-nätverket. Orbot har också förmågan att, på rotad enhet, skicka all internettrafik genom Tor.</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="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="couldn_t_start_tor_process_">Kunde inte starta Tor-process:</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="enable_alternate_entrance_nodes_into_the_tor_network">Aktivera alternativa ingångar i Tor-nätverket</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_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="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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">En app vill öppna dold serverport %1$s till Tor-nätverket. Det här ä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="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="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="set_locale_title">Språk</string>
+    <string name="no_internet_connection_tor">Ingen internetanslutning; Tor är i standby-läge...</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="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="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ät aktivt blockerar Tor kan du använda en \"Bridge Server\" som ett alternativt sätt. VÄLJ ett av alternativen att konfigurera och testa.,.</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">VPN-läge</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="vpn_default_world">Global (automatisk)</string>
+  <string name="hidden_services">Hidden Services</string>
+  <string name="title_activity_hidden_services">Hidden Services</string>
+  <string name="menu_hidden_services">Hidden Services</string>
+  <string name="save">Spara</string>
+    <string name="local_port">Lokal port</string>
+  <string name="onion_port">Onion port</string>
+  <string name="name">Namn</string>
+  <string name="done">Klart!</string>
+  <string name="invalid_port">Ogiltig port</string>
+  <string name="copy_address_to_clipboard">Kopiera adress till urklipp</string>
+  <string name="show_auth_cookie">Visa auth kaka</string>
+  <string name="backup_service">Säkerhetskopiera tjänst</string>
+  <string name="delete_service">Ta bort tjänst</string>
+  <string name="backup_saved_at_external_storage">Säkerhetskopiering sparad i externt lagringsutrymme</string>
+  <string name="backup_restored">Backup återställd</string>
+  <string name="filemanager_not_available">Filhanteraren är inte tillgänglig</string>
+  <string name="please_grant_permissions_for_external_storage">Bevilja tillstånd för extern lagring</string>
+    <string name="restore_backup">Återställa säkerhetskopia</string>
+  <string name="create_a_backup_first">Skapa en säkerhetskopia först</string>
+  <string name="name_can_t_be_empty">Namnet kan inte vara tomt</string>
+  <string name="fields_can_t_be_empty">Fält kan inte vara tomma</string>
+  <string name="start_tor_again_for_finish_the_process">Starta Tor igen för att avsluta processen</string>
+  <string name="confirm_service_deletion">Bekräfta tjänst borttagning</string>
+  <string name="click_again_for_backup">Klicka igen för säkerhetskopiering</string>
+  <string name="service_type">Typ av tjänst</string>
+  <string name="auth_cookie">Auth kaka</string>
+  <string name="copy_cookie_to_clipboard">Kopiera kaka till urklipp</string>
+  <string name="auth_cookie_was_not_configured">Auth kaka var inte konfigurerad</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Vänligen starta om Orbot för att aktivera ändringarna</string>
+  <string name="client_cookies">Klientkakor</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">Ogiltig .onion-adress</string>
+  <string name="cookie_from_QR">Läs från QR</string>
+  <string name="backup_cookie">Säkerhetskopiera kaka</string>
+  <string name="delete_cookie">Ta bort kaka</string>
+  <string name="confirm_cookie_deletion">Bekräfta borttagning av kaka</string>
+  <string name="hosted_services">Värdtjänster</string>
+  <string name="share_as_qr">Dela som QR</string>
+  <string name="disable">Inaktivera</string>
+  <string name="enable">Aktivera</string>
+  <string name="consider_disable_battery_optimizations">Överväg att inaktivera batterioptimeringar</string>
+  <string name="consider_enable_battery_optimizations">Överväg att aktivera batterioptimeringar</string>
+  <string name="pref_isolate_dest">Isolera destinationsadresser</string>
+  <string name="pref_isolate_dest_summary">Använd en annan krets för varje destinationsadress</string>
+  <string name="no_transproxy_warning_short">VARNING: Transproxy stöds inte längre</string>
+  <string name="no_transproxy_warning">VARNING: Transparent proxy stöds inte. Använd Orbot Apps VPN istället.</string>
+  <string name="pref_connection_padding">Anslutnings-utfyllnad</string>
+  <string name="pref_connection_padding_summary">Aktivera alltid anslutnings-utfyllnad för att skydda mot vissa former av trafikanalys. Standard: auto</string>
+  <string name="pref_reduced_connection_padding">Minskad anslutnings-utfyllnad</string>
+  <string name="pref_reduced_connection_padding_summary">Stänger relä-anslutningar tidigare, och skickar färre utfyllnadspaket för att minska datatrafik och batteriförbrukning</string>
+    <string name="app_shortcuts">Tor-aktiverade appar</string>
+    <string name="testing_bridges">Testa broanslutning till Tor....</string>
+  <string name="testing_bridges_success">Lyckades. Brokonfigurationen är bra!</string>
+  <string name="testing_bridges_fail">MISSLYCKADES. Försök med ett annat alternativ</string>
+  <string name="bridge_direct_connect">Anslut direkt till Tor (Bästa)</string>
+  <string name="bridge_community">Anslut genom gemenskaps servrar</string>
+  <string name="bridge_cloud">Anslut via molnservrar</string>
+  <string name="bridges_get_new">Begär nya broar... (om allt annat misslyckas)</string>
+  <string name="trouble_connecting">Problem med att ansluta?</string>
+  <string name="full_device_vpn">VPN för hela enheten</string>
+  <string name="vpn_disabled">VPN inaktiverad</string>
+</resources>
diff --git a/app-mini/src/main/res/values-ta/poestrings.xml b/app-mini/src/main/res/values-ta/poestrings.xml
new file mode 100644
index 00000000..4a69c50a
--- /dev/null
+++ b/app-mini/src/main/res/values-ta/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">சில நேரங்களில் நீங்கள் Tor ஐ பெற ஒரு இணைப்பு தேவைப்படுகிறது.</string>
+    <string name="action_more">இன்னும் எனக்கு சொல்லுங்கள்</string>
+
+    <string name="vpn_setup">எங்களுடைய உள்ளமைக்கப்பட்ட VPN ஐ பயன்படுத்தி Tor மூலம் செல்ல எந்தப் பயன்பாட்டையும் இயக்கலாம்.</string>
+    <string name="vpn_setup_sub">இது உங்களை அநாமதேயமாக்குகிறது, ஆனால் அது ஃபயர்வால்கள் வழியாக உதவுகிறது.</string>
+    <string name="action_vpn_choose">பயன்பாடுகளைத் தேர்வுசெய்யவும்</string>
+
+    <string name="hello">வணக்கம்</string>
+    <string name="welcome">மொபைலில் தோர் க்கு வரவேற்கிறோம்.</string>
+
+    <string name="browser_the_internet">நீங்கள் எதிர்பார்க்கும் இணையத்தை உலாவவும்.</string>
+    <string name="no_tracking">கண்காணிப்பு இல்லை. தணிக்கை இல்லை.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-ta/strings.xml b/app-mini/src/main/res/values-ta/strings.xml
new file mode 100644
index 00000000..402e9f59
--- /dev/null
+++ b/app-mini/src/main/res/values-ta/strings.xml
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">ஆர்பாட் </string>
+  <string name="app_description">ஆர்பாட், இன்னும பாதுகாப்பான முறையில் இணைய பயன்படுத்த மற்ற பயன்பாடுகள் பலப்படுத்துகிறார் என்று ஒரு இலவச ப்ராக்ஸி பயன்பாடு ஆகும். ஆர்பாட் உங்கள் இணைய போக்குவரத்து குறியாக்க தோர் பயன்படுத்துகிறது மற்றும் அதன் பின்னர் உலகம் முழுவதும் கணினிகள் ஒரு தொடர் மூலம் எதிர்க்கிறது அதை மறுத்தவர். தோர் இலவச மென்பொருள் மற்றும் நீங்கள் போக்குவரத்து பகுப்பாய்வு
  என்ற தனிப்பட்ட சுதந்திரம் மற்றும் தனியுரிமை, ரகசிய வணிக நடவடிக்கைகள் மற்றும் உறவுகள், மற்றும் மாநில பாதுகாப்பை அச்சுறுத்தும் நெட்வொர்க் கண்காணிப்பு வடிவ எதிராக பாதுகாக்க உதவுகிறது என்று ஒரு திறந்த நெட்வொர்க் ஆகும்.</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="menu_settings">அமைப்புகள்</string>
+  <string name="menu_log">பதிவுகள்</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_about">பற்றி </string>
+    <string name="menu_exit">வெளியேறு</string>
+  <string name="menu_scan">ஸ்கேன் BridgeQR</string>
+  <string name="menu_share_bridge">BridgeQR பகிர்ந்திடு</string>
+    <string name="btn_okay">சரி</string>
+  <string name="btn_cancel">ரத்து செய்</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">ஆர்பாட் பற்றிய தகவல்</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="pref_proxy_password_summary">பதிலாள் கடவுச்சொல் (கட்டாயமற்ற)</string>
+  <string name="pref_proxy_password_dialog">பதிலாள் கடவுச்சொல்லை உள்ளிடவும்</string>
+    <string name="error">பிழை</string>
+  <string name="bridges">Bridgeகள்</string>
+    <string name="set_locale_title">மொழி</string>
+    <string name="get_bridges_email">மின்னஞ்சல்</string>
+  <string name="activate">செயல்படுத்தவும்</string>
+  <string name="save">சேமி</string>
+  <string name="name">பெயர்</string>
+  <string name="service_type">சேவை வகை</string>
+  <string name="backup_cookie">நினைவிகளை காப்புப்பிரதிகலெடு</string>
+  <string name="delete_cookie">நினைவிகளை ஆழி</string>
+  <string name="confirm_cookie_deletion">நினைவிகளின் நீக்கத்தை உறுதிப்படுத்து</string>
+  <string name="hosted_services">வழங்கப்பட்ட சேவைகள்</string>
+  <string name="share_as_qr">QR ஆக பகிர்</string>
+  <string name="disable">முடக்கு</string>
+  <string name="enable">செயல்படுத்து</string>
+  <string name="trouble_connecting">இணைப்பதில் சிக்கலா ?</string>
+  <string name="full_device_vpn">முழு சாதனத்திற்க்கான VPN</string>
+  <string name="vpn_disabled">VPN முடக்கப்பட்டுள்ளது</string>
+</resources>
diff --git a/app-mini/src/main/res/values-th/poestrings.xml b/app-mini/src/main/res/values-th/poestrings.xml
new file mode 100644
index 00000000..c04547b7
--- /dev/null
+++ b/app-mini/src/main/res/values-th/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">บางครั้งคุณอาจต้องการ Bridges เพื่อเชื่อมต่อกับ Tor</string>
+    <string name="action_more">บอกรายละเอียดเพิ่มเติมกับฉัน</string>
+
+    <string name="vpn_setup">คุณสามารถเปิดใช้งานแอปใดๆ ผ่าน Tor โดยใช้ VPN ในตัวของเรา</string>
+    <string name="vpn_setup_sub">การดำเนินการนี้จะไม่\ได้ทำให้ไม่มีการระบุตัวตนของคุณ แต่จะเป็นการทำให้ผ่านไฟร์วอลล์ได้</string>
+    <string name="action_vpn_choose">เลือกแอป</string>
+
+    <string name="hello">สวัสดี</string>
+    <string name="welcome">ขอต้อนรับสู่ Tor บนมือถือ</string>
+
+    <string name="browser_the_internet">เข้าดูอินเทอร์เน็ตได้ในแบบที่คุณคาดหวัง</string>
+    <string name="no_tracking">ไม่มีการติดตาม ไม่มีการปิดกั้น</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-th/strings.xml b/app-mini/src/main/res/values-th/strings.xml
new file mode 100644
index 00000000..9effbcc6
--- /dev/null
+++ b/app-mini/src/main/res/values-th/strings.xml
@@ -0,0 +1,206 @@
+<?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="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="menu_settings">การตั้งค่า</string>
+  <string name="menu_log">บันทึก</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_about">เกี่ยวกับ</string>
+    <string name="menu_exit">ออก</string>
+  <string name="menu_scan">สแกน BridgeQR</string>
+  <string name="menu_share_bridge">แชร์ BridgeQR</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, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent และ Polipo โดย Orbot จะสร้างพร็อกซี (8118) และพร็อกซี SOCKS (9050) ในเครื่อง ภายในเครือข่าย Tor Orbot ยังสามารถทำการรับส่งข้อมูลทั้งหมดส่งผ่าน Tor ได้บนอุปกรณ์ที่ได้ทำการ root แล้ว</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="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="couldn_t_start_tor_process_">ไม่สามารถเริ่มกระบวนการของ Tor</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">Bridges</string>
+  <string name="use_bridges">ใช้งาน Bridges</string>
+    <string name="enable_alternate_entrance_nodes_into_the_tor_network">เปิดใช้งานทางเข้าอื่นเข้าสู่เครือข่าย Tor</string>
+    <string name="ip_address_and_port_of_bridges">ที่อยู่ไอพีและพอร์ตของ Bridges</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">พอร์ตที่ให้รีเลย์ของ 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_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="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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">โปรแกรมต้องการเปิดพอร์ต %1$s ที่ซ่อนอยู่ของเซิร์ฟเวอร์ให้เชื่อมกับเครือข่าย Tor การกระทำนี้ปลอดภัยถ้าคุณเชื่อถือโปรแกรมนั้น</string>
+  <string name="found_existing_tor_process">พบกระบวนการ Tor ที่มีอยู่แล้ว...</string>
+  <string name="something_bad_happened">เกิดอะไรไม่ดีสักอย่าง ให้ตรวจดูจากบันทึก</string>
+    <string name="unable_to_read_hidden_service_name">ไม่สามารถอ่านชื่อของบริการที่ซ่อน</string>
+  <string name="unable_to_start_tor">ไม่สามารถเริ่ม Tor:</string>
+    <string name="pref_use_persistent_notifications">แสดงไอคอนในทูลบาร์เสมอเมื่อ Orbot เชื่อมต่ออยู่</string>
+  <string name="pref_use_persistent_notifications_title">การแจ้งเตือนแบบตลอดเวลา</string>
+  <string name="pref_use_expanded_notifications">แสดงการแจ้งเตือนแบบขยายที่ระบุประเทศปลายทางและ IP ของ Tor</string>
+  <string name="pref_use_expanded_notifications_title">การแจ้งเตือนแบบขยาย</string>
+    <string name="set_locale_title">ภาษา</string>
+    <string name="no_internet_connection_tor">ไม่มีการเชื่อมต่ออินเทอร์เน็ต Tor พร้อมรอใช้งาน...</string>
+    <string name="pref_disable_network_title">ไม่พบเครือข่าย พักการใช้งานอัตโนมัติ</string>
+  <string name="pref_disable_network_summary">พักการใช้งาน Tor เมื่อไม่มีอินเทอร์เน็ต</string>
+  <string name="newnym">คุณได้เปลี่ยนมาใช้ตัวตน Tor ใหม่แล้ว</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">พอร์ตพร็อกซีแบบ Transparent ของ Tor</string>
+  <string name="pref_transport_summary">พอร์ตที่ Tor ให้บริการพร็อกซีแบบ Transparent (ค่าเริ่มต้น: 9040 หรือ 0 ไปถึงไม่เปิดใช้งาน)</string>
+  <string name="pref_transport_dialog">กำหนดค่าพอร์ตพร็อกซีแบบ Transparent</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">สำหรับผู้เชี่ยวชาญเท่านั้น: ระบุบรรทัดที่กำหนดค่า torcc โดยตรง</string>
+  <string name="pref_torrc_dialog">Torrc ที่กำหนดเอง</string>
+    <string name="kbps">กิโลบิตต่อวินาที</string>
+  <string name="mbps">เมกะบิตต่อวินาที</string>
+  <string name="kb">กิโลไบต์</string>
+  <string name="mb">เมกะไบต์</string>
+  <string name="bridges_updated">ปรับปรุง Bridges แล้ว</string>
+  <string name="restart_orbot_to_use_this_bridge_">กรุณาเริ่ม Orbot ใหม่เพื่อให้การเปลี่ยนแปลงใช้งานได้</string>
+  <string name="menu_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 คุณสามารถใช้ \'เซิร์ฟเวอร์ Bridge\' เป็นตัวเลือกในการเข้าถึงได้ เลือกตัวเลือกหนึ่งเพื่อกำหนดค่าและทดสอบ...</string>
+  <string name="bridge_mode">โหมด Bridge</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="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 เลือก \'อีเมล\' หรือ \'เว็บ\' ด้านล่างเพื่อขอที่อยู่ของ Bridge\n\nเมื่อคุณได้ที่อยู่แล้ว ให้คัดลอก & วางลงในการปรับแต่งลักษณะของ \"Bridge\" ในการตั้งค่าของ Orbit และเริ่มการทำงานใหม่</string>
+    <string name="vpn_default_world">ส่วนรวม (อัตโนมัติ)</string>
+  <string name="hidden_services">บริการที่ซ่อน</string>
+  <string name="title_activity_hidden_services">บริการที่ซ่อน</string>
+  <string name="menu_hidden_services">บริการที่ซ่อน</string>
+  <string name="save">บันทึก</string>
+    <string name="local_port">พอร์ตในเครื่อง</string>
+  <string name="onion_port">พอร์ต Onion</string>
+  <string name="name">ชื่อเอกสาร</string>
+  <string name="done">เสร็จสิ้น!</string>
+  <string name="invalid_port">พอร์ตไม่ถูกต้อง</string>
+  <string name="copy_address_to_clipboard">คัดลอกที่อยู่ลงในคลิปบอร์ด</string>
+  <string name="show_auth_cookie">แสดงคุกกี้ที่ได้รับอนุญาต</string>
+  <string name="backup_service">บริการสำรองข้อมูล</string>
+  <string name="delete_service">บริการลบ</string>
+  <string name="backup_saved_at_external_storage">ข้อมูลสำรองบันทึกที่ที่เก็บข้อมูลภายนอก</string>
+  <string name="backup_restored">คืนค่าข้อมูลสำรอง</string>
+  <string name="filemanager_not_available">ไม่สามารถใช้ Filemanager ได้</string>
+  <string name="please_grant_permissions_for_external_storage">กรุณาอนุญาตให้เข้าถึงที่เก็บข้อมูลภายนอก</string>
+    <string name="restore_backup">คืนค่าข้อมูลสำรอง</string>
+  <string name="create_a_backup_first">สร้างข้อมูลสำรองก่อน</string>
+  <string name="name_can_t_be_empty">ปล่อยชื่อให้ว่างไม่ได้</string>
+  <string name="fields_can_t_be_empty">ปล่อยเขตข้อมูลให้ว่างไม่ได้</string>
+  <string name="start_tor_again_for_finish_the_process">เริ่มทำงาน Tor อีกครั้งเพื่อจบกระบวนการ</string>
+  <string name="confirm_service_deletion">ยืนยันการลบบริการ</string>
+  <string name="click_again_for_backup">กดอีกครั้งเพื่อเรียกข้อมูลสำรอง</string>
+  <string name="service_type">ประเภทของบริการ</string>
+  <string name="auth_cookie">คุกกี้ที่ได้รับอนุญาต</string>
+  <string name="copy_cookie_to_clipboard">คัดลอกคุกกี้ลงในคลิปบอร์ด</string>
+  <string name="auth_cookie_was_not_configured">ยังไม่ได้กำหนดค่าคุกกี้ที่ได้รับอนุญาต</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">กรุณาเริ่ม Orbot ใหม่เพื่อให้การเปลี่ยนแปลงใช้งานได้</string>
+  <string name="client_cookies">คุกกี้ของไคลเอ็นต์</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">ที่อยู่ .onion ไม่ถูกต้อง</string>
+  <string name="cookie_from_QR">อ่านจากคิวอาร์</string>
+  <string name="backup_cookie">สำรองข้อมูลคุกกี้</string>
+  <string name="delete_cookie">ลบคุกกี้</string>
+  <string name="confirm_cookie_deletion">ยืนยันการลบคุกกี้</string>
+  <string name="hosted_services">บริการโฮสต์</string>
+  <string name="share_as_qr">แชร์ในรูปแบบคิวอาร์</string>
+  <string name="disable">ปิดการใช้งาน</string>
+  <string name="enable">เปิดใช้งาน</string>
+  <string name="consider_disable_battery_optimizations">พิจารณาปิดการใช้งานการปรับแบตเตอรี่ให้เหมาะสมที่สุด</string>
+  <string name="consider_enable_battery_optimizations">พิจารณาเปิดใช้งานการปรับแบตเตอรี่ให้เหมาะสมที่สุด</string>
+  <string name="pref_isolate_dest">แยกที่อยู่ปลายทาง</string>
+  <string name="pref_isolate_dest_summary">ใช้วงรอบที่แตกต่างกันสำหรับแต่ละที่อยู่ปลายทาง</string>
+  <string name="no_transproxy_warning_short">คำเตือน: ไม่รองรับพร็อกซีแบบ Transparent</string>
+  <string name="no_transproxy_warning">คำเตือน: ไม่รองรับพร็อกซีแบบ Transparent  ใช้ VPN ของแอป Orbot แทน</string>
+  <string name="pref_connection_padding">ช่องว่างภายในการเชื่อมต่อ</string>
+  <string name="pref_connection_padding_summary">เปิดใช้งานช่องว่างภายในเครือข่ายเสมอเพื่อป้องกันการวิเคราะห์การรับส่งข้อมูลบางรูปแบบ ตั้งค่าเริ่มต้นเป็น: อัตโนมัติ</string>
+  <string name="pref_reduced_connection_padding">ลดช่องว่างภายในเครือข่าย</string>
+  <string name="pref_reduced_connection_padding_summary">เลือกการเชื่อมต่อรีเลย์ให้เร็วขึ้นและส่งช่องว่างภายในแพคเก็ตให้น้อยลงเพื่อลดการใช้งานข้อมูลและแบตเตอรี่</string>
+    <string name="app_shortcuts">แอปที่ใช้ได้กับ Tor</string>
+    <string name="testing_bridges">ทดสอบการเชื่อมต่อ Bridge กับ Tor</string>
+  <string name="testing_bridges_success">สำเร็จ การกำหนดค่า Bridge เรียบร้อยดีแล้ว</string>
+  <string name="testing_bridges_fail">ล้มเหลว ลองตัวเลือกอื่น</string>
+  <string name="bridge_direct_connect">เชื่อมต่อกับ Tor โดยตรง (ดีที่สุด)</string>
+  <string name="bridge_community">เชื่อมต่อผ่านเซิร์ฟเวอร์ของชุมชน</string>
+  <string name="bridge_cloud">เชื่อมต่อผ่านเซิร์ฟเวอร์คลาวด์</string>
+  <string name="bridges_get_new">ขอ Bridge ใหม่... (หากทุกอย่างใช้การไม่ได้)</string>
+  <string name="trouble_connecting">มีปัญหากับการเชื่อมต่อหรือไม่</string>
+  <string name="full_device_vpn">VPN ทั้งอุปกรณ์</string>
+  <string name="vpn_disabled">ปิดใช้งาน VPN</string>
+</resources>
diff --git a/app-mini/src/main/res/values-tl/strings.xml b/app-mini/src/main/res/values-tl/strings.xml
new file mode 100644
index 00000000..7a8edf1c
--- /dev/null
+++ b/app-mini/src/main/res/values-tl/strings.xml
@@ -0,0 +1,117 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</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="menu_settings">Settings</string>
+  <string name="menu_log">Tala</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_about">Tungkol</string>
+    <string name="menu_exit">Labasan</string>
+  <string name="menu_share_bridge">Ipamahagi ang BridgeQR</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>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="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="couldn_t_start_tor_process_">Hindi ma umpisahan ang proseso ng Tor:</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="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_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="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="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="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="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="set_locale_title">Wika</string>
+    <string name="no_internet_connection_tor">Walang connection sa internet; Ang Tor ay naka-standby mode...</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="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="send_email">Send Email</string>
+    <string name="save">I-save</string>
+  <string name="name">Name</string>
+</resources>
diff --git a/app-mini/src/main/res/values-tr/poestrings.xml b/app-mini/src/main/res/values-tr/poestrings.xml
new file mode 100644
index 00000000..2051efcc
--- /dev/null
+++ b/app-mini/src/main/res/values-tr/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">Bazen Tor ağına bağlanmak için bir köprü kullanmanız gerekir.</string>
+    <string name="action_more">AYRINTILI BİLGİ ALIN</string>
+
+    <string name="vpn_setup">İç VPN desteği ile istediğiniz her uygulamanın Tor kullanmasını sağlayabilirsiniz.</string>
+    <string name="vpn_setup_sub">Bu özellik isimsiz gizlilik sağlamaz ancak güvenlik duvarlarının aşılmasını sağlar.</string>
+    <string name="action_vpn_choose">UYGULAMALARI SEÇİN</string>
+
+    <string name="hello">Merhaba</string>
+    <string name="welcome">Mobil Tor uygulamasına hoş geldiniz</string>
+
+    <string name="browser_the_internet">İnternet üzerinde olması gerektiği gibi gezebilirsiniz.</string>
+    <string name="no_tracking">İzleme yok, Engelleme yok.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-tr/strings.xml b/app-mini/src/main/res/values-tr/strings.xml
new file mode 100644
index 00000000..e100a10b
--- /dev/null
+++ b/app-mini/src/main/res/values-tr/strings.xml
@@ -0,0 +1,206 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="app_description">Orbot başka uygulamaların İnterneti daha güvenli olarak kullanmasını sağlayan ücretsiz bir vekil sunucu uygulamasıdır. Orbot Tor yazılımını kullanarak İnternet trafiğinizi şifreler ve dünya üzerindeki pek çok farklı bilgisayardan geçirerek gizler. Tor kişisel özgürlüğünüze, kişisel bilgilerinize, gizli ticari işlemlerinize ve ilişkilerinize karşı tehdit oluşturan ve devlet güvenliği olarak bilinen ağ izlemelerine karşı koruma sağlayan bir özgür yazılım ve açık ağ yazılımıdır.</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 istemcisi başlatılıyor...</string>
+  <string name="tor_process_complete">tamamlandı.</string>
+  <string name="menu_settings">Ayarlar</string>
+  <string name="menu_log">Günlük</string>
+  <string name="menu_start">Başlat</string>
+  <string name="menu_stop">Durdur</string>
+  <string name="menu_about">Hakkında</string>
+  <string name="main_layout_download">İndir</string>
+  <string name="main_layout_upload">Yükle</string>
+  <string name="button_about">Hakkında</string>
+  <string name="menu_exit">Çıkış</string>
+  <string name="menu_scan">QR kodu tara</string>
+  <string name="menu_share_bridge">QR kodu paylaş</string>
+  <string name="btn_okay">Tamam</string>
+  <string name="btn_cancel">İptal</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">Bazı Orbot Ayrıntıları</string>
+  <string name="wizard_details_msg">Orbot; Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent ve Polipo yapılarını kapsayan açık kaynaklı bir uygulamadır. Tor ağına bağlanmak için bir yerel HTTP vekil sunucu (8118) ve bir SOCKS vekil sunucu (9050) sağlar. Orbot ayrıca, rootlanmış aygıtlarda tüm İnternet trafiğini Tor üzerinden gönderebilir.</string>
+  <!--END Welcome Wizard strings (DJH)-->
+  <string name="pref_general_group">Genel</string>
+  <string name="pref_start_boot_title">Orbot Açılışta Başlatılsın</string>
+  <string name="pref_start_boot_summary">Android aygıtınızı açtığınızda Orbot otomatik olarak başlatılarak Tor ağına bağlanılır.</string>
+  <!--New Wizard Strings-->
+  <!--Title Screen-->
+  <!--Warning screen-->
+  <!--Permissions screen-->
+  <!--TipsAndTricks screen-->
+  <!--Transparent Proxy screen-->
+  <string name="pref_node_configuration">Düğüm Ayarları</string>
+  <string name="pref_node_configuration_summary">Bu gelişmiş ayarlar bağlantınızın isimsizliğini azaltabilir</string>
+  <string name="pref_entrance_node">Giriş Düğümleri</string>
+  <string name="pref_entrance_node_summary">İlk sıçrama noktası için parmak izleri, kısaltmalar, ülkeler ve adresler</string>
+  <string name="pref_entrance_node_dialog">Giriş Düğümlerini Yazın</string>
+  <string name="pref_allow_background_starts_title">Art Alanda Başlatılabilsin</string>
+  <string name="pref_allow_background_starts_summary">Herhangi bir uygulamanın Orbot aracılığıyla Tor ve ilgili hizmetleri başlatmasını sağlar</string>
+  <string name="pref_proxy_title">Giden Ağ Sunucusu (İsteğe Bağlı)</string>
+  <string name="pref_proxy_type_title">Giden Vekil Sunucu Türü</string>
+  <string name="pref_proxy_type_summary">Vekil sunucuda kullanılacak ağ iletişim kuralları: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Vekil Sunucu Türünü Yazın</string>
+  <string name="pref_proxy_host_title">Giden Vekil Sunucusu</string>
+  <string name="pref_proxy_host_summary">Vekil Sunucusunun Adı</string>
+  <string name="pref_proxy_host_dialog">Vekil Sunucusunu Yazın</string>
+  <string name="pref_proxy_port_title">Giden Vekil Sunucu Kapı Numarası</string>
+  <string name="pref_proxy_port_summary">Vekil Sunucu Kapı Numarası</string>
+  <string name="pref_proxy_port_dialog">Vekil sunucu kapı numarasını yazın</string>
+  <string name="pref_proxy_username_title">Giden Vekil Sunucusu Kullanıcı Adı</string>
+  <string name="pref_proxy_username_summary">Vekil Sunucu Kullanıcı Adı (İsteğe Bağlı)</string>
+  <string name="pref_proxy_username_dialog">Vekil Sunucu Kullanıcı Adını Yazın</string>
+  <string name="pref_proxy_password_title">Giden Vekil Sunucu Parolası</string>
+  <string name="pref_proxy_password_summary">Vekil Sunucu Parolası (İsteğe Bağlı)</string>
+  <string name="pref_proxy_password_dialog">Vekil Sunucu Parolasını Yazın</string>
+  <string name="couldn_t_start_tor_process_">Tor işlemi başlatılamadı:</string>
+  <string name="error">Hata</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">ErişilebilirAdresler ayarlarınız bir soruna yol açtı!</string>
+  <string name="your_relay_settings_caused_an_exception_">Aktarıcı ayarlarınız bir soruna yol açtı!</string>
+  <string name="exit_nodes">Çıkış Düğümleri</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Son sıçrama noktası için parmak izleri, kısaltmalar, ülkeler ve adresler</string>
+  <string name="enter_exit_nodes">Çıkış Düğümlerini Yazın</string>
+  <string name="exclude_nodes">Katılmayacak Düğümler</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Katılmayacak parmak izleri, kısaltmalar, ülkeler ve adresler</string>
+  <string name="enter_exclude_nodes">Katılmayacak Düğümleri Yazın</string>
+  <string name="strict_nodes">Değişmeyen Düğümler</string>
+  <string name="use_only_these_specified_nodes">*Yalnız* bu düğümler kullanılsın</string>
+  <string name="bridges">Köprüler</string>
+  <string name="use_bridges">Köprüler Kullanılsın</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Alternatif Tor ağı girişleri kullanılabilsin</string>
+  <string name="ip_address_and_port_of_bridges">Köprülerin IP adresleri ve kapı numaraları</string>
+  <string name="enter_bridge_addresses">Köprü Adreslerini Yazın</string>
+  <string name="relays">Aktarıcılar</string>
+  <string name="relaying">Aktarım</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Aygıtınız çıkış yapmayan bir aktarıcı olarak kullanılsın</string>
+  <string name="relay_port">Aktarıcı Kapı Numarası</string>
+  <string name="listening_port_for_your_tor_relay">Tor aktarıcınızın dinleme kapı numarası</string>
+  <string name="enter_or_port">OR kapı numarasını yazın</string>
+  <string name="relay_nickname">Aktarıcı kısaltması</string>
+  <string name="the_nickname_for_your_tor_relay">Tor aktarıcınızın kısaltması</string>
+  <string name="enter_a_custom_relay_nickname">Özel bir aktarıcı kısaltması yazın</string>
+  <string name="reachable_addresses">Erişilebilecek Adresler</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Güvenlik duvarı ilkeleri ile kısıtlanmış bir istemci olarak bağlansın</string>
+  <string name="reachable_ports">Ulaşılabilir kapı numaraları</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Kısıtlanmış bir güvenlik duvarından erişilebilir kapı numaraları</string>
+  <string name="enter_ports">Kapı numaralarını yazın</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">hata ayıklama günlüğü etkinleştirilsin (görüntülemek için adb ya da 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="third_party_software">Üçüncü Taraf 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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">Bir uygulama Tor ağına %1$s gizli sunucu kapısını açmak istiyor. Uygulamaya güveniyorsanız bu işlem güvenlidir.</string>
+  <string name="found_existing_tor_process">varolan bir Tor işlemi bulundu...</string>
+  <string name="something_bad_happened">Bir şeyler ters gitti. Günlük kayıtlarına bakın</string>
+  <string name="unable_to_read_hidden_service_name">gizli hizmet adı okunamadı</string>
+  <string name="unable_to_start_tor">Tor başlatılamadı:</string>
+  <string name="pref_use_persistent_notifications">Orbot bağlı olduğu sürece simge araç çubuğunda görüntülensin</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 adresi ile ilgili ayrıntılı bildirim görüntülensin</string>
+  <string name="pref_use_expanded_notifications_title">Ayrıntılı Bildirimler</string>
+  <string name="set_locale_title">Dil</string>
+  <string name="no_internet_connection_tor">İnternet bağlantısı yok; Tor hazırda bekliyor...</string>
+  <string name="pref_disable_network_title">Bağlantı Olmadığında Otomatik Uyku</string>
+  <string name="pref_disable_network_summary">İnternet bağlantısı olmadığında Tor uyku kipine geçsin</string>
+  <string name="newnym">Yeni bir Tor kimliğine geçiş yaptınız!</string>
+    <string name="no_network_connectivity_putting_tor_to_sleep_">Herhangi bir ağ bağlantısı yok. Tor uyutuluyor...</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üncelleniyor</string>
+  <string name="pref_socks_title">Tor SOCKS</string>
+  <string name="pref_socks_summary">Tor SOCKS vekil sunucusu için kullanılacak kapı numarası (Varsayılan 9050, devre dışı bırakmak için 0)</string>
+  <string name="pref_socks_dialog">SOCKS Kapı Numarası Ayarı</string>
+  <string name="pref_transport_title">Tor Aktarım Vekil Sunucusu Kapı Numarası</string>
+  <string name="pref_transport_summary">Tor saydam vekil sunucusu için kullanılacak kapı numarası (Varsayılan 9040 ya da devre dışı bırakmak için 0)</string>
+  <string name="pref_transport_dialog">Aktarım Vekil Sunucusu Kapı Numarası Ayarı</string>
+  <string name="pref_dnsport_title">Tor DNS Kapı Numarası</string>
+  <string name="pref_dnsport_summary">Tor DNS hizmeti için kullanılacak kapı numarası (Varsayılan 5400 ya da devre dışı bırakmak için 0)</string>
+  <string name="pref_dnsport_dialog">DNS Kapı Numarası Ayarı</string>
+  <string name="pref_torrc_title">Özel Torrc Ayarları</string>
+  <string name="pref_torrc_summary">UZMANLAR İÇİN: torrc ayar satırlarını doğrudan yazın</string>
+  <string name="pref_torrc_dialog">Özel Torrc Ayarları</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 Orbot uygulamasını yeniden başlatın</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_">Tor kullanımı mobil ağınızda etkin olarak engelleniyorsa, Tor ağına erişmek için bir \'Köprü Sunucusu\' kullanabilirsiniz. Yapılandırmak ve denemek için aşağıdaki seçeneklerden birini seçin...</string>
+  <string name="bridge_mode">Köprü Kipi</string>
+  <string name="get_bridges_email">E-posta</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">Etkinleştir</string>
+  <string name="apps_mode">VPN Kipi</string>
+  <string name="send_email">E-posta Gönder</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öprü adresini e-posta, web ya da QR kodu ile edinebilirsiniz. Köprü adresini istemek için aşağıdan \'E-posta\' ya da \'Web\' seçeneğini seçin. \n\nAdresi edindikten sonra kopyalayıp Orbot ayarlarındaki \"Köprüler\" alanına kopyalayın ve Orbot uygulamasını yeniden başlatın.</string>
+    <string name="vpn_default_world">Genel (Otomatik)</string>
+  <string name="hidden_services">Gizli Hizmetler</string>
+  <string name="title_activity_hidden_services">Gizli Hizmetler</string>
+  <string name="menu_hidden_services">Gizli Hizmetler</string>
+  <string name="save">Kaydet</string>
+  <string name="local_port">Yerel Kapı</string>
+  <string name="onion_port">Onion Kapısı</string>
+  <string name="name">Ad</string>
+  <string name="done">Tamam!</string>
+  <string name="invalid_port">Kapı Geçersiz</string>
+  <string name="copy_address_to_clipboard">Adresi panoya kopyala</string>
+  <string name="show_auth_cookie">Kimlik doğrulama çerezini görüntüle</string>
+  <string name="backup_service">Hizmeti Yedekle</string>
+  <string name="delete_service">Hizmeti Sil</string>
+  <string name="backup_saved_at_external_storage">Yedek dış depolamaya kaydedildi</string>
+  <string name="backup_restored">Yedek geri yüklendi</string>
+  <string name="filemanager_not_available">Dosya tarayıcı kullanılamıyor</string>
+  <string name="please_grant_permissions_for_external_storage">Lütfen dış depolama için izinleri verin</string>
+  <string name="restore_backup">Yedeği Geri Yükle</string>
+  <string name="create_a_backup_first">Önce bir yedek oluşturun</string>
+  <string name="name_can_t_be_empty">Ad boş bırakılamaz</string>
+  <string name="fields_can_t_be_empty">Alanlar boş bırakılamaz</string>
+  <string name="start_tor_again_for_finish_the_process">İşlemi tamamlamak için Tor uygulamasını yeniden başlatın</string>
+  <string name="confirm_service_deletion">Hizmeti Silmeyi Onayla</string>
+  <string name="click_again_for_backup">Yedeklemek için yeniden tıklayın</string>
+  <string name="service_type">Hizmet Türü</string>
+  <string name="auth_cookie">Kimlik Doğrulama Çerezi</string>
+  <string name="copy_cookie_to_clipboard">Çerezi panoya kopyala</string>
+  <string name="auth_cookie_was_not_configured">Kimlik doğrulama çerezi yapılandırılmamış</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Değişiklikleri etkinleştirmek için Orbot uygulamasını yeniden başlatın</string>
+  <string name="client_cookies">İstemci çerezleri</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">.onion adresi geçersiz</string>
+  <string name="cookie_from_QR">QR kodundan oku</string>
+  <string name="backup_cookie">Çerezi yedekle</string>
+  <string name="delete_cookie">Çerezi sil</string>
+  <string name="confirm_cookie_deletion">Çerezi silmeyi onayla</string>
+  <string name="hosted_services">Barındırılan Hizmetler</string>
+  <string name="share_as_qr">QR Olarak Paylaş</string>
+  <string name="disable">Devre Dışı Bırak</string>
+  <string name="enable">Etkinleştir</string>
+  <string name="consider_disable_battery_optimizations">Pil kullanımı iyileştirmelerini devre dışı bırakmayı düşünün</string>
+  <string name="consider_enable_battery_optimizations">Pil kullanımı iyileştirmelerini etkinleştirmeyi düşünün</string>
+  <string name="pref_isolate_dest">Hedef adresleri yalıtılsın</string>
+  <string name="pref_isolate_dest_summary">Her ehdef adresi için farklı devre kullanılır</string>
+  <string name="no_transproxy_warning_short">Uyarı: Saydam vekil sunucu özelliği artık desteklenmiyor</string>
+  <string name="no_transproxy_warning">Uyarı: Saydam vekil sunucu özelliği artık desteklenmiyor. Onun yerine Orbot uygulamasının VPN özelliğini kullanın.</string>
+  <string name="pref_connection_padding">Bağlantı yastıklama</string>
+  <string name="pref_connection_padding_summary">Bazı trafik inceleme yöntemlerine karşı korunmayı sağlamak için her zaman bağlantı yastıklaması kullanılır. Varsayılan değer: Otomatik.</string>
+  <string name="pref_reduced_connection_padding">Azaltılmış bağlantı yastıklaması</string>
+  <string name="pref_reduced_connection_padding_summary">Aktarıcı bağlantılarını daha kısa sürede kapatır ve veri ve pil kullanımını azaltmak için daha az yastıklama paketi gönderir.</string>
+  <string name="app_shortcuts">Tor Kullanan Uygulamalar</string>
+  <string name="testing_bridges">Tor köprü bağlantısı sınanıyor...</string>
+  <string name="testing_bridges_success">Tamamdır, köprü yapılandırması çalışıyor.</string>
+  <string name="testing_bridges_fail">Sorun var. Diğer seçenekleri deneyin</string>
+  <string name="bridge_direct_connect">Doğrudan Tor ağına bağlanılsın (en iyisi)</string>
+  <string name="bridge_community">Topluluk sunucuları üzerinden bağlanılsın</string>
+  <string name="bridge_cloud">Bulut sunucular üzerinden bağlanılsın</string>
+  <string name="bridges_get_new">Yeni Köprüler İsteyin... (hiçbir seçenek bağlanamıyorsa)</string>
+  <string name="trouble_connecting">Bağlanmakta sorun mu yaşıyorsunuz?</string>
+  <string name="full_device_vpn">Aygıt Geneli VPN</string>
+  <string name="vpn_disabled">VPN Devre Dışı</string>
+</resources>
diff --git a/app-mini/src/main/res/values-uk/poestrings.xml b/app-mini/src/main/res/values-uk/poestrings.xml
new file mode 100644
index 00000000..c4b4ba6b
--- /dev/null
+++ b/app-mini/src/main/res/values-uk/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">Іноді вам потрібен міст, щоб під\'єднатися до Tor.</string>
+    <string name="action_more">РОЗКАЖИ МЕНІ БІЛЬШЕ</string>
+
+    <string name="vpn_setup">Ви можете дозволити будь-якій програмці працювати через Tor за допомогою нашої вбудованої VPN.</string>
+    <string name="vpn_setup_sub">Це не зробить вас анонімним, але допоможе пройти через фаєрволи.</string>
+    <string name="action_vpn_choose">ОБЕРІТЬ ПРОГРАМИ</string>
+
+    <string name="hello">Привіт!</string>
+    <string name="welcome">Ласкаво просимо до Tor на мобільних пристроях.</string>
+
+    <string name="browser_the_internet">Переглядайте інтернет так як уважаєте за потрібне.</string>
+    <string name="no_tracking">Без відстеження. Без цензури.</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-uk/strings.xml b/app-mini/src/main/res/values-uk/strings.xml
new file mode 100644
index 00000000..a103899a
--- /dev/null
+++ b/app-mini/src/main/res/values-uk/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 — це вільна програма для проксі-з\'єднань, яка дозволяє іншим додаткам безпечніше використовувати інтернет-з\'єднання. Orbot використовує Tor для шифрування інтернет-трафіку, який далі приховується під час пересилання через кілька комп\'ютерів у різних частинах планети. 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">Сервіси Тор деактивовані</string>
+  <string name="tor_process_starting">Запускається клієнт Tor...</string>
+  <string name="tor_process_complete">завершено.</string>
+    <string name="menu_settings">Налаштування</string>
+  <string name="menu_log">Журнал</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_about">Про програму</string>
+    <string name="menu_exit">Вихід</string>
+  <string name="menu_scan">Сканувати BridgeQR</string>
+  <string name="menu_share_bridge">Поділитися BridgeQR</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, Obfs4Proxy, BadVPN Tun2Socks, LibEvent і Polipo. Він забезпечує локальний HTTP-проксі (8118) та проксі SOCKS (9050) у мережу Tor. Orbot також має здатність, на кореневому пристрої, відправляти весь інтернет-трафік через Tor.</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="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="couldn_t_start_tor_process_">Неможливо запустити Tor: </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="enable_alternate_entrance_nodes_into_the_tor_network">Увімкніть альтернативні входи у мережу Tor</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_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="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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">Програма хоче відкрити прихований серверний порт %1$s у мережу Tor. Це безпечно, якщо ви довіряєте застосунку.</string>
+  <string name="found_existing_tor_process">знайдено існуючий процес Tor...</string>
+  <string name="something_bad_happened">Виникла якась помилка. Перевірте лог</string>
+    <string name="unable_to_read_hidden_service_name">неможливо прочитати ім\'я прихованої служби</string>
+  <string name="unable_to_start_tor">Неможливо запустити 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="set_locale_title">Мова</string>
+    <string name="no_internet_connection_tor">Немає інтернет-з\'єднання; Tor в режимі очікування…</string>
+    <string name="pref_disable_network_title">Не використовувати режим сну</string>
+  <string name="pref_disable_network_summary">Переводити в режим сну при відсутності інтернет-з\'єднання</string>
+  <string name="newnym">Ви перемкнулись на новий ідентифікатор Tor!</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="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, ви можете використовувати \'Bridge Server\' як альтернативний спосіб входу. ВИБЕРИ один із параметрів для налаштування та тестування...</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="apps_mode">VPN Спосіб</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="vpn_default_world">Глобальний (автоматичний)</string>
+  <string name="hidden_services">Приховані Послуги</string>
+  <string name="title_activity_hidden_services">Приховані Послуги</string>
+  <string name="menu_hidden_services">Приховані Послуги</string>
+  <string name="save">Зберегти</string>
+    <string name="local_port">Місцевий Порт</string>
+  <string name="onion_port">Порт Onion</string>
+  <string name="name">Ім\'я</string>
+  <string name="done">Зроблено!</string>
+  <string name="invalid_port">Неробочий Порт</string>
+  <string name="copy_address_to_clipboard">Скопіювати адресу в буфер обміну</string>
+  <string name="show_auth_cookie">Показати авторизацію реп\'яшків</string>
+  <string name="backup_service">Резервне копіювання</string>
+  <string name="delete_service">Вилучити Сервіс</string>
+  <string name="backup_saved_at_external_storage">Резервна копія збережена на зовнішній пам\'яті</string>
+  <string name="backup_restored">Резервне копіювання відновлено</string>
+  <string name="filemanager_not_available">Менеджер файлів недоступний</string>
+  <string name="please_grant_permissions_for_external_storage">Надайте дозволи на зовнішню пам\'ять</string>
+    <string name="restore_backup">Відновити резервну копію</string>
+  <string name="create_a_backup_first">Спершу створити резервну копію</string>
+  <string name="name_can_t_be_empty">Назва не може бути порожньою</string>
+  <string name="fields_can_t_be_empty">Поля не можуть бути порожніми</string>
+  <string name="start_tor_again_for_finish_the_process">Запустіть Tor знову для завершення процесу</string>
+  <string name="confirm_service_deletion">Підтвердьте видалення сервісу</string>
+  <string name="click_again_for_backup">Ще раз натисніть щоби копіювати в резерв</string>
+  <string name="service_type">Тип сервісу</string>
+  <string name="auth_cookie">Авторизація реп\'яшків </string>
+  <string name="copy_cookie_to_clipboard">Копіювати реп\'яшки в буфер обміну</string>
+  <string name="auth_cookie_was_not_configured">Авторизація реп\'яшків не налаштована</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Будь ласка, перезапустіть Orbot, щоб зміни ввійшли в силу</string>
+  <string name="client_cookies">Клієнтські реп\'яшки</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">Недійсна .onion адреса</string>
+  <string name="cookie_from_QR">Зчитати з QR-коду</string>
+  <string name="backup_cookie">Резервне копіювання реп\'яшків</string>
+  <string name="delete_cookie">Вилучити реп\'яшки</string>
+  <string name="confirm_cookie_deletion">Підтвердити вилучення реп\'яшків</string>
+  <string name="hosted_services">Розміщені Сервіси</string>
+  <string name="share_as_qr">Поділитися у виді QR-коду</string>
+  <string name="disable">Вимкнути</string>
+  <string name="enable">Увімкнути</string>
+  <string name="consider_disable_battery_optimizations">Розглянути вимкнення оптимізації акумулятора</string>
+  <string name="consider_enable_battery_optimizations">Розглянути увімкнення оптимізації акумулятора</string>
+  <string name="pref_isolate_dest">Ізолювати адреси призначення</string>
+  <string name="pref_isolate_dest_summary">Використати інакшу схему для кожної адреси призначення</string>
+  <string name="no_transproxy_warning_short">ПОПЕРЕДЖЕННЯ: Транспроксінг більше не підтримується</string>
+  <string name="no_transproxy_warning">ПОПЕРЕДЖЕННЯ. Прозорий проксинг не підтримується. Замість цього використовуйте Orbot Apps VPN.</string>
+  <string name="pref_connection_padding_summary">Завжди забезпечує заповнення підключення для захисту від деяких форм аналізу трафіку. За замовчуванням: автоматично</string>
+    <string name="app_shortcuts">Застосунки, що працюють з Tor</string>
+    <string name="testing_bridges">Тестування моста з\'єднання з Tor....</string>
+  <string name="testing_bridges_success">Успішно. Конфігурація мосту хороша!</string>
+  <string name="testing_bridges_fail">НЕ ВДАЛОСЯ. Спробуйте інакший варіант</string>
+  <string name="bridge_direct_connect">Під\'єднання безпосередньо до Tor (Найкраще)</string>
+  <string name="bridge_community">Під\'єднання через сервери спільноти</string>
+  <string name="bridge_cloud">Під\'єднання через хмарні сервери</string>
+  <string name="bridges_get_new">Запит нових мостів... (Якщо все інше не вдається)</string>
+  <string name="trouble_connecting">Проблеми з під\'єднанням?</string>
+  <string name="full_device_vpn">Цілком VPN-пристрій</string>
+  <string name="vpn_disabled">VPN Вимкнена</string>
+</resources>
diff --git a/app-mini/src/main/res/values-ur/strings.xml b/app-mini/src/main/res/values-ur/strings.xml
new file mode 100644
index 00000000..17c15bd2
--- /dev/null
+++ b/app-mini/src/main/res/values-ur/strings.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">آربوٹ</string>
+  <string name="app_description">آربوٹ ایک مفت پراکسی ایپ ھے جو کہ دوسری ایپس کو زیادہ محفوظ طریقے سے انٹرنیٹ استعمال کرنے کا حق دیتی ھے.آرباٹ آپ کے انٹرنیٹ ٹریفک کو ینکریپٹ کرنے کیلئے ٹار کا استعمال کرتی ھے اور اسے پوری دنیا کے کمپیوٹرز کی سیریز میں سے اچھالتے ہوے دوسروں سے محفوظ رکھتی ھے.ٹار ایک مفت سافٹویر اور ایک آزاد مصدر نیٹ ورک ھے جو کہ آپ کو ایک طرح کی نیٹ ورک کی نگرانی سے بچاؤ کیلئے مدد دیتا ھے جس سےکہ ذاتی آزادی, نجی معلومات, رازدارانہ کاروباری سرگرمیاں, رشتہ داری اور ریاستی سلامتی جو کہ نیٹورک ٹریفک کا تجزیہ کہلاتا ھے,کو نقصان پہنچ سکتا ھے.</string>
+    <string name="menu_start">شروع کرئیں</string>
+  <string name="menu_about">کے بارے میں</string>
+    <string name="button_about">کے بارے میں</string>
+    <string name="btn_cancel">تنسیخ کیجیے</string>
+  <!--Welcome Wizard strings (DJH)-->
+    <!--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="error">غلطی</string>
+    <string name="set_locale_title">زبان</string>
+  <string name="save">محفوظ کریں</string>
+  <string name="name">Name</string>
+</resources>
diff --git a/app-mini/src/main/res/values-uz/strings.xml b/app-mini/src/main/res/values-uz/strings.xml
new file mode 100644
index 00000000..470ee983
--- /dev/null
+++ b/app-mini/src/main/res/values-uz/strings.xml
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+    <string name="status_starting_up">Orbot ishga tushirilmoqda…</string>
+  <string name="status_activated">Tor tarmog\'iga ulangan</string>
+    <string name="menu_settings">Moslamalar</string>
+    <string name="menu_stop">To‘xtatish</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_about">Dasur haqida</string>
+    <string name="menu_exit">Chiqish</string>
+    <string name="btn_cancel">Bekor qilish</string>
+  <!--Welcome Wizard strings (DJH)-->
+    <!--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="error">Xato</string>
+    <string name="found_existing_tor_process">Mavjud bo\'lgan Tor jarayoni topildi...</string>
+    <string name="set_locale_title">Til</string>
+    <string name="get_bridges_email">E-pochta manzili</string>
+  <string name="send_email">Email jo\'natish</string>
+    <string name="save">Saqlash</string>
+  <string name="name">Ism</string>
+</resources>
diff --git a/app-mini/src/main/res/values-v21/styles.xml b/app-mini/src/main/res/values-v21/styles.xml
new file mode 100644
index 00000000..7abc06d3
--- /dev/null
+++ b/app-mini/src/main/res/values-v21/styles.xml
@@ -0,0 +1 @@
+<resources></resources>
diff --git a/app-mini/src/main/res/values-vi/strings.xml b/app-mini/src/main/res/values-vi/strings.xml
new file mode 100644
index 00000000..d6945b59
--- /dev/null
+++ b/app-mini/src/main/res/values-vi/strings.xml
@@ -0,0 +1,142 @@
+<?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="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="menu_settings">Thiết lập</string>
+  <string name="menu_log">Nhật ký</string>
+    <string name="menu_start">Bắt đầu</string>
+  <string name="menu_stop">Ngừng</string>
+  <string name="menu_about">Về</string>
+    <string name="main_layout_download">Tải về</string>
+  <string name="main_layout_upload">Tải lên</string>
+    <string name="button_about">Giới thiệu</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="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>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="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="couldn_t_start_tor_process_">Không thể khởi động tiến trình Tor:</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="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_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="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="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="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="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="set_locale_title">Ngôn ngữ</string>
+    <string name="no_internet_connection_tor">Không có kết nối Internet; Tor đang ở chế độ chờ...</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="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="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="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="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="save">Lưu</string>
+  <string name="name">Tên</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">Vui lòng khởi động lại Orbot để áp dụng thay đổi</string>
+  <string name="disable">Tắt</string>
+  <string name="enable">Cho phép</string>
+</resources>
diff --git a/app-mini/src/main/res/values-w820dp/dimens.xml b/app-mini/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 00000000..63fc8164
--- /dev/null
+++ b/app-mini/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/app-mini/src/main/res/values-zh-rCN/strings.xml b/app-mini/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000..33fb0153
--- /dev/null
+++ b/app-mini/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,142 @@
+<?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="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="menu_settings">设置</string>
+  <string name="menu_log">日志</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_about">关于</string>
+    <string name="menu_exit">退出</string>
+  <string name="menu_scan">扫描网桥QR码</string>
+  <string name="menu_share_bridge">分享网桥QR码</string>
+    <string name="btn_okay">确定</string>
+  <string name="btn_cancel">取消</string>
+  <!--Welcome Wizard strings (DJH)-->
+  <string name="wizard_details">更多 Orbot 信息</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="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="couldn_t_start_tor_process_">无法启动 Tor 进程:</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="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_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="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="found_existing_tor_process">发现当前已存在 Tor 进程...</string>
+  <string name="something_bad_happened">发生错误,请检查日志</string>
+    <string name="unable_to_read_hidden_service_name">无法读取隐藏服务名称</string>
+  <string name="unable_to_start_tor">无法启动 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="set_locale_title">语言</string>
+    <string name="no_internet_connection_tor">没有互联网连接;Tor 处于待机状态…</string>
+    <string name="pref_disable_network_title">无网络自动休眠</string>
+  <string name="pref_disable_network_summary">没有网络连接时,暂时停用 Tor</string>
+  <string name="newnym">已切换为新的 Tor 标识!</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="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="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码来获取网桥地址。点击下方的“电子邮件”或“网页”按钮来获取网桥地址。
+当您获取到网桥地址后,请将其复制并粘贴到Orbot设置中的“网桥”一项并重新启动</string>
+    <string name="save">保存</string>
+  <string name="name">名称</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">请重启 Orbot 以使变更生效</string>
+</resources>
diff --git a/app-mini/src/main/res/values-zh-rTW/poestrings.xml b/app-mini/src/main/res/values-zh-rTW/poestrings.xml
new file mode 100644
index 00000000..9c6d07da
--- /dev/null
+++ b/app-mini/src/main/res/values-zh-rTW/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">有時需要透過橋接器來取得 Tor</string>
+    <string name="action_more">進一步說明</string>
+
+    <string name="vpn_setup">可利用內建的 VPN 啟動應用程式走 Tor 網路</string>
+    <string name="vpn_setup_sub">它無法讓用戶匿名,但有助於通過防火牆</string>
+    <string name="action_vpn_choose">選擇應用</string>
+
+    <string name="hello">哈囉</string>
+    <string name="welcome">歡迎使用手機上的 Tor</string>
+
+    <string name="browser_the_internet">如你所願地自由瀏覽網際網路</string>
+    <string name="no_tracking">無追踪,無審查</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values-zh-rTW/strings.xml b/app-mini/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 00000000..7d39bccf
--- /dev/null
+++ b/app-mini/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,207 @@
+<?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="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="menu_settings">設定</string>
+  <string name="menu_log">記錄檔</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_about">關於</string>
+    <string name="menu_exit">離開</string>
+  <string name="menu_scan">掃描網橋 QR 碼</string>
+  <string name="menu_share_bridge">分享網橋 QR 碼</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, Obfs4Proxy, BadVPN Tun2Socks, LibEvent 與 Polipo.它提供了本地的 HTTP 代理 (8118) 與 SOCKS 代理 (9050) 到 Tor 網路中. Orbot 也有能力可在取得最高權限的設備上來利用 Tor 傳送互聯網流量</string>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="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="couldn_t_start_tor_process_">無法啟動 Tor 程序</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">使用網橋</string>
+    <string name="enable_alternate_entrance_nodes_into_the_tor_network">啟動替代的入口來進入 Tor 網路</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">啟用您的裝置成為 Tor 網路的中繼節點(非出口節點)</string>
+  <string name="relay_port">中繼連接埠</string>
+  <string name="listening_port_for_your_tor_relay">您的 Tor 中繼功能連接埠</string>
+  <string name="enter_or_port">連接埠</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_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="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="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string>
+  <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string>
+  <string name="hidden_service_request">有一個應用要開啟隱藏的伺服器端口 %1$s 到 Tor 網路,如果信得過此應用才進行此操作</string>
+  <string name="found_existing_tor_process">發現已有 Tor 程序運行中 ...</string>
+  <string name="something_bad_happened">發生錯誤。檢視日誌檔</string>
+    <string name="unable_to_read_hidden_service_name">無法讀取隱藏服務的名稱</string>
+  <string name="unable_to_start_tor">無法啟動 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="set_locale_title">語言</string>
+    <string name="no_internet_connection_tor">沒有網路連線;Tor 待機中 ...</string>
+    <string name="pref_disable_network_title">無網路時自動休眠</string>
+  <string name="pref_disable_network_summary">當沒有網路可用時,讓 Tor 休眠</string>
+  <string name="newnym">您已切換到新的 Tor 身分!</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="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">Email</string>
+  <string name="get_bridges_web">Web</string>
+  <string name="activate">啟用</string>
+  <string name="apps_mode">VPN 模式</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_">您可以透過 email 取得網橋位址,或者在網際網路上搜尋,或者掃描網橋的 QR 碼。在下面選擇 \'Email\' 或者 \'Web\' 來取得網橋位址。\n\n取得網橋位址後,將它複製貼上到「網橋」的設定項中,然後重新啟動 Orbot。</string>
+    <string name="vpn_default_world">全域(自動)</string>
+  <string name="hidden_services">隱藏服務</string>
+  <string name="title_activity_hidden_services">隱藏服務</string>
+  <string name="menu_hidden_services">隱藏服務</string>
+  <string name="save">儲存</string>
+    <string name="local_port">本地端口</string>
+  <string name="onion_port">洋蔥端口</string>
+  <string name="name">名稱</string>
+  <string name="done">已完成!</string>
+  <string name="invalid_port">無效埠</string>
+  <string name="copy_address_to_clipboard">複製地址到剪貼簿</string>
+  <string name="show_auth_cookie">顯示 auth cookie</string>
+  <string name="backup_service">備份服務</string>
+  <string name="delete_service">刪除服務</string>
+  <string name="backup_saved_at_external_storage">備份檔儲存在外部儲存器</string>
+  <string name="backup_restored">備份已還原</string>
+  <string name="filemanager_not_available">檔案管理員不可用</string>
+  <string name="please_grant_permissions_for_external_storage">請授權外接儲存器使用</string>
+    <string name="restore_backup">還原備份</string>
+  <string name="create_a_backup_first">先創立備份</string>
+  <string name="name_can_t_be_empty">名稱不可空白</string>
+  <string name="fields_can_t_be_empty">欄位不可空白</string>
+  <string name="start_tor_again_for_finish_the_process">再次開啟 Tor  以完成此過程</string>
+  <string name="confirm_service_deletion">確認服務刪除</string>
+  <string name="click_again_for_backup">再次點選以進行備份</string>
+  <string name="service_type">服務類型</string>
+  <string name="auth_cookie">Auth cookie</string>
+  <string name="copy_cookie_to_clipboard">複製 Cookie 到剪貼簿</string>
+  <string name="auth_cookie_was_not_configured">Auth cookie 未設定</string>
+  <string name="please_restart_Orbot_to_enable_the_changes">請重新啟動 Orbot 來讓設定生效。</string>
+  <string name="client_cookies">客戶 cookies</string>
+  <string name="onion">.onion</string>
+  <string name="invalid_onion_address">無效的 .onion 地址</string>
+  <string name="cookie_from_QR">由 QR 碼讀取</string>
+  <string name="backup_cookie">備分 cookie</string>
+  <string name="delete_cookie">刪除 cookie</string>
+  <string name="confirm_cookie_deletion">確認刪除  cookie</string>
+  <string name="hosted_services">主機的服務</string>
+  <string name="share_as_qr">利用 QR 碼分享</string>
+  <string name="disable">關閉</string>
+  <string name="enable">啟用</string>
+  <string name="consider_disable_battery_optimizations">考慮取消電池的最適化</string>
+  <string name="consider_enable_battery_optimizations">考慮開啟電池的最適化</string>
+  <string name="pref_isolate_dest">孤立目的地地址</string>
+  <string name="pref_isolate_dest_summary">每個目的地使用不同的電路</string>
+  <string name="no_transproxy_warning_short">警告: 不再支援 Transproxying </string>
+  <string name="no_transproxy_warning">警告: 不支援透明的代理, 請用 Orbot Apps VPN 替代</string>
+  <string name="pref_connection_padding">連接保護</string>
+  <string name="pref_connection_padding_summary">全部啟用連接保護以防止一些流量分析手段
+默認: auto</string>
+  <string name="pref_reduced_connection_padding">減少連接保護</string>
+  <string name="pref_reduced_connection_padding_summary">關閉中繼連接並傳送少數保護封包來減少資料和電池的用量</string>
+    <string name="app_shortcuts">Tor 支持的應用</string>
+    <string name="testing_bridges">測試橋接連線到 Tor</string>
+  <string name="testing_bridges_success">成功,橋接設定良好!</string>
+  <string name="testing_bridges_fail">失敗,嘗試其它選項</string>
+  <string name="bridge_direct_connect">直接連上洋蔥路由網路(最佳)</string>
+  <string name="bridge_community">透過社區伺服器連接</string>
+  <string name="bridge_cloud">透過雲端伺服器連接</string>
+  <string name="bridges_get_new">請求新的橋接... (如果其它都失敗)</string>
+  <string name="trouble_connecting">連線遇上問題?</string>
+  <string name="full_device_vpn">全設備 VPN</string>
+  <string name="vpn_disabled">VPN 關閉</string>
+</resources>
diff --git a/app-mini/src/main/res/values/arrays.xml b/app-mini/src/main/res/values/arrays.xml
new file mode 100644
index 00000000..d5c86e36
--- /dev/null
+++ b/app-mini/src/main/res/values/arrays.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+
+    <string-array name="array_hs_types">
+		<item>@string/user_services</item>
+		<item>@string/app_services</item>
+	</string-array>
+</resources>
diff --git a/app-mini/src/main/res/values/colors.xml b/app-mini/src/main/res/values/colors.xml
new file mode 100644
index 00000000..dcbbcd60
--- /dev/null
+++ b/app-mini/src/main/res/values/colors.xml
@@ -0,0 +1,11 @@
+
+    <resources>
+        <color name="panel_background_main">#efefef</color>
+        <color name="bright_green">#ccff2a</color>
+        <color name="dark_green">#669901</color>
+        <color name="dark_purple">#3f2b4f</color>
+        <color name="light_purple">#E6CCFF</color>
+        <color name="light_green">#E1FFC0</color>
+        <color name="light_gray">#EFEFEF</color>
+
+    </resources>
diff --git a/app-mini/src/main/res/values/dimens.xml b/app-mini/src/main/res/values/dimens.xml
new file mode 100644
index 00000000..c1ac42e8
--- /dev/null
+++ b/app-mini/src/main/res/values/dimens.xml
@@ -0,0 +1,241 @@
+<?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. -->
+    <!-- The height that is used when creating thumbnails of applications. -->
+    <!-- The standard size (both width and height) of an application icon that
+         will be displayed in the app launcher and elsewhere. -->
+    <!-- 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. -->
+    <!-- Height of the status bar -->
+    <!-- Height of the bottom navigation / system bar. -->
+    <!-- Height of the bottom navigation bar in portrait; often the same as @dimen/navigation_bar_height -->
+    <!-- Width of the navigation bar when it is placed vertically on the screen -->
+    <!-- Height of notification icons in the status bar -->
+    <!-- Size of the giant number (unread count) in the notifications -->
+    <!-- Height of the system bar (combined status & navigation); used by
+         SystemUI internally, not respected by the window manager. -->
+    <!-- Height of notification icons in the system bar -->
+    <!-- Margin at the edge of the screen to ignore touch events for in the windowshade. -->
+
+    <!-- Minimum size of the fastscroll overlay -->
+    <!-- Text size of the fastscroll overlay -->
+    <!-- Padding of the fastscroll overlay -->
+    <!-- Width of the fastscroll thumb -->
+    <!-- Height of the fastscroll thumb -->
+    <!-- Min width for a tablet device -->
+
+    <!-- Default height of a key in the password keyboard for alpha (used by keyguard) -->
+    <!-- Default height of a key in the password keyboard for numeric (used by keyguard) -->
+    <!-- Default correction for the space key in the password keyboard  (used by keyguard) -->
+    <!-- Default horizontal gap between keys in the password keyboard (used by keyguard) -->
+    <!-- Default vertical gap between keys in the password keyboard (used by keyguard) -->
+
+    <!-- Size of lockscreen outerring on unsecure unlock LockScreen -->
+
+    <!-- Default target placement radius for GlowPadView. Should be 1/2 of outerring diameter. -->
+
+    <!-- Default glow radius for GlowPadView -->
+
+    <!-- Default distance beyond which GlowPadView snaps to the matching target -->
+
+    <!-- Default distance from each snap target that GlowPadView considers a "hit" -->
+
+    <!-- Preference activity side margins -->
+    <!-- Preference activity side margins negative-->
+    <!-- Preference activity top margin -->
+    <!-- Preference activity bottom margin -->
+    <!-- Preference widget area width (to the left of the text) -->
+    <!-- Preference fragment padding, bottom -->
+    <!-- Preference fragment padding, sides -->
+    <!-- Weight of the left pane in a multi-pane preference layout. -->
+    <!-- Weight of the right pane in a multi-pane preference layout. So the split is 40:60 -->
+    <!-- Padding to the left of the preference panel breadcrumb -->
+    <!-- Padding to the right of the preference panel breadcrumb -->
+    <!-- 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. -->
+    <!-- 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. -->
+
+    <!-- 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.-->
+    <!-- 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.-->
+    <!-- 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.-->
+    <!-- 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.-->
+
+    <!-- Preference activity, vertical padding for the header list -->
+
+    <!-- outsideOverlay -->
+
+    <!-- outsideOverlay -->
+
+    <!-- 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. -->
+
+    <!-- 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. -->
+
+    <!-- Preferred width of the search view. -->
+
+    <!-- Dialog title height -->
+    <!-- Dialog button bar height -->
+
+    <!-- Default height of an action bar. -->
+    <!-- Vertical padding around action bar icons. -->
+    <!-- Text size for action bar titles -->
+    <!-- Text size for action bar subtitles -->
+    <!-- Top margin for action bar subtitles -->
+    <!-- Bottom margin for action bar subtitles -->
+
+    <!-- Size of clock font in LockScreen on Unsecure unlock screen. -->
+
+    <!-- Size of status line font on Unsecure unlock LockScreen. -->
+
+    <!-- Size of right margin on Unsecure unlock LockScreen -->
+
+    <!-- Size of top margin on Clock font to edge on unlock LockScreen -->
+
+    <!-- Size of top margin on Clock font to edge on unlock LockScreen -->
+
+    <!-- Padding on left margin of PIN text entry field to center it when del button is showing -->
+
+    <!-- Height of FaceUnlock view in keyguard -->
+
+    <!-- Minimum popup width for selecting an activity in ActivityChooserDialog/ActivityChooserView. -->
+
+    <!-- The default gap between components in a layout. -->
+
+    <!-- Text padding for dropdown items -->
+
+    <!-- Text padding for dropdown items -->
+
+    <!-- Width of the icon in a dropdown list -->
+
+    <!-- Default width for a textview error popup -->
+
+    <!-- Volume panel y offset -->
+
+    <!-- Default padding to apply to AppWidgetHostViews containing widgets targeting API level 14 and up. -->
+
+    <!-- Minimum width for an action button in the menu area of an action bar -->
+
+    <!-- Maximum height for a stacked tab bar as part of an action bar -->
+
+    <!-- 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. -->
+
+    <!-- Size of notification text (see TextAppearance.StatusBar.EventContent) -->
+    <!-- Size of notification text titles (see TextAppearance.StatusBar.EventContent.Title) -->
+    <!-- Size of smaller notification text (see TextAppearance.StatusBar.EventContent.Line2, Info, Time) -->
+    <dimen name="notification_subtext_size">12dp</dimen>
+
+    <!-- Keyguard dimensions -->
+    <!-- TEMP -->
+
+    <!-- Height of security view in keyguard. -->
+
+    <!-- Width of widget view in keyguard. -->
+
+    <!-- Height of widget view in keyguard. -->
+
+    <!-- Size of the clock font in keyguard's status view -->
+
+    <!-- Size of the date font in keyguard's status view  -->
+
+    <!-- Size of the generic status lines keyguard's status view  -->
+
+    <!-- Size of margin on the right of keyguard's status view -->
+
+    <!-- Top margin for the clock view -->
+
+    <!-- Horizontal gap between keys in PIN and SIM PIN numeric keyboards in keyguard -->
+
+    <!-- Horizontal gap between keys in PIN and SIM PIN numeric keyboards in keyguard -->
+
+    <!-- Horizontal gap between keys in PIN and SIM PIN numeric keyboards in keyguard -->
+
+    <!-- Space reserved at the bottom of secure views (pin/pattern/password/SIM pin/SIM puk) -->
+
+    <!-- The height of the runway lights strip -->
+
+    <!-- The height of the runway lights strip -->
+
+    <!-- Horizontal padding for the widget pager -->
+
+    <!-- Top padding for the widget pager -->
+
+    <!-- Bottom padding for the widget pager -->
+
+    <!-- Top margin for the runway lights. We add a negative margin in large
+        devices to account for the widget pager padding -->
+
+    <!-- Touch slop for the global toggle accessibility gesture -->
+
+    <!-- Width of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
+
+    <!-- Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
+
+    <!-- Margin around the various security views -->
+
+    <!-- Margin around the various security views -->
+
+    <!-- Stroke width of the frame for the circular avatars. -->
+
+    <!-- Shadow radius under the frame for the circular avatars. -->
+
+    <!-- Size of the avator on hte multiuser lockscreen. -->
+
+    <!-- Size of the text under the avator on the multiuser lockscreen. -->
+
+    <!-- Size of the region along the edge of the screen that will accept
+         swipes to scroll the widget area. -->
+
+    <!-- If the height if keyguard drops below this threshold (most likely
+    due to the appearance of the IME), then drop the multiuser selector. -->
+
+    <!-- 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. -->
+
+    <!-- Rounded corner radius for video subtitles. -->
+
+    <!-- Shadow radius for video subtitles. -->
+
+    <!-- Shadow offset for video subtitles. -->
+
+    <!-- Outline width for video subtitles. -->
+
+    <!-- width of ImmersiveModeConfirmation (-1 for match_parent) -->
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="fab_margin">16dp</dimen>
+</resources>
diff --git a/app-mini/src/main/res/values/ic_launcher_background.xml b/app-mini/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 00000000..60983412
--- /dev/null
+++ b/app-mini/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#68B030</color>
+</resources>
\ No newline at end of file
diff --git a/app-mini/src/main/res/values/poestrings.xml b/app-mini/src/main/res/values/poestrings.xml
new file mode 100644
index 00000000..af8d5580
--- /dev/null
+++ b/app-mini/src/main/res/values/poestrings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="bridges_sometimes">"Sometimes you need a bridge to get to Tor."</string>
+    <string name="action_more">"TELL ME MORE"</string>
+
+    <string name="vpn_setup">"You can enable any app to go through Tor using our built-in VPN."</string>
+    <string name="vpn_setup_sub">"This won\'t make you anonymous, but it will help get through firewalls."</string>
+    <string name="action_vpn_choose">"CHOOSE APPS"</string>
+
+    <string name="hello">"Hello"</string>
+    <string name="welcome">"Welcome to Tor on mobile."</string>
+
+    <string name="browser_the_internet">"Browse the internet how you expect you should."</string>
+    <string name="no_tracking">"No tracking. No censorship."</string>
+
+</resources>
diff --git a/app-mini/src/main/res/values/strings.xml b/app-mini/src/main/res/values/strings.xml
new file mode 100644
index 00000000..42bc1674
--- /dev/null
+++ b/app-mini/src/main/res/values/strings.xml
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">orbotmini</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="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="menu_settings">Settings</string>
+    <string name="menu_log">Log</string>
+    <string name="menu_start">Start</string>
+    <string name="menu_stop">Stop</string>
+    <string name="menu_about">About</string>
+    <string name="main_layout_download">Download</string>
+    <string name="main_layout_upload">Upload</string>
+    <string name="button_about">About</string>
+    <string name="menu_exit">Exit</string>
+    <string name="menu_scan">Scan BridgeQR</string>
+    <string name="menu_share_bridge">Share BridgeQR</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, Obfs4Proxy, BadVPN Tun2Socks, 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>
+    <!--END Welcome Wizard strings (DJH)-->
+    <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-->
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <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="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="couldn_t_start_tor_process_">Couldn\'t start Tor process: </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="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrances into the Tor Network</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_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="third_party_software">3rd-Party-Software: </string>
+    <string name="tor_version">Tor: https://www.torproject.org</string>
+    <string name="libevent_version">LibEvent: http://www.monkey.org/~provos/libevent/</string>
+    <string name="polipo_version">Polipo: https://github.com/jech/polipo</string>
+    <string name="obfsproxy_version">Obfs4proxy: https://github.com/Yawning/obfs4</string>
+    <string name="openssl_version">OpenSSL: http://www.openssl.org</string>
+    <string name="hidden_service_request">An app wants to open onion server port %1$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="unable_to_read_hidden_service_name">unable to read onion service name</string>
+    <string name="unable_to_start_tor">Unable to start Tor:</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="set_locale_title">Language</string>
+    <string name="no_internet_connection_tor">No internet connection; Tor is on standby…</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="pref_open_proxy_on_all_interfaces_title">Open Proxy on All Interfaces</string>
+  <string name="pref_open_proxy_on_all_interfaces_summary">Allow Wi-Fi peers, tethered devices and anyone else who can connect to your IP, to access Tor</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_http_title">Tor HTTP</string>
+    <string name="pref_http_summary">Port that Tor offers its HTTP proxy on (default: 8118 or 0 to disable)</string>
+    <string name="pref_http_dialog">HTTP 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="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 Server\' as an alternate way in. SELECT one of the options to configure and test...</string>
+
+    <string name="bridge_mode">Request New Bridge</string>
+
+    <string name="get_bridges_email">Email</string>
+    <string name="get_bridges_web">Web</string>
+
+    <string name="activate">Activate</string>
+
+    <string name="apps_mode">VPN Mode</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 settings and restart.</string>
+
+    <string name="vpn_default_world">Global (Auto)</string>
+    <string name="hidden_services">Onion Services</string>
+    <string name="title_activity_hidden_services">Onion Services</string>
+    <string name="menu_hidden_services">Onion Services</string>
+    <string name="save">Save</string>
+    <string name="local_port">Local Port</string>
+    <string name="onion_port">Onion Port</string>
+    <string name="name">Name</string>
+    <string name="done">Done!</string>
+    <string name="invalid_port">Invalid Port</string>
+    <string name="copy_address_to_clipboard">Copy address to clipboard</string>
+    <string name="show_auth_cookie">Show auth cookie</string>
+    <string name="backup_service">Backup Service</string>
+    <string name="delete_service">Delete Service</string>
+    <string name="backup_saved_at_external_storage">Backup saved at external storage</string>
+    <string name="backup_restored">Backup restored</string>
+    <string name="filemanager_not_available">Filemanager not available</string>
+    <string name="please_grant_permissions_for_external_storage">Please grant permissions for external storage</string>
+    <string name="restore_backup">Restore Backup</string>
+    <string name="create_a_backup_first">Create a backup first</string>
+    <string name="name_can_t_be_empty">Name can\'t be empty</string>
+    <string name="fields_can_t_be_empty">Fields can\'t be empty</string>
+    <string name="start_tor_again_for_finish_the_process">Start Tor again for finish the process</string>
+    <string name="confirm_service_deletion">Confirm service deletion</string>
+    <string name="click_again_for_backup">Click again for backup</string>
+    <string name="service_type">Service type</string>
+    <string name="auth_cookie">Auth cookie</string>
+    <string name="copy_cookie_to_clipboard">Copy cookie to clipboard</string>
+    <string name="auth_cookie_was_not_configured">Auth cookie was not configured</string>
+    <string name="please_restart_Orbot_to_enable_the_changes">Please restart Orbot to enable the changes</string>
+    <string name="client_cookies">Client cookies</string>
+    <string name="onion">.onion</string>
+    <string name="invalid_onion_address">Invalid .onion address</string>
+    <string name="cookie_from_QR">Read from QR</string>
+    <string name="backup_cookie">Backup cookie</string>
+    <string name="delete_cookie">Delete cookie</string>
+    <string name="confirm_cookie_deletion">Confirm cookie deletion</string>
+    <string name="hosted_services">Hosted Services</string>
+    <string name="share_as_qr">Share as QR</string>
+    <string name="disable">Disable</string>
+    <string name="enable">Enable</string>
+    <string name="consider_disable_battery_optimizations">Consider disable battery optimizations</string>
+    <string name="consider_enable_battery_optimizations">Consider enable battery optimizations</string>
+    <string name="pref_isolate_dest">Isolate destination addresses</string>
+    <string name="pref_isolate_dest_summary">Use a different circuit for each destination address</string>
+    <string name="no_transproxy_warning_short">WARNING: Transproxying no longer supported</string>
+    <string name="no_transproxy_warning">WARNING: Transparent proxying not supported. Use Orbot Apps VPN instead.</string>
+    <string name="pref_connection_padding">Connection padding</string>
+    <string name="pref_connection_padding_summary">Always enables connection padding to defend against some forms of traffic analysis. Default: auto</string>
+    <string name="pref_reduced_connection_padding">Reduced connection padding</string>
+    <string name="pref_reduced_connection_padding_summary">Closes relay connections sooner and sends less padding packets to reduce data and battery usage</string>
+    <string name="pref_prefer_ipv6">Prefer IPv6 connections</string>
+    <string name="pref_prefer_ipv6_summary">Tells exits that IPv6 addresses are preferred</string>
+    <string name="pref_disable_ipv4">Disable IPv4 connections</string>
+    <string name="pref_disable_ipv4_summary">Tells exits not to connect to IPv4 addresses</string>
+    <string name="app_shortcuts">Tor-Enabled Apps</string>
+    <string name="testing_bridges">Testing bridge connection to Tor....</string>
+    <string name="testing_bridges_success">Success. Bridge configuration is good!</string>
+    <string name="testing_bridges_fail">FAILED. Try another option</string>
+    <string name="bridge_direct_connect">Connect directly to Tor (Best)</string>
+    <string name="bridge_community">Connect through community servers</string>
+    <string name="bridge_cloud">Connect through cloud servers</string>
+    <string name="bridges_get_new">Request New Bridges... (If all else fails)</string>
+    <string name="trouble_connecting">Trouble connecting?</string>
+    <string name="full_device_vpn">Full Device VPN</string>
+    <string name="vpn_disabled">VPN Disabled</string>
+
+    <string name="menu_new_identity">New Identity</string>
+
+    <string name="user_services">User services</string>
+    <string name="app_services">App services</string>
+    <string name="default_socks_http">SOCKS: - HTTP: -</string>
+    <string name="refresh_apps">Refresh Apps</string>
+</resources>
diff --git a/app-mini/src/main/res/values/styles.xml b/app-mini/src/main/res/values/styles.xml
new file mode 100644
index 00000000..b2e69a53
--- /dev/null
+++ b/app-mini/src/main/res/values/styles.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="DefaultTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <style name="DefaultTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+</resources>
diff --git a/app-mini/src/main/res/values/theme.xml b/app-mini/src/main/res/values/theme.xml
new file mode 100644
index 00000000..a0ba3593
--- /dev/null
+++ b/app-mini/src/main/res/values/theme.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+    <style name="DefaultTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    </style>
+    
+</resources>
+
diff --git a/app-mini/src/main/res/xml/hidden_services_paths.xml b/app-mini/src/main/res/xml/hidden_services_paths.xml
new file mode 100644
index 00000000..073732b6
--- /dev/null
+++ b/app-mini/src/main/res/xml/hidden_services_paths.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <files-path name="hidden-services" path="hidden_services/" />
+</paths>
\ No newline at end of file
diff --git a/app-mini/src/main/res/xml/preferences.xml b/app-mini/src/main/res/xml/preferences.xml
new file mode 100644
index 00000000..bda86acc
--- /dev/null
+++ b/app-mini/src/main/res/xml/preferences.xml
@@ -0,0 +1,301 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory android:title="@string/pref_general_group">
+        <ListPreference
+            android:key="pref_default_locale"
+            android:title="@string/set_locale_title"
+            android:enabled="true"
+            android:selectable="true" />
+
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:enabled="true"
+            android:key="pref_start_boot"
+            android:summary="@string/pref_start_boot_summary"
+            android:title="@string/pref_start_boot_title" />
+
+        <!--
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:enabled="true"
+            android:key="pref_persistent_notifications"
+            android:summary="@string/pref_use_persistent_notifications"
+            android:title="@string/pref_use_persistent_notifications_title" />
+
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:enabled="true"
+            android:key="pref_expanded_notifications"
+            android:summary="@string/pref_use_expanded_notifications"
+            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" />
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="pref_open_proxy_on_all_interfaces"
+            android:summary="@string/pref_open_proxy_on_all_interfaces_summary"
+            android:title="@string/pref_open_proxy_on_all_interfaces_title" />
+
+            -->
+        <!--
+        <ListPreference
+            android:defaultValue="en"
+            android:key="pref_default_locale"
+            android:summary="@string/set_locale_summary"
+            android:title="@string/set_locale_title" />-->
+
+    </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:title="@string/pref_transparent_tethering_title"/>
+
+
+    </PreferenceCategory>
+    -->
+    <PreferenceCategory
+        android:summary="@string/pref_node_configuration_summary"
+        android:title="@string/pref_node_configuration">
+
+        <EditTextPreference
+            android:dialogTitle="@string/pref_entrance_node_dialog"
+            android:key="pref_entrance_nodes"
+            android:summary="@string/pref_entrance_node_summary"
+            android:title="@string/pref_entrance_node" />
+        <EditTextPreference
+            android:dialogTitle="@string/enter_exit_nodes"
+            android:key="pref_exit_nodes"
+            android:summary="@string/fingerprints_nicks_countries_and_addresses_for_the_last_hop"
+            android:title="@string/exit_nodes" />
+        <EditTextPreference
+            android:dialogTitle="@string/enter_exclude_nodes"
+            android:key="pref_exclude_nodes"
+            android:summary="@string/fingerprints_nicks_countries_and_addresses_to_exclude"
+            android:title="@string/exclude_nodes" />
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="pref_strict_nodes"
+            android:summary="@string/use_only_these_specified_nodes"
+            android:title="@string/strict_nodes" />
+
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/bridges">
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="pref_bridges_enabled"
+            android:summary="@string/enable_alternate_entrance_nodes_into_the_tor_network"
+            android:title="@string/use_bridges" />
+
+        <EditTextPreference
+            android:dialogTitle="@string/enter_bridge_addresses"
+            android:inputType="textMultiLine|textNoSuggestions"
+            android:key="pref_bridges_list"
+            android:summary="@string/ip_address_and_port_of_bridges"
+            android:title="@string/bridges" />
+
+    </PreferenceCategory>
+
+    <!--
+    <PreferenceCategory android:title="@string/relays">
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:enabled="true"
+            android:key="pref_or"
+            android:summary="@string/enable_your_device_to_be_a_non_exit_relay"
+            android:title="@string/relaying" />
+
+        <EditTextPreference
+            android:defaultValue="9001"
+            android:dialogTitle="@string/enter_or_port"
+            android:inputType="number"
+            android:key="pref_or_port"
+            android:summary="@string/listening_port_for_your_tor_relay"
+            android:title="@string/relay_port" />
+
+        <EditTextPreference
+            android:defaultValue="OrbotRelay"
+            android:dialogTitle="@string/enter_a_custom_relay_nickname"
+            android:key="pref_or_nickname"
+            android:summary="@string/the_nickname_for_your_tor_relay"
+            android:title="@string/relay_nickname" />
+
+    </PreferenceCategory>-->
+
+    <PreferenceCategory android:title="ReachableAddresses">
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:enabled="true"
+            android:key="pref_reachable_addresses"
+            android:summary="@string/run_as_a_client_behind_a_firewall_with_restrictive_policies"
+            android:title="@string/reachable_addresses" />
+
+        <EditTextPreference
+            android:defaultValue="*:80,*:443"
+            android:dialogTitle="@string/enter_ports"
+            android:key="pref_reachable_addresses_ports"
+            android:summary="@string/ports_reachable_behind_a_restrictive_firewall"
+            android:title="@string/reachable_ports" />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="Connectivity">
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:enabled="true"
+            android:key="pref_isolate_dest"
+            android:summary="@string/pref_isolate_dest_summary"
+            android:title="@string/pref_isolate_dest" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:enabled="true"
+            android:key="pref_prefer_ipv6"
+            android:summary="@string/pref_prefer_ipv6_summary"
+            android:title="@string/pref_prefer_ipv6" />
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:enabled="true"
+            android:key="pref_disable_ipv4"
+            android:summary="@string/pref_disable_ipv4_summary"
+            android:title="@string/pref_disable_ipv4" />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="ConnectionPadding">
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:enabled="true"
+            android:key="pref_connection_padding"
+            android:summary="@string/pref_connection_padding_summary"
+            android:title="@string/pref_connection_padding" />
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:enabled="true"
+            android:key="pref_reduced_connection_padding"
+            android:summary="@string/pref_reduced_connection_padding_summary"
+            android:title="@string/pref_reduced_connection_padding" />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/pref_proxy_title">
+        <EditTextPreference
+            android:dialogTitle="@string/pref_proxy_type_dialog"
+            android:key="pref_proxy_type"
+            android:summary="@string/pref_proxy_type_summary"
+            android:title="@string/pref_proxy_type_title" />
+        <EditTextPreference
+            android:dialogTitle="@string/pref_proxy_host_dialog"
+            android:key="pref_proxy_host"
+            android:summary="@string/pref_proxy_host_summary"
+            android:title="@string/pref_proxy_host_title" />
+        <EditTextPreference
+            android:dialogTitle="@string/pref_proxy_port_dialog"
+            android:inputType="number"
+            android:key="pref_proxy_port"
+            android:summary="@string/pref_proxy_port_summary"
+            android:title="@string/pref_proxy_port_title" />
+
+        <EditTextPreference
+            android:dialogTitle="@string/pref_proxy_username_dialog"
+            android:key="pref_proxy_username"
+            android:summary="@string/pref_proxy_username_summary"
+            android:title="@string/pref_proxy_username_title" />
+        <EditTextPreference
+            android:dialogTitle="@string/pref_proxy_password_dialog"
+            android:inputType="textPassword"
+            android:key="pref_proxy_password"
+            android:summary="@string/pref_proxy_password_summary"
+            android:title="@string/pref_proxy_password_title" />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="Debug">
+
+        <EditTextPreference
+            android:defaultValue="auto"
+            android:dialogTitle="@string/pref_socks_dialog"
+            android:key="pref_socks"
+            android:summary="@string/pref_socks_summary"
+            android:title="@string/pref_socks_title" />
+
+        <EditTextPreference
+            android:defaultValue="auto"
+            android:dialogTitle="@string/pref_http_dialog"
+            android:key="pref_http"
+            android:summary="@string/pref_http_summary"
+            android:title="@string/pref_http_title" />
+
+        <EditTextPreference
+            android:defaultValue="auto"
+            android:dialogTitle="@string/pref_transport_dialog"
+            android:key="pref_transport"
+            android:summary="@string/pref_transport_summary"
+            android:title="@string/pref_transport_title" />
+
+        <EditTextPreference
+            android:defaultValue="auto"
+            android:dialogTitle="@string/pref_dnsport_dialog"
+            android:key="pref_dnsport"
+            android:summary="@string/pref_dnsport_summary"
+            android:title="@string/pref_dnsport_title" />
+
+        <EditTextPreference
+            android:dialogTitle="@string/pref_torrc_dialog"
+            android:inputType="textMultiLine|textNoSuggestions"
+            android:key="pref_custom_torrc"
+            android:summary="@string/pref_torrc_summary"
+            android:title="@string/pref_torrc_title" />
+
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:enabled="true"
+            android:key="pref_enable_logging"
+            android:summary="@string/enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"
+            android:title="Debug Log" />
+
+<!--
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:enabled="true"
+            android:key="pref_disable_network"
+            android:summary="@string/pref_disable_network_summary"
+            android:title="@string/pref_disable_network_title" />
+-->
+    </PreferenceCategory>
+</PreferenceScreen>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8e3b6014..c4a78d65 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -70,14 +70,14 @@
             android:stateNotNeeded="true"
             android:theme="@android:style/Theme.Translucent" />
         <activity
-            android:name=".vpn.VPNEnableActivity"
+            android:name=".mini.vpn.VPNEnableActivity"
             android:exported="false"
             android:label="@string/app_name" />
         <activity
-            android:name=".settings.SettingsPreferences"
+            android:name=".mini.settings.SettingsPreferences"
             android:label="@string/app_name" />
         <activity
-            android:name=".ui.AppManagerActivity"
+            android:name=".mini.ui.AppManagerActivity"
             android:label="@string/app_name"
             android:theme="@style/Theme.AppCompat" />
 
@@ -124,7 +124,7 @@
         </receiver>
 
         <activity
-            android:name=".ui.hiddenservices.HiddenServicesActivity"
+            android:name=".mini.ui.hiddenservices.HiddenServicesActivity"
             android:label="@string/title_activity_hidden_services"
             android:theme="@style/DefaultTheme">
             <meta-data
@@ -133,12 +133,12 @@
         </activity>
 
         <provider
-            android:name=".ui.hiddenservices.providers.HSContentProvider"
-            android:authorities="org.torproject.android.ui.hiddenservices.providers"
+            android:name=".mini.ui.hiddenservices.providers.HSContentProvider"
+            android:authorities="org.torproject.android.mini.ui.hiddenservices.providers"
             android:exported="false" />
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="org.torproject.android.ui.hiddenservices.storage"
+            android:authorities="org.torproject.android.mini.ui.hiddenservices.storage"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
@@ -147,7 +147,7 @@
         </provider>
 
         <activity
-            android:name=".ui.hiddenservices.ClientCookiesActivity"
+            android:name=".mini.ui.hiddenservices.ClientCookiesActivity"
             android:label="@string/client_cookies"
             android:theme="@style/DefaultTheme">
             <meta-data
@@ -155,12 +155,12 @@
                 android:value=".OrbotMainActivity" />
         </activity>
 
-        <activity android:name=".ui.onboarding.OnboardingActivity"/>
-        <activity android:name=".ui.onboarding.BridgeWizardActivity"/>
+        <activity android:name=".mini.ui.onboarding.OnboardingActivity"/>
+        <activity android:name=".mini.ui.onboarding.BridgeWizardActivity"/>
 
         <provider
-            android:name=".ui.hiddenservices.providers.CookieContentProvider"
-            android:authorities="org.torproject.android.ui.hiddenservices.providers.cookie"
+            android:name=".mini.ui.hiddenservices.providers.CookieContentProvider"
+            android:authorities="org.torproject.android.mini.ui.hiddenservices.providers.cookie"
             android:exported="false" />
     </application>
 
diff --git a/app/src/main/java/org/torproject/android/OnBootReceiver.java b/app/src/main/java/org/torproject/android/OnBootReceiver.java
index 21984952..64a2ac76 100644
--- a/app/src/main/java/org/torproject/android/OnBootReceiver.java
+++ b/app/src/main/java/org/torproject/android/OnBootReceiver.java
@@ -9,7 +9,7 @@ import android.os.Build;
 import org.torproject.android.service.util.Prefs;
 import org.torproject.android.service.TorService;
 import org.torproject.android.service.TorServiceConstants;
-import org.torproject.android.vpn.VPNEnableActivity;
+import org.torproject.android.mini.vpn.VPNEnableActivity;
 
 public class OnBootReceiver extends BroadcastReceiver {
 
diff --git a/app/src/main/java/org/torproject/android/OrbotApp.java b/app/src/main/java/org/torproject/android/OrbotApp.java
index e92083d3..a4f9cd3e 100644
--- a/app/src/main/java/org/torproject/android/OrbotApp.java
+++ b/app/src/main/java/org/torproject/android/OrbotApp.java
@@ -20,8 +20,8 @@ import com.github.javiersantos.appupdater.enums.UpdateFrom;
 import org.torproject.android.service.OrbotConstants;
 import org.torproject.android.service.util.Prefs;
 
-import org.torproject.android.settings.Languages;
-import org.torproject.android.settings.LocaleHelper;
+import org.torproject.android.mini.settings.Languages;
+import org.torproject.android.mini.settings.LocaleHelper;
 
 import java.util.Locale;
 
diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index fcb8bd0c..3404e380 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -23,19 +23,19 @@ import org.torproject.android.service.TorServiceConstants;
 import org.torproject.android.service.util.TorServiceUtils;
 import org.torproject.android.service.vpn.VpnConstants;
 import org.torproject.android.service.vpn.VpnPrefs;
-import org.torproject.android.settings.Languages;
-import org.torproject.android.settings.LocaleHelper;
-import org.torproject.android.settings.SettingsPreferences;
-import org.torproject.android.ui.AppManagerActivity;
-import org.torproject.android.ui.Rotate3dAnimation;
-import org.torproject.android.ui.onboarding.BridgeWizardActivity;
-import org.torproject.android.ui.onboarding.OnboardingActivity;
-import org.torproject.android.ui.hiddenservices.ClientCookiesActivity;
-import org.torproject.android.ui.hiddenservices.HiddenServicesActivity;
-import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
-import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
-import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
-import org.torproject.android.vpn.VPNEnableActivity;
+import org.torproject.android.mini.settings.Languages;
+import org.torproject.android.mini.settings.LocaleHelper;
+import org.torproject.android.mini.settings.SettingsPreferences;
+import org.torproject.android.mini.ui.AppManagerActivity;
+import org.torproject.android.mini.ui.Rotate3dAnimation;
+import org.torproject.android.mini.ui.onboarding.BridgeWizardActivity;
+import org.torproject.android.mini.ui.onboarding.OnboardingActivity;
+import org.torproject.android.mini.ui.hiddenservices.ClientCookiesActivity;
+import org.torproject.android.mini.ui.hiddenservices.HiddenServicesActivity;
+import org.torproject.android.mini.ui.hiddenservices.backup.BackupUtils;
+import org.torproject.android.mini.ui.hiddenservices.permissions.PermissionManager;
+import org.torproject.android.mini.ui.hiddenservices.providers.HSContentProvider;
+import org.torproject.android.mini.vpn.VPNEnableActivity;
 
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
@@ -718,7 +718,7 @@ public class OrbotMainActivity extends AppCompatActivity
 
                                 Uri contentUri = getUriForFile(
                                         context,
-                                        "org.torproject.android.ui.hiddenservices.storage",
+                                        "org.torproject.android.mini.ui.hiddenservices.storage",
                                         hidden_service_key
                                 );
 
diff --git a/app/src/main/java/org/torproject/android/mini/settings/Languages.java b/app/src/main/java/org/torproject/android/mini/settings/Languages.java
new file mode 100644
index 00000000..5fe04a62
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/mini/settings/Languages.java
@@ -0,0 +1,228 @@
+package org.torproject.android.mini.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("ay"), 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.toString(), "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.toString(), 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;
+    }
+
+    @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);
+            }
+        }
+
+        setLocale(contextWrapper, locale);
+
+    }
+
+    @SuppressWarnings("deprecation")
+    private static void setLocale(final ContextWrapper contextWrapper, Locale locale){
+        Resources resources = contextWrapper.getResources();
+        Configuration configuration = resources.getConfiguration();
+        DisplayMetrics displayMetrics = resources.getDisplayMetrics();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1){
+            configuration.setLocale(locale);
+            contextWrapper.getApplicationContext().createConfigurationContext(configuration);
+        }
+        else{
+            configuration.locale=locale;
+            resources.updateConfiguration(configuration,displayMetrics);
+        }
+    }
+
+    /**
+     * 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()]);
+    }
+
+    /**
+     * 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/mini/settings/LocaleHelper.java b/app/src/main/java/org/torproject/android/mini/settings/LocaleHelper.java
new file mode 100644
index 00000000..2d84e988
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/mini/settings/LocaleHelper.java
@@ -0,0 +1,87 @@
+package org.torproject.android.mini.settings;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Build;
+
+import org.torproject.android.service.util.Prefs;
+
+import java.util.Locale;
+
+/**
+ * This class is used to change your application locale and persist this change for the next time
+ * that your app is going to be used.
+ * <p/>
+ * You can also change the locale of your application on the fly by using the setLocale method.
+ * <p/>
+ * Created by gunhansancar on 07/10/15.
+ * https://gunhansancar.com/change-language-programmatically-in-android/
+ */
+public class LocaleHelper {
+
+    private static final String SELECTED_LANGUAGE = "Locale.Helper.Selected.Language";
+
+    public static Context onAttach(Context context) {
+        String lang = getPersistedData(context, Locale.getDefault().getLanguage());
+        return setLocale(context, lang);
+    }
+
+    public static Context onAttach(Context context, String defaultLanguage) {
+        String lang = getPersistedData(context, defaultLanguage);
+        return setLocale(context, lang);
+    }
+
+    public static String getLanguage(Context context) {
+        return getPersistedData(context, Locale.getDefault().getLanguage());
+    }
+
+    public static Context setLocale(Context context, String language) {
+        persist(context, language);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            return updateResources(context, language);
+        }
+
+        return updateResourcesLegacy(context, language);
+    }
+
+    private static String getPersistedData(Context context, String defaultLanguage) {
+        return Prefs.getDefaultLocale();
+    }
+
+    private static void persist(Context context, String language) {
+        Prefs.setDefaultLocale(language);
+    }
+
+    @TargetApi(Build.VERSION_CODES.N)
+    private static Context updateResources(Context context, String language) {
+        Locale locale = new Locale(language);
+        Locale.setDefault(locale);
+
+        Configuration configuration = context.getResources().getConfiguration();
+        configuration.setLocale(locale);
+        configuration.setLayoutDirection(locale);
+
+        return context.createConfigurationContext(configuration);
+    }
+
+    @SuppressWarnings("deprecation")
+    private static Context updateResourcesLegacy(Context context, String language) {
+        Locale locale = new Locale(language);
+        Locale.setDefault(locale);
+
+        Resources resources = context.getResources();
+
+        Configuration configuration = resources.getConfiguration();
+        configuration.locale = locale;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            configuration.setLayoutDirection(locale);
+        }
+
+        resources.updateConfiguration(configuration, resources.getDisplayMetrics());
+
+        return context;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java b/app/src/main/java/org/torproject/android/mini/settings/SettingsPreferences.java
similarity index 98%
rename from app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
rename to app/src/main/java/org/torproject/android/mini/settings/SettingsPreferences.java
index 040b7b57..e613b5a7 100644
--- a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
+++ b/app/src/main/java/org/torproject/android/mini/settings/SettingsPreferences.java
@@ -1,7 +1,7 @@
 /* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - http://openideals.com/guardian */
 /* See LICENSE for licensing information */
 
-package org.torproject.android.settings;
+package org.torproject.android.mini.settings;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java b/app/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java
similarity index 95%
rename from app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
rename to app/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java
index f5970a25..5311897e 100644
--- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/AppManagerActivity.java
@@ -1,10 +1,8 @@
 /* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - http://openideals.com/guardian */
 /* See LICENSE for licensing information */
 
-package org.torproject.android.ui;
+package org.torproject.android.mini.ui;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -13,15 +11,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import org.torproject.android.OrbotMainActivity;
 import org.torproject.android.service.OrbotConstants;
 import org.torproject.android.R;
-import org.torproject.android.service.util.Prefs;
 import org.torproject.android.service.util.TorServiceUtils;
 import org.torproject.android.service.vpn.TorifiedApp;
-import org.torproject.android.settings.SettingsPreferences;
-import org.torproject.android.ui.hiddenservices.ClientCookiesActivity;
-import org.torproject.android.ui.hiddenservices.HiddenServicesActivity;
 
 import android.Manifest;
 import android.content.Intent;
@@ -48,8 +41,6 @@ import android.widget.ListAdapter;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.google.zxing.integration.android.IntentIntegrator;
-
 import static org.torproject.android.service.vpn.VpnPrefs.PREFS_KEY_TORIFIED;
 
 public class AppManagerActivity extends AppCompatActivity implements OnClickListener, OrbotConstants {
diff --git a/app/src/main/java/org/torproject/android/mini/ui/NoPersonalizedLearningEditText.java b/app/src/main/java/org/torproject/android/mini/ui/NoPersonalizedLearningEditText.java
new file mode 100644
index 00000000..a5d67d79
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/mini/ui/NoPersonalizedLearningEditText.java
@@ -0,0 +1,13 @@
+package org.torproject.android.mini.ui;
+
+import android.content.Context;
+import android.support.v7.widget.AppCompatEditText;
+import android.util.AttributeSet;
+import android.view.inputmethod.EditorInfo;
+
+public class NoPersonalizedLearningEditText extends AppCompatEditText {
+    public NoPersonalizedLearningEditText(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setImeOptions(getImeOptions() | EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING);
+    }
+}
diff --git a/app/src/main/java/org/torproject/android/mini/ui/Rotate3dAnimation.java b/app/src/main/java/org/torproject/android/mini/ui/Rotate3dAnimation.java
new file mode 100644
index 00000000..ac8de549
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/mini/ui/Rotate3dAnimation.java
@@ -0,0 +1,76 @@
+package org.torproject.android.mini.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/hiddenservices/ClientCookiesActivity.java b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/ClientCookiesActivity.java
similarity index 92%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
rename to app/src/main/java/org/torproject/android/mini/ui/hiddenservices/ClientCookiesActivity.java
index e6939800..42608a8d 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/ClientCookiesActivity.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices;
+package org.torproject.android.mini.ui.hiddenservices;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -25,13 +25,13 @@ import com.google.zxing.integration.android.IntentResult;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.torproject.android.R;
-import org.torproject.android.settings.LocaleHelper;
-import org.torproject.android.ui.hiddenservices.adapters.ClientCookiesAdapter;
-import org.torproject.android.ui.hiddenservices.dialogs.AddCookieDialog;
-import org.torproject.android.ui.hiddenservices.dialogs.CookieActionsDialog;
-import org.torproject.android.ui.hiddenservices.dialogs.SelectCookieBackupDialog;
-import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
-import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
+import org.torproject.android.mini.settings.LocaleHelper;
+import org.torproject.android.mini.ui.hiddenservices.adapters.ClientCookiesAdapter;
+import org.torproject.android.mini.ui.hiddenservices.dialogs.AddCookieDialog;
+import org.torproject.android.mini.ui.hiddenservices.dialogs.CookieActionsDialog;
+import org.torproject.android.mini.ui.hiddenservices.dialogs.SelectCookieBackupDialog;
+import org.torproject.android.mini.ui.hiddenservices.permissions.PermissionManager;
+import org.torproject.android.mini.ui.hiddenservices.providers.CookieContentProvider;
 
 public class ClientCookiesActivity extends AppCompatActivity {
     public final int WRITE_EXTERNAL_STORAGE_FROM_COOKIE_ACTIONBAR = 3;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/HiddenServicesActivity.java
similarity index 92%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
rename to app/src/main/java/org/torproject/android/mini/ui/hiddenservices/HiddenServicesActivity.java
index d7c1f313..22beee07 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/HiddenServicesActivity.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices;
+package org.torproject.android.mini.ui.hiddenservices;
 
 
 import android.content.ContentResolver;
@@ -22,13 +22,13 @@ import android.widget.Spinner;
 import android.widget.Toast;
 
 import org.torproject.android.R;
-import org.torproject.android.settings.LocaleHelper;
-import org.torproject.android.ui.hiddenservices.adapters.OnionListAdapter;
-import org.torproject.android.ui.hiddenservices.dialogs.HSActionsDialog;
-import org.torproject.android.ui.hiddenservices.dialogs.HSDataDialog;
-import org.torproject.android.ui.hiddenservices.dialogs.SelectHSBackupDialog;
-import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
-import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
+import org.torproject.android.mini.settings.LocaleHelper;
+import org.torproject.android.mini.ui.hiddenservices.adapters.OnionListAdapter;
+import org.torproject.android.mini.ui.hiddenservices.dialogs.HSActionsDialog;
+import org.torproject.android.mini.ui.hiddenservices.dialogs.HSDataDialog;
+import org.torproject.android.mini.ui.hiddenservices.dialogs.SelectHSBackupDialog;
+import org.torproject.android.mini.ui.hiddenservices.permissions.PermissionManager;
+import org.torproject.android.mini.ui.hiddenservices.providers.HSContentProvider;
 
 public class HiddenServicesActivity extends AppCompatActivity {
     public final int WRITE_EXTERNAL_STORAGE_FROM_ACTIONBAR = 1;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/BackupAdapter.java b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/adapters/BackupAdapter.java
similarity index 94%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/BackupAdapter.java
rename to app/src/main/java/org/torproject/android/mini/ui/hiddenservices/adapters/BackupAdapter.java
index 196023b3..d7537118 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/BackupAdapter.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/adapters/BackupAdapter.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices.adapters;
+package org.torproject.android.mini.ui.hiddenservices.adapters;
 
 import android.content.Context;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/adapters/ClientCookiesAdapter.java
similarity index 94%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java
rename to app/src/main/java/org/torproject/android/mini/ui/hiddenservices/adapters/ClientCookiesAdapter.java
index bbc317a6..a27f293b 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/adapters/ClientCookiesAdapter.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices.adapters;
+package org.torproject.android.mini.ui.hiddenservices.adapters;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -14,7 +14,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import org.torproject.android.R;
-import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
+import org.torproject.android.mini.ui.hiddenservices.providers.CookieContentProvider;
 
 public class ClientCookiesAdapter extends CursorAdapter {
     private LayoutInflater cursorInflater;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/adapters/OnionListAdapter.java
similarity index 94%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java
rename to app/src/main/java/org/torproject/android/mini/ui/hiddenservices/adapters/OnionListAdapter.java
index 9824c773..493589db 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/adapters/OnionListAdapter.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices.adapters;
+package org.torproject.android.mini.ui.hiddenservices.adapters;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -14,7 +14,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import org.torproject.android.R;
-import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
+import org.torproject.android.mini.ui.hiddenservices.providers.HSContentProvider;
 
 public class OnionListAdapter extends CursorAdapter {
     private LayoutInflater cursorInflater;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/backup/BackupUtils.java
similarity index 97%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java
rename to app/src/main/java/org/torproject/android/mini/ui/hiddenservices/backup/BackupUtils.java
index a4790dd8..f6b3eae1 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/backup/BackupUtils.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices.backup;
+package org.torproject.android.mini.ui.hiddenservices.backup;
 
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -12,9 +12,9 @@ import org.json.JSONException;
 import org.json.JSONObject;
 import org.torproject.android.R;
 import org.torproject.android.service.TorServiceConstants;
-import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
-import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
-import org.torproject.android.ui.hiddenservices.storage.ExternalStorage;
+import org.torproject.android.mini.ui.hiddenservices.providers.CookieContentProvider;
+import org.torproject.android.mini.ui.hiddenservices.providers.HSContentProvider;
+import org.torproject.android.mini.ui.hiddenservices.storage.ExternalStorage;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/ZipIt.java b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/backup/ZipIt.java
similarity index 97%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/backup/ZipIt.java
rename to app/src/main/java/org/torproject/android/mini/ui/hiddenservices/backup/ZipIt.java
index 130b56bb..6b26845e 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/ZipIt.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/backup/ZipIt.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices.backup;
+package org.torproject.android.mini.ui.hiddenservices.backup;
 
 
 import android.support.annotation.NonNull;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/database/HSDatabase.java b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/database/HSDatabase.java
similarity index 96%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/database/HSDatabase.java
rename to app/src/main/java/org/torproject/android/mini/ui/hiddenservices/database/HSDatabase.java
index 18bc7aa0..4c0b28a3 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/database/HSDatabase.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/database/HSDatabase.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices.database;
+package org.torproject.android.mini.ui.hiddenservices.database;
 
 
 import android.content.Context;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/AddCookieDialog.java
similarity index 95%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java
rename to app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/AddCookieDialog.java
index 8441d53f..d0af6aa4 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/AddCookieDialog.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices.dialogs;
+package org.torproject.android.mini.ui.hiddenservices.dialogs;
 
 
 import android.app.Dialog;
@@ -14,7 +14,7 @@ import android.widget.EditText;
 import android.widget.Toast;
 
 import org.torproject.android.R;
-import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
+import org.torproject.android.mini.ui.hiddenservices.providers.CookieContentProvider;
 
 public class AddCookieDialog extends DialogFragment {
 
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieActionsDialog.java b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/CookieActionsDialog.java
similarity index 94%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieActionsDialog.java
rename to app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/CookieActionsDialog.java
index 7b5a2cfe..0d66bd5b 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieActionsDialog.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/CookieActionsDialog.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices.dialogs;
+package org.torproject.android.mini.ui.hiddenservices.dialogs;
 
 
 import android.app.Dialog;
@@ -14,8 +14,8 @@ import android.widget.Button;
 import android.widget.Toast;
 
 import org.torproject.android.R;
-import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
-import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
+import org.torproject.android.mini.ui.hiddenservices.backup.BackupUtils;
+import org.torproject.android.mini.ui.hiddenservices.permissions.PermissionManager;
 
 public class CookieActionsDialog extends DialogFragment {
     public static final int WRITE_EXTERNAL_STORAGE_FROM_COOKIE_ACTION_DIALOG = 4;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/CookieDeleteDialog.java
similarity index 91%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java
rename to app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/CookieDeleteDialog.java
index 60c4d8e3..eab21aa4 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/CookieDeleteDialog.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices.dialogs;
+package org.torproject.android.mini.ui.hiddenservices.dialogs;
 
 
 import android.app.Dialog;
@@ -10,7 +10,7 @@ import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
 
 import org.torproject.android.R;
-import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
+import org.torproject.android.mini.ui.hiddenservices.providers.CookieContentProvider;
 
 public class CookieDeleteDialog extends DialogFragment {
 
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSActionsDialog.java
similarity index 95%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java
rename to app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSActionsDialog.java
index 5be76917..2aa41968 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSActionsDialog.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSActionsDialog.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices.dialogs;
+package org.torproject.android.mini.ui.hiddenservices.dialogs;
 
 
 import android.app.Dialog;
@@ -16,8 +16,8 @@ import android.widget.Button;
 import android.widget.Toast;
 
 import org.torproject.android.R;
-import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
-import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
+import org.torproject.android.mini.ui.hiddenservices.backup.BackupUtils;
+import org.torproject.android.mini.ui.hiddenservices.permissions.PermissionManager;
 
 public class HSActionsDialog extends DialogFragment {
     public static final int WRITE_EXTERNAL_STORAGE_FROM_ACTION_DIALOG = 2;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSCookieDialog.java
similarity index 95%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java
rename to app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSCookieDialog.java
index 39c1b510..8a7df0bd 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSCookieDialog.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices.dialogs;
+package org.torproject.android.mini.ui.hiddenservices.dialogs;
 
 import android.app.Dialog;
 import android.content.ClipData;
@@ -18,7 +18,7 @@ import com.google.zxing.integration.android.IntentIntegrator;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.torproject.android.R;
-import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider;
+import org.torproject.android.mini.ui.hiddenservices.providers.CookieContentProvider;
 
 public class HSCookieDialog extends DialogFragment {
 
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSDataDialog.java
similarity index 96%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java
rename to app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSDataDialog.java
index 01e09dff..dac8f13b 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSDataDialog.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices.dialogs;
+package org.torproject.android.mini.ui.hiddenservices.dialogs;
 
 
 import android.app.Dialog;
@@ -15,7 +15,7 @@ import android.widget.EditText;
 import android.widget.Toast;
 
 import org.torproject.android.R;
-import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
+import org.torproject.android.mini.ui.hiddenservices.providers.HSContentProvider;
 
 public class HSDataDialog extends DialogFragment {
 
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSDeleteDialog.java
similarity index 94%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java
rename to app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSDeleteDialog.java
index ac5df743..11036950 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/HSDeleteDialog.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices.dialogs;
+package org.torproject.android.mini.ui.hiddenservices.dialogs;
 
 
 import android.app.Dialog;
@@ -11,7 +11,7 @@ import android.support.v7.app.AlertDialog;
 
 import org.torproject.android.R;
 import org.torproject.android.service.TorServiceConstants;
-import org.torproject.android.ui.hiddenservices.providers.HSContentProvider;
+import org.torproject.android.mini.ui.hiddenservices.providers.HSContentProvider;
 
 import java.io.File;
 
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectCookieBackupDialog.java b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/SelectCookieBackupDialog.java
similarity index 90%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectCookieBackupDialog.java
rename to app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/SelectCookieBackupDialog.java
index de5b7848..c36e0308 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectCookieBackupDialog.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/SelectCookieBackupDialog.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices.dialogs;
+package org.torproject.android.mini.ui.hiddenservices.dialogs;
 
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -11,9 +11,9 @@ import android.widget.AdapterView;
 import android.widget.ListView;
 
 import org.torproject.android.R;
-import org.torproject.android.ui.hiddenservices.adapters.BackupAdapter;
-import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
-import org.torproject.android.ui.hiddenservices.storage.ExternalStorage;
+import org.torproject.android.mini.ui.hiddenservices.adapters.BackupAdapter;
+import org.torproject.android.mini.ui.hiddenservices.backup.BackupUtils;
+import org.torproject.android.mini.ui.hiddenservices.storage.ExternalStorage;
 
 import java.io.File;
 import java.io.FilenameFilter;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectHSBackupDialog.java b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/SelectHSBackupDialog.java
similarity index 90%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectHSBackupDialog.java
rename to app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/SelectHSBackupDialog.java
index a6e3bac9..a8d17d97 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/SelectHSBackupDialog.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/dialogs/SelectHSBackupDialog.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices.dialogs;
+package org.torproject.android.mini.ui.hiddenservices.dialogs;
 
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -11,9 +11,9 @@ import android.widget.AdapterView;
 import android.widget.ListView;
 
 import org.torproject.android.R;
-import org.torproject.android.ui.hiddenservices.adapters.BackupAdapter;
-import org.torproject.android.ui.hiddenservices.backup.BackupUtils;
-import org.torproject.android.ui.hiddenservices.storage.ExternalStorage;
+import org.torproject.android.mini.ui.hiddenservices.adapters.BackupAdapter;
+import org.torproject.android.mini.ui.hiddenservices.backup.BackupUtils;
+import org.torproject.android.mini.ui.hiddenservices.storage.ExternalStorage;
 
 import java.io.File;
 import java.io.FilenameFilter;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/permissions/PermissionManager.java b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/permissions/PermissionManager.java
similarity index 98%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/permissions/PermissionManager.java
rename to app/src/main/java/org/torproject/android/mini/ui/hiddenservices/permissions/PermissionManager.java
index a9df5a95..910c06e3 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/permissions/PermissionManager.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/permissions/PermissionManager.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices.permissions;
+package org.torproject.android.mini.ui.hiddenservices.permissions;
 
 
 import android.Manifest;
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/CookieContentProvider.java b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/providers/CookieContentProvider.java
similarity index 94%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/providers/CookieContentProvider.java
rename to app/src/main/java/org/torproject/android/mini/ui/hiddenservices/providers/CookieContentProvider.java
index f420a6d8..29d34a08 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/CookieContentProvider.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/providers/CookieContentProvider.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices.providers;
+package org.torproject.android.mini.ui.hiddenservices.providers;
 
 import android.content.ContentProvider;
 import android.content.ContentUris;
@@ -12,7 +12,7 @@ import android.provider.BaseColumns;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import org.torproject.android.ui.hiddenservices.database.HSDatabase;
+import org.torproject.android.mini.ui.hiddenservices.database.HSDatabase;
 
 
 public class CookieContentProvider extends ContentProvider {
@@ -22,7 +22,7 @@ public class CookieContentProvider extends ContentProvider {
             ClientCookie.AUTH_COOKIE_VALUE,
             ClientCookie.ENABLED
     };
-    private static final String AUTH = "org.torproject.android.ui.hiddenservices.providers.cookie";
+    private static final String AUTH = "org.torproject.android.mini.ui.hiddenservices.providers.cookie";
     public static final Uri CONTENT_URI =
             Uri.parse("content://" + AUTH + "/cookie");
     //UriMatcher
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/providers/HSContentProvider.java
similarity index 94%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java
rename to app/src/main/java/org/torproject/android/mini/ui/hiddenservices/providers/HSContentProvider.java
index d7b558fd..f6394d99 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/providers/HSContentProvider.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices.providers;
+package org.torproject.android.mini.ui.hiddenservices.providers;
 
 import android.content.ContentProvider;
 import android.content.ContentUris;
@@ -12,7 +12,7 @@ import android.provider.BaseColumns;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import org.torproject.android.ui.hiddenservices.database.HSDatabase;
+import org.torproject.android.mini.ui.hiddenservices.database.HSDatabase;
 
 
 public class HSContentProvider extends ContentProvider {
@@ -27,7 +27,7 @@ public class HSContentProvider extends ContentProvider {
             HiddenService.CREATED_BY_USER,
             HiddenService.ENABLED
     };
-    private static final String AUTH = "org.torproject.android.ui.hiddenservices.providers";
+    private static final String AUTH = "org.torproject.android.mini.ui.hiddenservices.providers";
     public static final Uri CONTENT_URI =
             Uri.parse("content://" + AUTH + "/hs");
     //UriMatcher
diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/storage/ExternalStorage.java b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/storage/ExternalStorage.java
similarity index 94%
rename from app/src/main/java/org/torproject/android/ui/hiddenservices/storage/ExternalStorage.java
rename to app/src/main/java/org/torproject/android/mini/ui/hiddenservices/storage/ExternalStorage.java
index c50108b7..bc72353f 100644
--- a/app/src/main/java/org/torproject/android/ui/hiddenservices/storage/ExternalStorage.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/hiddenservices/storage/ExternalStorage.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.hiddenservices.storage;
+package org.torproject.android.mini.ui.hiddenservices.storage;
 
 import android.os.Environment;
 
diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/mini/ui/onboarding/BridgeWizardActivity.java
similarity index 98%
rename from app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
rename to app/src/main/java/org/torproject/android/mini/ui/onboarding/BridgeWizardActivity.java
index 7561ae07..2efc387e 100644
--- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/onboarding/BridgeWizardActivity.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.onboarding;
+package org.torproject.android.mini.ui.onboarding;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -17,9 +17,8 @@ import android.widget.RadioButton;
 import android.widget.TextView;
 
 import org.torproject.android.R;
-import org.torproject.android.service.OrbotConstants;
 import org.torproject.android.service.util.Prefs;
-import org.torproject.android.settings.LocaleHelper;
+import org.torproject.android.mini.settings.LocaleHelper;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/CustomSlideBigText.java b/app/src/main/java/org/torproject/android/mini/ui/onboarding/CustomSlideBigText.java
similarity index 97%
rename from app/src/main/java/org/torproject/android/ui/onboarding/CustomSlideBigText.java
rename to app/src/main/java/org/torproject/android/mini/ui/onboarding/CustomSlideBigText.java
index 35f5a55a..954a1221 100644
--- a/app/src/main/java/org/torproject/android/ui/onboarding/CustomSlideBigText.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/onboarding/CustomSlideBigText.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.onboarding;
+package org.torproject.android.mini.ui.onboarding;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java b/app/src/main/java/org/torproject/android/mini/ui/onboarding/OnboardingActivity.java
similarity index 90%
rename from app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
rename to app/src/main/java/org/torproject/android/mini/ui/onboarding/OnboardingActivity.java
index bceb0ada..2b19d841 100644
--- a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java
+++ b/app/src/main/java/org/torproject/android/mini/ui/onboarding/OnboardingActivity.java
@@ -1,4 +1,4 @@
-package org.torproject.android.ui.onboarding;
+package org.torproject.android.mini.ui.onboarding;
 
 import android.content.Context;
 import android.content.Intent;
@@ -10,10 +10,10 @@ import android.view.View;
 import com.github.paolorotolo.appintro.AppIntro;
 
 import org.torproject.android.R;
-import org.torproject.android.settings.LocaleHelper;
-import org.torproject.android.ui.AppManagerActivity;
-import org.torproject.android.ui.hiddenservices.permissions.PermissionManager;
-import org.torproject.android.vpn.VPNEnableActivity;
+import org.torproject.android.mini.settings.LocaleHelper;
+import org.torproject.android.mini.ui.AppManagerActivity;
+import org.torproject.android.mini.ui.hiddenservices.permissions.PermissionManager;
+import org.torproject.android.mini.vpn.VPNEnableActivity;
 
 public class OnboardingActivity extends AppIntro {
 
diff --git a/app/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java b/app/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java
new file mode 100644
index 00000000..29492d3e
--- /dev/null
+++ b/app/src/main/java/org/torproject/android/mini/vpn/VPNEnableActivity.java
@@ -0,0 +1,120 @@
+package org.torproject.android.mini.vpn;
+
+import org.torproject.android.service.util.Prefs;
+import org.torproject.android.service.TorService;
+import org.torproject.android.service.TorServiceConstants;
+
+import android.content.Intent;
+import android.net.VpnService;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+import android.view.Window;
+
+/**
+ * To combat background service being stopped/swiped
+ */
+public class VPNEnableActivity extends AppCompatActivity {
+	
+	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);
+
+		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 () {
+		// todo no actual prompting happens here and this should be refactored
+		startVpnService();
+    }
+	 
+	private void startVpnService ()
+	{
+   		if (intent == null)
+   		{
+			Prefs.putUseVpn(true);
+
+			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);
+
+   		}
+
+	}
+
+	public static final int ACTIVITY_RESULT_VPN_DENIED = 63;
+
+	@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 () {
+	            	@Override
+	            	public void run () {
+	            		sendIntentToService(TorServiceConstants.ACTION_START);
+	            		finish();
+	            	}
+	            }, 1000);
+		}
+		else if (request == REQUEST_VPN && response == RESULT_CANCELED) {
+			setResult(ACTIVITY_RESULT_VPN_DENIED);
+			finish();
+		}
+	  }
+	  
+
+		private void sendIntentToService(String action) {
+			Intent torService = new Intent(this, TorService.class);    
+			torService.setAction(action);
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+				startForegroundService(torService);
+			}
+			else
+			{
+				startService(torService);
+			}
+		}
+}
diff --git a/app/src/main/res/layout/activity_bridge_wizard.xml b/app/src/main/res/layout/activity_bridge_wizard.xml
index 7ff470c9..cc23654c 100644
--- a/app/src/main/res/layout/activity_bridge_wizard.xml
+++ b/app/src/main/res/layout/activity_bridge_wizard.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:background="@color/dark_purple"
 
-    tools:context="org.torproject.android.ui.onboarding.BridgeWizardActivity">
+    tools:context="org.torproject.android.mini.ui.onboarding.BridgeWizardActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/content_bridge_wizard.xml b/app/src/main/res/layout/content_bridge_wizard.xml
index a5b7995b..15387fff 100644
--- a/app/src/main/res/layout/content_bridge_wizard.xml
+++ b/app/src/main/res/layout/content_bridge_wizard.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="org.torproject.android.ui.onboarding.BridgeWizardActivity"
+    tools:context="org.torproject.android.mini.ui.onboarding.BridgeWizardActivity"
     tools:showIn="@layout/activity_bridge_wizard">
 
     <TextView
diff --git a/app/src/main/res/layout/layout_activity_client_cookies.xml b/app/src/main/res/layout/layout_activity_client_cookies.xml
index b8f0626e..5c5bf936 100644
--- a/app/src/main/res/layout/layout_activity_client_cookies.xml
+++ b/app/src/main/res/layout/layout_activity_client_cookies.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="org.torproject.android.ui.hiddenservices.ClientCookiesActivity">
+    tools:context="org.torproject.android.mini.ui.hiddenservices.ClientCookiesActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/layout_add_client_cookie_dialog.xml b/app/src/main/res/layout/layout_add_client_cookie_dialog.xml
index 2f4b9885..f28a8282 100644
--- a/app/src/main/res/layout/layout_add_client_cookie_dialog.xml
+++ b/app/src/main/res/layout/layout_add_client_cookie_dialog.xml
@@ -15,7 +15,7 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
         android:paddingLeft="5dp" />
 
-    <org.torproject.android.ui.NoPersonalizedLearningEditText
+    <org.torproject.android.mini.ui.NoPersonalizedLearningEditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:inputType="text"
@@ -29,7 +29,7 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
         android:paddingLeft="5dp" />
 
-    <org.torproject.android.ui.NoPersonalizedLearningEditText
+    <org.torproject.android.mini.ui.NoPersonalizedLearningEditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
diff --git a/app/src/main/res/layout/layout_content_client_cookies.xml b/app/src/main/res/layout/layout_content_client_cookies.xml
index 2517d8e1..5295641c 100644
--- a/app/src/main/res/layout/layout_content_client_cookies.xml
+++ b/app/src/main/res/layout/layout_content_client_cookies.xml
@@ -9,7 +9,7 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="org.torproject.android.ui.hiddenservices.ClientCookiesActivity"
+    tools:context="org.torproject.android.mini.ui.hiddenservices.ClientCookiesActivity"
     tools:showIn="@layout/layout_activity_client_cookies">
 
     <ListView
diff --git a/app/src/main/res/layout/layout_hs_data_dialog.xml b/app/src/main/res/layout/layout_hs_data_dialog.xml
index a4ac590e..20a1e2b2 100644
--- a/app/src/main/res/layout/layout_hs_data_dialog.xml
+++ b/app/src/main/res/layout/layout_hs_data_dialog.xml
@@ -15,7 +15,7 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
         android:paddingLeft="5dp" />
 
-    <org.torproject.android.ui.NoPersonalizedLearningEditText
+    <org.torproject.android.mini.ui.NoPersonalizedLearningEditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:inputType="text"
@@ -29,7 +29,7 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
         android:paddingLeft="5dp" />
 
-    <org.torproject.android.ui.NoPersonalizedLearningEditText
+    <org.torproject.android.mini.ui.NoPersonalizedLearningEditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
@@ -43,7 +43,7 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
         android:paddingLeft="5dp" />
 
-    <org.torproject.android.ui.NoPersonalizedLearningEditText
+    <org.torproject.android.mini.ui.NoPersonalizedLearningEditText
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ems="10"
diff --git a/app/src/main/res/layout/layout_hs_list_view.xml b/app/src/main/res/layout/layout_hs_list_view.xml
index 4981877d..9c3f5599 100644
--- a/app/src/main/res/layout/layout_hs_list_view.xml
+++ b/app/src/main/res/layout/layout_hs_list_view.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="org.torproject.android.ui.hiddenservices.HiddenServicesActivity">
+    tools:context="org.torproject.android.mini.ui.hiddenservices.HiddenServicesActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/layout_hs_list_view_main.xml b/app/src/main/res/layout/layout_hs_list_view_main.xml
index 183ea28a..ba907e6e 100644
--- a/app/src/main/res/layout/layout_hs_list_view_main.xml
+++ b/app/src/main/res/layout/layout_hs_list_view_main.xml
@@ -9,7 +9,7 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="org.torproject.android.ui.hiddenservices.HiddenServicesActivity"
+    tools:context="org.torproject.android.mini.ui.hiddenservices.HiddenServicesActivity"
     tools:showIn="@layout/layout_hs_list_view">
 
     <ListView
diff --git a/build.gradle b/build.gradle
index ad5ff6ed..e75c784c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.0'
     }
 }
 
diff --git a/external/pluto b/external/pluto
deleted file mode 160000
index 64faf224..00000000
--- a/external/pluto
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 64faf224a90ec3ef8a806f9ec45c1caffafea768
diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
index f8e96bf5..a62d4590 100644
--- a/orbotservice/build.gradle
+++ b/orbotservice/build.gradle
@@ -29,6 +29,10 @@ android {
         abortOnError false
     }
 
+    packagingOptions {
+        exclude 'assets/arm/obfs4proxy' //this is redundant
+    }
+
 }
 
 dependencies {
diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java
index 9214df4e..15ec4bc0 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java
@@ -112,6 +112,7 @@ public class TorEventHandler implements EventHandler, TorServiceConstants {
 
         if (read != lastRead || written != lastWritten)
         {
+            /**
             StringBuilder sb = new StringBuilder();
             sb.append(formatCount(read));
             sb.append(" \u2193");
@@ -125,6 +126,7 @@ public class TorEventHandler implements EventHandler, TorServiceConstants {
                 iconId = R.drawable.ic_stat_tor_xfer;
 
             mService.showToolbarNotification(sb.toString(), mService.getNotifyId(), iconId);
+             **/
 
             mTotalTrafficWritten += written;
             mTotalTrafficRead += read;
diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
index fc518024..3a1068e5 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
@@ -136,8 +136,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
 
     private ArrayList<Bridge> alBridges = null;
 
-    private static final Uri HS_CONTENT_URI = Uri.parse("content://org.torproject.android.ui.hiddenservices.providers/hs");
-    private static final Uri COOKIE_CONTENT_URI = Uri.parse("content://org.torproject.android.ui.hiddenservices.providers.cookie/cookie");
+    private static final Uri HS_CONTENT_URI = Uri.parse("content://org.torproject.android.mini.ui.hiddenservices.providers/hs");
+    private static final Uri COOKIE_CONTENT_URI = Uri.parse("content://org.torproject.android.mini.ui.hiddenservices.providers.cookie/cookie");
 
     private Handler mHandler;
 
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
deleted file mode 100644
index b4d2e333..00000000
Binary files a/orbotservice/src/main/res/drawable-hdpi-v11/ic_stat_tor.png and /dev/null 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
deleted file mode 100644
index 3d757218..00000000
Binary files a/orbotservice/src/main/res/drawable-hdpi-v11/ic_stat_tor_xfer.png and /dev/null 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
deleted file mode 100644
index 1dfdc09a..00000000
Binary files a/orbotservice/src/main/res/drawable-hdpi-v9/ic_stat_tor.png and /dev/null 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
index 0f3b147e..3091474e 100644
Binary files a/orbotservice/src/main/res/drawable-hdpi/ic_stat_tor.png 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
deleted file mode 100644
index d222fb67..00000000
Binary files a/orbotservice/src/main/res/drawable-hdpi/ic_stat_tor_xfer.png and /dev/null 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
deleted file mode 100644
index 0f24ee8a..00000000
Binary files a/orbotservice/src/main/res/drawable-ldpi-v11/ic_stat_tor.png and /dev/null 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
deleted file mode 100644
index 82d54466..00000000
Binary files a/orbotservice/src/main/res/drawable-ldpi-v9/ic_stat_tor.png and /dev/null 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
deleted file mode 100644
index 3cd399db..00000000
Binary files a/orbotservice/src/main/res/drawable-ldpi/ic_stat_tor.png and /dev/null 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
deleted file mode 100644
index a34840dc..00000000
Binary files a/orbotservice/src/main/res/drawable-mdpi-v11/ic_stat_tor.png and /dev/null 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
deleted file mode 100644
index fe291e76..00000000
Binary files a/orbotservice/src/main/res/drawable-mdpi-v11/ic_stat_tor_xfer.png and /dev/null 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
deleted file mode 100644
index c150cede..00000000
Binary files a/orbotservice/src/main/res/drawable-mdpi-v9/ic_stat_tor.png and /dev/null 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
index 6649e14a..a10c654d 100644
Binary files a/orbotservice/src/main/res/drawable-mdpi/ic_stat_tor.png 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
deleted file mode 100644
index 73ab2330..00000000
Binary files a/orbotservice/src/main/res/drawable-mdpi/ic_stat_tor_xfer.png and /dev/null 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
deleted file mode 100644
index e742ae7b..00000000
Binary files a/orbotservice/src/main/res/drawable-xhdpi-v11/ic_stat_tor.png and /dev/null 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
deleted file mode 100644
index 27e86725..00000000
Binary files a/orbotservice/src/main/res/drawable-xhdpi-v11/ic_stat_tor_xfer.png and /dev/null 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
deleted file mode 100644
index 9e56f4fc..00000000
Binary files a/orbotservice/src/main/res/drawable-xhdpi-v9/ic_stat_tor.png and /dev/null 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
index 11254d2b..25bf4549 100644
Binary files a/orbotservice/src/main/res/drawable-xhdpi/ic_stat_tor.png 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
deleted file mode 100644
index 522d6530..00000000
Binary files a/orbotservice/src/main/res/drawable-xhdpi/ic_stat_tor_xfer.png and /dev/null 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
deleted file mode 100644
index 1451c505..00000000
Binary files a/orbotservice/src/main/res/drawable-xxhdpi-v11/ic_stat_tor.png and /dev/null 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
deleted file mode 100644
index 59e63d4d..00000000
Binary files a/orbotservice/src/main/res/drawable-xxhdpi-v11/ic_stat_tor_xfer.png and /dev/null 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
index 778cc1e2..fb7bce8a 100644
Binary files a/orbotservice/src/main/res/drawable-xxhdpi/ic_stat_tor.png 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
deleted file mode 100644
index eb8809c4..00000000
Binary files a/orbotservice/src/main/res/drawable-xxhdpi/ic_stat_tor_xfer.png and /dev/null 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
deleted file mode 100644
index a78d2907..00000000
Binary files a/orbotservice/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor.png and /dev/null 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
deleted file mode 100644
index 30fe5893..00000000
Binary files a/orbotservice/src/main/res/drawable-xxxhdpi-v11/ic_stat_tor_xfer.png and /dev/null 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
index a2ff338a..32595644 100644
Binary files a/orbotservice/src/main/res/drawable-xxxhdpi/ic_stat_tor.png 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
deleted file mode 100644
index 8f967793..00000000
Binary files a/orbotservice/src/main/res/drawable-xxxhdpi/ic_stat_tor_xfer.png and /dev/null differ
diff --git a/settings.gradle b/settings.gradle
index c72325d7..05e4830c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':orbotservice',':app'
+include ':orbotservice',':app',':app-mini'





More information about the tor-commits mailing list